Refactor: get everything out of child directory

I know how to support multi sites in another way, a better way