fix bugs to get info from GEMGeometry.
remove legacy codes
Relocate matching class.