Clean up benchmarks
Reorganize gecode solver to group internal methods and make them private