Rearrange files and namespaces