Moved world lenses and dispatcher into better places.