moved all Geometry-related parameters into GEO, cleared some obsolete stuff related to Opt.c