Source tree reorg