reorg into categories