more file reorg