Added new classes, renamed classes, added entity framework to data layer