Refactor #3

* move files (new py file only for major solver differences)
* square weights for phrase average