Only treat controllers like controllers

and treat non-controller classes in controller files
as if they are modules that might contain a controller
Convert class name to string for 1.8
Merge branch 'presidentbeef-deal_with_controller_inside_class' into noahd1-smoke