Got rid of the data layer and moved the entities in to the domain layer. Looking to create a richer domain model. Changed the ID fields to Id. Removed some bi-directional navigations.