ENH: mild reorg of cbf stuff