Cleanup, Changes to Architecture, and First Pass at Windy Solvers

Lots of stuff since end of semester.  Changed architecture to adopt
factory patterns, completed Windy and Benavent first pass, cleaned up
some code.  More clean up to follow.