Moved around classes

Moved a bunch of classes around