Changed names of solver modules to be more clear