Refactoring under new namespace