Move models into app/models/core and app/models/services as appropriate.
Restructure models specs to match model restructuring
Move controllers into app/controllers/core and app/controllers/services as appropriate