Move scratchblocks2 to submodule