Moved some classes around