Only treat controllers like controllers

and treat non-controller classes in controller files as if they are modules that might contain a controller.