restructured VMCsolver