Reworking entity framework structure