Moved some class around