There wasn't much between Tesla and Solar City until Tesla brought out the battery. Elon has used one of his factories for the other company before for some part (if I remember the story correctly) so I always got the impression he may fold everything together if or when it makes sense.

Not today for sure. But who knows just me thinking out loud.