Moved classes around a bit.