Move models into util dir