restructure and git fix