some redoing of git structure