Added old solver for backup purpose
Restyling
Mega Refactoring