Moving domain classes to a common location