Moved classes around.