Reorganizing source tree to help portability