moved domain model classes to their respective package