Refactoring, namespaces