Refactor|Client|Map Renderer: Split NormalGeom into two separate groups