Namespaces/common refactoring