Major file reorg