Moved cluster eval stuff to its own package