Moved some classes around.