adapt to new git structure