git sync working with new structure