Git refactorization