Renamed classes and started to cleanup up the madness