More refactoring work.
Make git entries match fs entries