Reorg classes for greater clarity