reorg of extensions