update to namespaces, added submodules as well