almost final file reorg