Much restructuring, as well as better solver scripts.