Internal file reorg