Reorganized eGit mess