Adding support for non nested geometries.

retrocompatibility assured for geom files (not for previous matrices).