begin restructuring source tree