Moved model classes to separate package