Move the model fields in a separate package