source tree reorganization