Start using ibuffer-vc, because it's incredible.

(it makes ibuffer group by the the version control being used, so
files from the same project are always grouped correctly, regardless
of major mode or directory that they live in)