moved model classes