Start reorganizing solver
Rename solver module to solve