Move models to separate module