reorganizing source tree