Git: reorganized, again