new namespaces according to directory structure,
some cleanup