moved model classes to the model package