Refactor git
wip