Namespace refactoring for Mapper and Repository