Cleaning up the project to get rid of the entity and persistance layer