diff --git a/src/blenderbim/blenderbim/tool/aggregate.py b/src/blenderbim/blenderbim/tool/aggregate.py
index 9d4c6ff09a..2fd4644949 100644
--- a/src/blenderbim/blenderbim/tool/aggregate.py
+++ b/src/blenderbim/blenderbim/tool/aggregate.py
@@ -18,7 +18,7 @@
 
 import bpy
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import ifcopenshell.util.element
 from typing import Union
 
diff --git a/src/blenderbim/blenderbim/tool/blender.py b/src/blenderbim/blenderbim/tool/blender.py
index a5e8454d6b..abebced14b 100644
--- a/src/blenderbim/blenderbim/tool/blender.py
+++ b/src/blenderbim/blenderbim/tool/blender.py
@@ -24,7 +24,7 @@ import os
 import ifcopenshell.api
 import ifcopenshell.util.element
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.bim
 import addon_utils
 import types
diff --git a/src/blenderbim/blenderbim/tool/boundary.py b/src/blenderbim/blenderbim/tool/boundary.py
index a0cc01d78c..c99f983e88 100644
--- a/src/blenderbim/blenderbim/tool/boundary.py
+++ b/src/blenderbim/blenderbim/tool/boundary.py
@@ -19,7 +19,7 @@
 import bpy
 import mathutils
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 from mathutils import Matrix, Vector
 from typing import Any, Sequence
 
diff --git a/src/blenderbim/blenderbim/tool/brick.py b/src/blenderbim/blenderbim/tool/brick.py
index 16d86d5fa3..3d3992eb85 100644
--- a/src/blenderbim/blenderbim/tool/brick.py
+++ b/src/blenderbim/blenderbim/tool/brick.py
@@ -22,7 +22,7 @@ import ifcopenshell
 import ifcopenshell.guid
 import ifcopenshell.util.brick
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 from contextlib import contextmanager
 import datetime
 
diff --git a/src/blenderbim/blenderbim/tool/bsdd.py b/src/blenderbim/blenderbim/tool/bsdd.py
index 6626a3953c..dd078d8bde 100644
--- a/src/blenderbim/blenderbim/tool/bsdd.py
+++ b/src/blenderbim/blenderbim/tool/bsdd.py
@@ -1,5 +1,5 @@
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import bpy
 import json
 
diff --git a/src/blenderbim/blenderbim/tool/clash.py b/src/blenderbim/blenderbim/tool/clash.py
index c83c3f9deb..49d5fb1494 100644
--- a/src/blenderbim/blenderbim/tool/clash.py
+++ b/src/blenderbim/blenderbim/tool/clash.py
@@ -21,7 +21,7 @@ import bpy
 import json
 import ifcopenshell
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 from contextlib import contextmanager
 from mathutils import Vector
 
diff --git a/src/blenderbim/blenderbim/tool/collector.py b/src/blenderbim/blenderbim/tool/collector.py
index d903d60a8c..b5ba62d464 100644
--- a/src/blenderbim/blenderbim/tool/collector.py
+++ b/src/blenderbim/blenderbim/tool/collector.py
@@ -18,7 +18,7 @@
 
 import bpy
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import ifcopenshell.util.element
 from typing import Union
 
diff --git a/src/blenderbim/blenderbim/tool/context.py b/src/blenderbim/blenderbim/tool/context.py
index 6eeebf22e2..13b1e0d2d2 100644
--- a/src/blenderbim/blenderbim/tool/context.py
+++ b/src/blenderbim/blenderbim/tool/context.py
@@ -18,7 +18,7 @@
 
 import bpy
 import blenderbim.bim.helper
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.core.tool
 
 
diff --git a/src/blenderbim/blenderbim/tool/cost.py b/src/blenderbim/blenderbim/tool/cost.py
index 6af214519a..b48477d715 100644
--- a/src/blenderbim/blenderbim/tool/cost.py
+++ b/src/blenderbim/blenderbim/tool/cost.py
@@ -1,7 +1,7 @@
 import os
 import bpy
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import ifcopenshell.util.element
 import ifcopenshell.util.date
 import ifcopenshell.util.cost
diff --git a/src/blenderbim/blenderbim/tool/covering.py b/src/blenderbim/blenderbim/tool/covering.py
index decc60bc06..0964f4d1d1 100644
--- a/src/blenderbim/blenderbim/tool/covering.py
+++ b/src/blenderbim/blenderbim/tool/covering.py
@@ -24,7 +24,7 @@ import blenderbim.core.tool
 import blenderbim.core.root
 import blenderbim.core.spatial
 import blenderbim.core.geometry
-import blenderbim.tool as tool
+from .. import tool
 import json
 from math import pi
 from mathutils import Vector, Matrix
diff --git a/src/blenderbim/blenderbim/tool/debug.py b/src/blenderbim/blenderbim/tool/debug.py
index a416be1c3c..4b43f15d2f 100644
--- a/src/blenderbim/blenderbim/tool/debug.py
+++ b/src/blenderbim/blenderbim/tool/debug.py
@@ -20,7 +20,7 @@ import os
 import bpy
 import ifcopenshell.express
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 from ..bim.ifc import IfcStore
 
 
diff --git a/src/blenderbim/blenderbim/tool/demo.py b/src/blenderbim/blenderbim/tool/demo.py
index 1cabe848c7..164af3f03f 100644
--- a/src/blenderbim/blenderbim/tool/demo.py
+++ b/src/blenderbim/blenderbim/tool/demo.py
@@ -31,7 +31,7 @@
 
 import bpy
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 
 
 # There is always one class in each tool file, which implements the interface
diff --git a/src/blenderbim/blenderbim/tool/document.py b/src/blenderbim/blenderbim/tool/document.py
index 154c8c0938..71e7ee8acb 100644
--- a/src/blenderbim/blenderbim/tool/document.py
+++ b/src/blenderbim/blenderbim/tool/document.py
@@ -19,7 +19,7 @@
 import bpy
 import ifcopenshell.util.system
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 from ..bim import import_ifc
 
 
diff --git a/src/blenderbim/blenderbim/tool/drawing.py b/src/blenderbim/blenderbim/tool/drawing.py
index ea78066650..b94aaf9d2e 100644
--- a/src/blenderbim/blenderbim/tool/drawing.py
+++ b/src/blenderbim/blenderbim/tool/drawing.py
@@ -33,7 +33,7 @@ import subprocess
 import numpy as np
 import blenderbim.core.tool
 import blenderbim.core.geometry
-import blenderbim.tool as tool
+from .. import tool
 import ifcopenshell.api
 import ifcopenshell.geom
 import ifcopenshell.util.representation
diff --git a/src/blenderbim/blenderbim/tool/geometry.py b/src/blenderbim/blenderbim/tool/geometry.py
index 18827a8b51..604caf6b04 100644
--- a/src/blenderbim/blenderbim/tool/geometry.py
+++ b/src/blenderbim/blenderbim/tool/geometry.py
@@ -35,7 +35,7 @@ import blenderbim.core.style
 import blenderbim.core.spatial
 import blenderbim.core.system
 import blenderbim.core.geometry
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.bim.import_ifc
 from collections import defaultdict
 from math import radians, pi
diff --git a/src/blenderbim/blenderbim/tool/georeference.py b/src/blenderbim/blenderbim/tool/georeference.py
index 85d9ca5570..95021a54c5 100644
--- a/src/blenderbim/blenderbim/tool/georeference.py
+++ b/src/blenderbim/blenderbim/tool/georeference.py
@@ -22,7 +22,7 @@ import numpy as np
 import ifcopenshell
 import ifcopenshell.api.georeference
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.bim.helper
 from math import radians, cos, sin
 
diff --git a/src/blenderbim/blenderbim/tool/ifc.py b/src/blenderbim/blenderbim/tool/ifc.py
index a8082266ef..b15a45380d 100644
--- a/src/blenderbim/blenderbim/tool/ifc.py
+++ b/src/blenderbim/blenderbim/tool/ifc.py
@@ -24,7 +24,7 @@ import ifcopenshell.ifcopenshell_wrapper as ifcopenshell_wrapper
 import ifcopenshell.util.element
 import blenderbim.core.tool
 import blenderbim.bim.handler
-import blenderbim.tool as tool
+from .. import tool
 from ..bim.ifc import IfcStore, IFC_CONNECTED_TYPE
 from typing import Optional, Union, Any, final
 
diff --git a/src/blenderbim/blenderbim/tool/ifcgit.py b/src/blenderbim/blenderbim/tool/ifcgit.py
index 82785a4743..64ad8a502a 100644
--- a/src/blenderbim/blenderbim/tool/ifcgit.py
+++ b/src/blenderbim/blenderbim/tool/ifcgit.py
@@ -4,7 +4,7 @@ import bpy
 import logging
 from ..bim import import_ifc
 from ..bim.ifc import IfcStore
-import blenderbim.tool as tool
+from .. import tool
 
 # allows git import even if git executable isn't found
 os.environ["GIT_PYTHON_REFRESH"] = "quiet"
diff --git a/src/blenderbim/blenderbim/tool/library.py b/src/blenderbim/blenderbim/tool/library.py
index b356670149..9a7d3cfad0 100644
--- a/src/blenderbim/blenderbim/tool/library.py
+++ b/src/blenderbim/blenderbim/tool/library.py
@@ -18,7 +18,7 @@
 
 import bpy
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 
 
 class Library(blenderbim.core.tool.Library):
diff --git a/src/blenderbim/blenderbim/tool/loader.py b/src/blenderbim/blenderbim/tool/loader.py
index 051ccb46a1..1cf6558788 100644
--- a/src/blenderbim/blenderbim/tool/loader.py
+++ b/src/blenderbim/blenderbim/tool/loader.py
@@ -26,7 +26,7 @@ import ifcopenshell.util.element
 import ifcopenshell.util.shape
 import ifcopenshell.util.unit
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.bim.import_ifc
 import numpy as np
 import numpy.typing as npt
diff --git a/src/blenderbim/blenderbim/tool/material.py b/src/blenderbim/blenderbim/tool/material.py
index 31c1054e48..d6f47afda5 100644
--- a/src/blenderbim/blenderbim/tool/material.py
+++ b/src/blenderbim/blenderbim/tool/material.py
@@ -22,7 +22,7 @@ import ifcopenshell
 import ifcopenshell.api.material
 import blenderbim.core.tool
 import blenderbim.core.material
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.bim.helper
 import ifcopenshell.util.unit
 import ifcopenshell.util.element
diff --git a/src/blenderbim/blenderbim/tool/misc.py b/src/blenderbim/blenderbim/tool/misc.py
index 72b53672a9..de25f2e7fd 100644
--- a/src/blenderbim/blenderbim/tool/misc.py
+++ b/src/blenderbim/blenderbim/tool/misc.py
@@ -21,7 +21,7 @@ import bmesh
 import ifcopenshell
 import blenderbim.core.tool
 import blenderbim.core.root
-import blenderbim.tool as tool
+from .. import tool
 from mathutils import Vector, Matrix
 from ..bim.ifc import IfcStore
 
diff --git a/src/blenderbim/blenderbim/tool/model.py b/src/blenderbim/blenderbim/tool/model.py
index e78647ad1c..a56f51ba38 100644
--- a/src/blenderbim/blenderbim/tool/model.py
+++ b/src/blenderbim/blenderbim/tool/model.py
@@ -30,8 +30,8 @@ import ifcopenshell.util.placement
 import ifcopenshell.util.representation
 import blenderbim.core.geometry
 import blenderbim.core.tool
-import blenderbim.tool as tool
-import blenderbim.core.geometry as geometry
+from .. import tool
+from ..core. import geometry
 from math import atan, degrees
 from mathutils import Matrix, Vector
 from copy import deepcopy
diff --git a/src/blenderbim/blenderbim/tool/nest.py b/src/blenderbim/blenderbim/tool/nest.py
index cf2912902e..a909bd04ab 100644
--- a/src/blenderbim/blenderbim/tool/nest.py
+++ b/src/blenderbim/blenderbim/tool/nest.py
@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import ifcopenshell.util.element
 
 
diff --git a/src/blenderbim/blenderbim/tool/owner.py b/src/blenderbim/blenderbim/tool/owner.py
index 80ae7db456..c1d98922bb 100644
--- a/src/blenderbim/blenderbim/tool/owner.py
+++ b/src/blenderbim/blenderbim/tool/owner.py
@@ -18,7 +18,7 @@
 
 import bpy
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.bim.helper
 import ifcopenshell
 from typing import Union, Any
diff --git a/src/blenderbim/blenderbim/tool/profile.py b/src/blenderbim/blenderbim/tool/profile.py
index 385dc70fbc..3c6761e524 100644
--- a/src/blenderbim/blenderbim/tool/profile.py
+++ b/src/blenderbim/blenderbim/tool/profile.py
@@ -23,7 +23,7 @@ import ifcopenshell.util.unit
 import ifcopenshell.util.placement
 import ifcopenshell.util.representation
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import PIL.ImageDraw
 from ..bim.module.model.decorator import ProfileDecorator
 from typing import Union
diff --git a/src/blenderbim/blenderbim/tool/project.py b/src/blenderbim/blenderbim/tool/project.py
index fd38b36b02..91ca857cb1 100644
--- a/src/blenderbim/blenderbim/tool/project.py
+++ b/src/blenderbim/blenderbim/tool/project.py
@@ -28,7 +28,7 @@ import blenderbim.core.root
 import blenderbim.core.unit
 import blenderbim.core.owner
 import blenderbim.bim.schema
-import blenderbim.tool as tool
+from .. import tool
 from ..bim.ifc import IfcStore
 from pathlib import Path
 from typing import Optional
diff --git a/src/blenderbim/blenderbim/tool/pset.py b/src/blenderbim/blenderbim/tool/pset.py
index 9f297753f3..a27061e23a 100644
--- a/src/blenderbim/blenderbim/tool/pset.py
+++ b/src/blenderbim/blenderbim/tool/pset.py
@@ -20,7 +20,7 @@ import bpy
 import ifcopenshell
 import ifcopenshell.util.element
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.bim.schema
 from typing import Union
 
diff --git a/src/blenderbim/blenderbim/tool/qto.py b/src/blenderbim/blenderbim/tool/qto.py
index 51118cb61a..1929c63b81 100644
--- a/src/blenderbim/blenderbim/tool/qto.py
+++ b/src/blenderbim/blenderbim/tool/qto.py
@@ -19,7 +19,7 @@
 import bpy
 import blenderbim.core.tool
 import blenderbim.bim.schema
-import blenderbim.tool as tool
+from .. import tool
 import ifcopenshell
 import ifcopenshell.util.unit
 import ifcopenshell.util.element
diff --git a/src/blenderbim/blenderbim/tool/resource.py b/src/blenderbim/blenderbim/tool/resource.py
index a552303a42..50ad7d2dd6 100644
--- a/src/blenderbim/blenderbim/tool/resource.py
+++ b/src/blenderbim/blenderbim/tool/resource.py
@@ -20,9 +20,9 @@
 
 import bpy
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.bim.helper
-import blenderbim.bim.module.sequence.helper as helper
+from ..bim.module.sequence. import helper
 import json
 import time
 import isodate
diff --git a/src/blenderbim/blenderbim/tool/root.py b/src/blenderbim/blenderbim/tool/root.py
index bac67eac83..72dc94d9d9 100644
--- a/src/blenderbim/blenderbim/tool/root.py
+++ b/src/blenderbim/blenderbim/tool/root.py
@@ -28,7 +28,7 @@ import blenderbim.core.aggregate
 import blenderbim.core.geometry
 import blenderbim.core.material
 import blenderbim.core.style
-import blenderbim.tool as tool
+from .. import tool
 from typing import Union, Optional, Any
 
 
diff --git a/src/blenderbim/blenderbim/tool/sequence.py b/src/blenderbim/blenderbim/tool/sequence.py
index b01ef21a42..f28dbd15fc 100644
--- a/src/blenderbim/blenderbim/tool/sequence.py
+++ b/src/blenderbim/blenderbim/tool/sequence.py
@@ -31,9 +31,9 @@ import ifcopenshell.util.element
 import ifcopenshell.util.unit
 import blenderbim.core.tool
 import blenderbim.core
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.bim.helper
-import blenderbim.bim.module.sequence.helper as helper
+from ..bim.module.sequence. import helper
 from dateutil import parser
 from datetime import datetime
 from typing import Optional, Any, Union
diff --git a/src/blenderbim/blenderbim/tool/spatial.py b/src/blenderbim/blenderbim/tool/spatial.py
index 5102b1f27b..bbd28beed9 100644
--- a/src/blenderbim/blenderbim/tool/spatial.py
+++ b/src/blenderbim/blenderbim/tool/spatial.py
@@ -34,7 +34,7 @@ import blenderbim.core.tool
 import blenderbim.core.root
 import blenderbim.core.spatial
 import blenderbim.core.geometry
-import blenderbim.tool as tool
+from .. import tool
 import json
 from math import pi
 from mathutils import Vector, Matrix
diff --git a/src/blenderbim/blenderbim/tool/structural.py b/src/blenderbim/blenderbim/tool/structural.py
index 247bbc4389..3eed5cc972 100644
--- a/src/blenderbim/blenderbim/tool/structural.py
+++ b/src/blenderbim/blenderbim/tool/structural.py
@@ -22,7 +22,7 @@ import json
 import blenderbim.bim.helper
 import blenderbim.core.tool
 import blenderbim.core.structural
-import blenderbim.tool as tool
+from .. import tool
 from ..bim.ifc import IfcStore
 from pprint import pprint
 
diff --git a/src/blenderbim/blenderbim/tool/style.py b/src/blenderbim/blenderbim/tool/style.py
index fc0de8849f..c363061501 100644
--- a/src/blenderbim/blenderbim/tool/style.py
+++ b/src/blenderbim/blenderbim/tool/style.py
@@ -22,7 +22,7 @@ import ifcopenshell
 import ifcopenshell.util.element
 import ifcopenshell.util.representation
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.bim.helper
 from mathutils import Color
 from typing import Union, Any, Optional, Literal
diff --git a/src/blenderbim/blenderbim/tool/surveyor.py b/src/blenderbim/blenderbim/tool/surveyor.py
index 58308de576..6fc66e427d 100644
--- a/src/blenderbim/blenderbim/tool/surveyor.py
+++ b/src/blenderbim/blenderbim/tool/surveyor.py
@@ -19,7 +19,7 @@
 import bpy
 import ifcopenshell.api
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import numpy as np
 
 
diff --git a/src/blenderbim/blenderbim/tool/system.py b/src/blenderbim/blenderbim/tool/system.py
index 96a7781325..ce131f5dc8 100644
--- a/src/blenderbim/blenderbim/tool/system.py
+++ b/src/blenderbim/blenderbim/tool/system.py
@@ -23,7 +23,7 @@ import blenderbim.bim.helper
 import blenderbim.core.geometry
 import blenderbim.core.root
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 from ..bim import import_ifc
 import re
 from math import pi, cos, sin
diff --git a/src/blenderbim/blenderbim/tool/type.py b/src/blenderbim/blenderbim/tool/type.py
index c9de381afb..a2e838e3f5 100644
--- a/src/blenderbim/blenderbim/tool/type.py
+++ b/src/blenderbim/blenderbim/tool/type.py
@@ -22,7 +22,7 @@ import ifcopenshell.util.element
 import ifcopenshell.util.representation
 import blenderbim.core.tool
 import blenderbim.core.geometry
-import blenderbim.tool as tool
+from .. import tool
 import blenderbim.bim.helper
 from typing import Union
 
diff --git a/src/blenderbim/blenderbim/tool/unit.py b/src/blenderbim/blenderbim/tool/unit.py
index baec38b579..ed59a96998 100644
--- a/src/blenderbim/blenderbim/tool/unit.py
+++ b/src/blenderbim/blenderbim/tool/unit.py
@@ -20,7 +20,7 @@ import bpy
 import json
 import ifcopenshell
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 
 
 class Unit(blenderbim.core.tool.Unit):
diff --git a/src/blenderbim/blenderbim/tool/web.py b/src/blenderbim/blenderbim/tool/web.py
index 43da1f14ff..6b712cabc5 100644
--- a/src/blenderbim/blenderbim/tool/web.py
+++ b/src/blenderbim/blenderbim/tool/web.py
@@ -19,7 +19,7 @@
 import bpy
 from ..bim.module.web.data import WebData
 import blenderbim.core.tool
-import blenderbim.tool as tool
+from .. import tool
 import ifcopenshell.api.sequence
 import socket
 import os