Successfully preserved all the blocksets. All it took was copy pasting the assets from Master (since I'd accidentally overwritten their XML) and changing the guid under their Script. If in the future I need to move the OCBlockSet location again, the important thing is not to drag and drop the monoscript into place (this could lose us the XML) but just to hand-edit the files which is quick enough for such a big refactoring.