Cleaned up Controller namespaces