refactoring namespace