rearrange files and namespaces