Move model class to model module