reorg classes