Refactoring namespaces
More namespace refactoring