Moved around some classes