source tree reorganized