move constraint solver from a package into the tool. unipackage loading is broken; next step is to fix that