Moved the entities to the cms root directory
Renamed the classes