move common domain classes into common module