Move models to own package