Cleanup Bloom filter/routing set implementation
Re-arrange csc files