Refactoring Namespace