some file reorg