Move models into split module, remove REST (again!)