Renamed a bunch of classes. The naming convention is a lot more logical
now.