moved domain model classes to new packages