restructuring in git is hard