Namespace controllers and make spec pass