Move models to definitions