restructure to prep for compressed bitset in bloomfilter