Refactoring and namespacing controllers