moved the domain model related classes to a separate module