Given up on subtree/submodule, moving k files back in