Reorg and new normalization.