new structure, gitclient is lagging. too much changes