Refactoring to new namespace