Fixed Some Shit, Renamed some classes

Done some stuff