refactoring: adjust namespaces