And then I decided to merge entities and domain objects.