switch fully to egit api and refactore some code