Refactoring of UserManagement namespace