- moved model classes to model package