Refactoring to new namespace.