Git state, better dir structure