Some file reorg