Work on domain model structure
Revert "Work on domain model structure"

This reverts commit f6a0c5884380f0d6659a6c0fe1097f225ddae6f6.