Reorganization of solvation module.
Fixes to solvation module and calculating solvation correction.