Rearchitect world crate, move old stuff out of the way for now
Disable main stuff too for now
Resurrecting world