Source file reorg