Renamed classes

Renamed the classes so their names had meaning for the new project.
Removed old xml