git structure clean-up