Move models into app file