Reorg of packages and add treap backed comment system