source tree restructured