Source directory reorg