Moved a few random classes around.