Renamed some classes and moved some around to different folders.