restructuring git setup