refactoring: separate namespaces