More file reorg