Reorg of figures