diff --git a/hub/city_model_structure/city.py b/hub/city_model_structure/city.py
index 0c5eb5f0..176fcbd7 100644
--- a/hub/city_model_structure/city.py
+++ b/hub/city_model_structure/city.py
@@ -26,7 +26,7 @@ from hub.city_model_structure.level_of_detail import LevelOfDetail
 from hub.city_model_structure.machine import Machine
 from hub.city_model_structure.parts_consisting_building import PartsConsistingBuilding
 from geometry import Library as GeometryHelper
-from hub.helpers.location import Location
+from geometry import Location
 from hub.city_model_structure.energy_system import EnergySystem
 from hub.city_model_structure.lca_material import LcaMaterial
 import pandas as pd
diff --git a/hub/city_model_structure/iot/sensor.py b/hub/city_model_structure/iot/sensor.py
index 16eb6590..683aa5be 100644
--- a/hub/city_model_structure/iot/sensor.py
+++ b/hub/city_model_structure/iot/sensor.py
@@ -5,7 +5,7 @@ Copyright © 2022 Concordia CERC group
 Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 """
 
-from hub.helpers.location import Location
+from geometry import Location
 from hub.city_model_structure.iot.sensor_measure import SensorMeasure
 from hub.city_model_structure.iot.sensor_type import SensorType
 
diff --git a/hub/imports/geometry/citygml_classes/citygml_lod1.py b/hub/imports/geometry/citygml_classes/citygml_lod1.py
index d8522e73..aa2118f4 100644
--- a/hub/imports/geometry/citygml_classes/citygml_lod1.py
+++ b/hub/imports/geometry/citygml_classes/citygml_lod1.py
@@ -9,7 +9,9 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 from hub.imports.geometry.citygml_classes.citygml_base import CityGmlBase
 from hub.city_model_structure.building_demand.surface import Surface
 from geometry import Polygon
-from geometry import Helper as GeometryHelper
+from geometry import Helper
+
+GeometryHelper = Helper.instance()
 
 
 class CityGmlLod1(CityGmlBase):
diff --git a/hub/imports/geometry/citygml_classes/citygml_lod2.py b/hub/imports/geometry/citygml_classes/citygml_lod2.py
index af0a14cc..3fd410b3 100644
--- a/hub/imports/geometry/citygml_classes/citygml_lod2.py
+++ b/hub/imports/geometry/citygml_classes/citygml_lod2.py
@@ -8,7 +8,9 @@ Project Coder Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 from hub.imports.geometry.citygml_classes.citygml_base import CityGmlBase
 from hub.city_model_structure.building_demand.surface import Surface
 from geometry import Polygon
-from geometry import Helper as GeometryHelper
+from geometry import Helper
+
+GeometryHelper = Helper.instance()
 
 
 class CityGmlLod2(CityGmlBase):
diff --git a/hub/imports/geometry/rhino.py b/hub/imports/geometry/rhino.py
index 1ec29bf6..ee66ee3e 100644
--- a/hub/imports/geometry/rhino.py
+++ b/hub/imports/geometry/rhino.py
@@ -13,10 +13,12 @@ from hub.city_model_structure.building import Building
 from hub.city_model_structure.building_demand.surface import Surface as HubSurface
 from hub.city_model_structure.city import City
 from hub.helpers.configuration_helper import ConfigurationHelper
-from geometry import Helper as GeometryHelper
+from geometry import Helper
 from geometry import Polygon
 from geometry import Point
 
+GeometryHelper = Helper.instance()
+
 
 class Rhino:
   def __init__(self, path):
diff --git a/requirements.txt b/requirements.txt
index 1538a51d..441da3bf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -25,4 +25,5 @@ triangle
 psycopg2-binary
 Pillow
 pathlib
-pickle5
\ No newline at end of file
+pickle5
+cerc-geometry
\ No newline at end of file