Fix scaffolding crash, update carpenter's blocks class location