Move model to separate type