Refactor  Phase 1 - All Entity Framework classes had to be renamed due to Entity Framework having issues with similar named classes in different name spaces