Changed underworld to not have it's own class and made some other changes