Move domain objects to domain module