Separated out Repo from EntityRepo
Separated out Factory from EntityFactory