Renamed classes to make it clearer that they are in the new app.
Removed unused class.