move models, controller per CORRECT namespacing. make sure all current specs pass