Moving existing subthemes to a folder with the name of the vsite.

#5218 
For now this a WIP because the update function don't work as expected.