Refactoring: namespaces for controllers