Rescaffold everything