More controller namespace refactoring