reorg DB classes