rearrange namespaces, adjust project structure