Namespaces and refactoring