Work the new world structure into main