source tree restructuring