migrate to using git-subtree