source tree restructed