Constraints compile. Removed orSearch (sorry). Moved solver stuff to the solver package.