add namespaces and remove the modules subdir