diff --git a/src/blenderbim/blenderbim/tool/__init__.py b/src/blenderbim/blenderbim/tool/__init__.py
index 716915f4f5..f707070e37 100644
--- a/src/blenderbim/blenderbim/tool/__init__.py
+++ b/src/blenderbim/blenderbim/tool/__init__.py
@@ -16,48 +16,48 @@
 # You should have received a copy of the GNU General Public License
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
-from blenderbim.tool.aggregate import Aggregate
-from blenderbim.tool.blender import Blender
-from blenderbim.tool.boundary import Boundary
-from blenderbim.tool.brick import Brick
-from blenderbim.tool.bsdd import Bsdd
-from blenderbim.tool.cad import Cad
-from blenderbim.tool.clash import Clash
-from blenderbim.tool.collector import Collector
-from blenderbim.tool.context import Context
-from blenderbim.tool.debug import Debug
-from blenderbim.tool.demo import Demo
-from blenderbim.tool.document import Document
-from blenderbim.tool.drawing import Drawing
-from blenderbim.tool.geometry import Geometry
-from blenderbim.tool.georeference import Georeference
-from blenderbim.tool.ifc import Ifc
-from blenderbim.tool.ifcgit import IfcGit
-from blenderbim.tool.ifcgit import IfcGitRepo
-from blenderbim.tool.library import Library
-from blenderbim.tool.loader import Loader
-from blenderbim.tool.material import Material
-from blenderbim.tool.misc import Misc
-from blenderbim.tool.model import Model
-from blenderbim.tool.nest import Nest
-from blenderbim.tool.owner import Owner
-from blenderbim.tool.patch import Patch
-from blenderbim.tool.project import Project
-from blenderbim.tool.profile import Profile
-from blenderbim.tool.pset import Pset
-from blenderbim.tool.qto import Qto
-from blenderbim.tool.resource import Resource
-from blenderbim.tool.root import Root
-from blenderbim.tool.sequence import Sequence
-from blenderbim.tool.spatial import Spatial
-from blenderbim.tool.covering import Covering
-from blenderbim.tool.structural import Structural
-from blenderbim.tool.style import Style
-from blenderbim.tool.surveyor import Surveyor
-from blenderbim.tool.system import System
-from blenderbim.tool.tester import Tester
-from blenderbim.tool.type import Type
-from blenderbim.tool.unit import Unit
-from blenderbim.tool.search import Search
-from blenderbim.tool.cost import Cost
-from blenderbim.tool.web import Web
+from .aggregate import Aggregate
+from .blender import Blender
+from .boundary import Boundary
+from .brick import Brick
+from .bsdd import Bsdd
+from .cad import Cad
+from .clash import Clash
+from .collector import Collector
+from .context import Context
+from .debug import Debug
+from .demo import Demo
+from .document import Document
+from .drawing import Drawing
+from .geometry import Geometry
+from .georeference import Georeference
+from .ifc import Ifc
+from .ifcgit import IfcGit
+from .ifcgit import IfcGitRepo
+from .library import Library
+from .loader import Loader
+from .material import Material
+from .misc import Misc
+from .model import Model
+from .nest import Nest
+from .owner import Owner
+from .patch import Patch
+from .project import Project
+from .profile import Profile
+from .pset import Pset
+from .qto import Qto
+from .resource import Resource
+from .root import Root
+from .sequence import Sequence
+from .spatial import Spatial
+from .covering import Covering
+from .structural import Structural
+from .style import Style
+from .surveyor import Surveyor
+from .system import System
+from .tester import Tester
+from .type import Type
+from .unit import Unit
+from .search import Search
+from .cost import Cost
+from .web import Web
diff --git a/src/blenderbim/blenderbim/tool/blender.py b/src/blenderbim/blenderbim/tool/blender.py
index 6904f7c93a..a5e8454d6b 100644
--- a/src/blenderbim/blenderbim/tool/blender.py
+++ b/src/blenderbim/blenderbim/tool/blender.py
@@ -30,7 +30,7 @@ import addon_utils
 import types
 from mathutils import Vector
 from pathlib import Path
-from blenderbim.bim.ifc import IFC_CONNECTED_TYPE
+from ..bim.ifc import IFC_CONNECTED_TYPE
 from typing import Any, Optional, Union, Literal, Iterable, Callable
 
 
diff --git a/src/blenderbim/blenderbim/tool/debug.py b/src/blenderbim/blenderbim/tool/debug.py
index 3bf44856a1..a416be1c3c 100644
--- a/src/blenderbim/blenderbim/tool/debug.py
+++ b/src/blenderbim/blenderbim/tool/debug.py
@@ -21,7 +21,7 @@ import bpy
 import ifcopenshell.express
 import blenderbim.core.tool
 import blenderbim.tool as tool
-from blenderbim.bim.ifc import IfcStore
+from ..bim.ifc import IfcStore
 
 
 class Debug(blenderbim.core.tool.Debug):
diff --git a/src/blenderbim/blenderbim/tool/document.py b/src/blenderbim/blenderbim/tool/document.py
index 8527b28a23..154c8c0938 100644
--- a/src/blenderbim/blenderbim/tool/document.py
+++ b/src/blenderbim/blenderbim/tool/document.py
@@ -20,7 +20,7 @@ import bpy
 import ifcopenshell.util.system
 import blenderbim.core.tool
 import blenderbim.tool as tool
-from blenderbim.bim import import_ifc
+from ..bim import import_ifc
 
 
 class Document(blenderbim.core.tool.Document):
diff --git a/src/blenderbim/blenderbim/tool/geometry.py b/src/blenderbim/blenderbim/tool/geometry.py
index 780e815ee5..18827a8b51 100644
--- a/src/blenderbim/blenderbim/tool/geometry.py
+++ b/src/blenderbim/blenderbim/tool/geometry.py
@@ -40,7 +40,7 @@ import blenderbim.bim.import_ifc
 from collections import defaultdict
 from math import radians, pi
 from mathutils import Vector, Matrix
-from blenderbim.bim.ifc import IfcStore
+from ..bim.ifc import IfcStore
 from typing import Union, Iterable, Optional, Literal
 from typing import Iterator
 
diff --git a/src/blenderbim/blenderbim/tool/ifc.py b/src/blenderbim/blenderbim/tool/ifc.py
index 43b8e9bd46..a8082266ef 100644
--- a/src/blenderbim/blenderbim/tool/ifc.py
+++ b/src/blenderbim/blenderbim/tool/ifc.py
@@ -25,7 +25,7 @@ import ifcopenshell.util.element
 import blenderbim.core.tool
 import blenderbim.bim.handler
 import blenderbim.tool as tool
-from blenderbim.bim.ifc import IfcStore, IFC_CONNECTED_TYPE
+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 8438344f1b..82785a4743 100644
--- a/src/blenderbim/blenderbim/tool/ifcgit.py
+++ b/src/blenderbim/blenderbim/tool/ifcgit.py
@@ -2,8 +2,8 @@ import os
 import re
 import bpy
 import logging
-from blenderbim.bim import import_ifc
-from blenderbim.bim.ifc import IfcStore
+from ..bim import import_ifc
+from ..bim.ifc import IfcStore
 import blenderbim.tool as tool
 
 # allows git import even if git executable isn't found
diff --git a/src/blenderbim/blenderbim/tool/misc.py b/src/blenderbim/blenderbim/tool/misc.py
index d34e10a716..72b53672a9 100644
--- a/src/blenderbim/blenderbim/tool/misc.py
+++ b/src/blenderbim/blenderbim/tool/misc.py
@@ -23,7 +23,7 @@ import blenderbim.core.tool
 import blenderbim.core.root
 import blenderbim.tool as tool
 from mathutils import Vector, Matrix
-from blenderbim.bim.ifc import IfcStore
+from ..bim.ifc import IfcStore
 
 
 class Misc(blenderbim.core.tool.Misc):
diff --git a/src/blenderbim/blenderbim/tool/model.py b/src/blenderbim/blenderbim/tool/model.py
index 4f79e13a16..e78647ad1c 100644
--- a/src/blenderbim/blenderbim/tool/model.py
+++ b/src/blenderbim/blenderbim/tool/model.py
@@ -36,10 +36,10 @@ from math import atan, degrees
 from mathutils import Matrix, Vector
 from copy import deepcopy
 from functools import partial
-from blenderbim.bim import import_ifc
-from blenderbim.bim.module.geometry.helper import Helper
-from blenderbim.bim.module.model.data import AuthoringData, RailingData, RoofData, WindowData, DoorData
-from blenderbim.bim.module.model.opening import FilledOpeningGenerator
+from ..bim import import_ifc
+from ..bim.module.geometry.helper import Helper
+from ..bim.module.model.data import AuthoringData, RailingData, RoofData, WindowData, DoorData
+from ..bim.module.model.opening import FilledOpeningGenerator
 from ifcopenshell.util.shape_builder import V, ShapeBuilder
 from typing import Optional, Union, TypeVar, Any, Iterable, Literal
 
diff --git a/src/blenderbim/blenderbim/tool/profile.py b/src/blenderbim/blenderbim/tool/profile.py
index cc2bb50b19..385dc70fbc 100644
--- a/src/blenderbim/blenderbim/tool/profile.py
+++ b/src/blenderbim/blenderbim/tool/profile.py
@@ -25,7 +25,7 @@ import ifcopenshell.util.representation
 import blenderbim.core.tool
 import blenderbim.tool as tool
 import PIL.ImageDraw
-from blenderbim.bim.module.model.decorator import ProfileDecorator
+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 b99c24a36e..fd38b36b02 100644
--- a/src/blenderbim/blenderbim/tool/project.py
+++ b/src/blenderbim/blenderbim/tool/project.py
@@ -29,7 +29,7 @@ import blenderbim.core.unit
 import blenderbim.core.owner
 import blenderbim.bim.schema
 import blenderbim.tool as tool
-from blenderbim.bim.ifc import IfcStore
+from ..bim.ifc import IfcStore
 from pathlib import Path
 from typing import Optional
 
diff --git a/src/blenderbim/blenderbim/tool/search.py b/src/blenderbim/blenderbim/tool/search.py
index e018d3aa12..118859c9c6 100644
--- a/src/blenderbim/blenderbim/tool/search.py
+++ b/src/blenderbim/blenderbim/tool/search.py
@@ -4,7 +4,7 @@ import lark
 import blenderbim.core.tool
 import ifcopenshell.guid
 import ifcopenshell.util.selector
-from blenderbim.bim.prop import BIMFacet
+from ..bim.prop import BIMFacet
 from typing import Union, Literal
 
 
diff --git a/src/blenderbim/blenderbim/tool/structural.py b/src/blenderbim/blenderbim/tool/structural.py
index 089120d1ba..247bbc4389 100644
--- a/src/blenderbim/blenderbim/tool/structural.py
+++ b/src/blenderbim/blenderbim/tool/structural.py
@@ -23,7 +23,7 @@ import blenderbim.bim.helper
 import blenderbim.core.tool
 import blenderbim.core.structural
 import blenderbim.tool as tool
-from blenderbim.bim.ifc import IfcStore
+from ..bim.ifc import IfcStore
 from pprint import pprint
 
 
diff --git a/src/blenderbim/blenderbim/tool/system.py b/src/blenderbim/blenderbim/tool/system.py
index 11a683030b..96a7781325 100644
--- a/src/blenderbim/blenderbim/tool/system.py
+++ b/src/blenderbim/blenderbim/tool/system.py
@@ -24,12 +24,12 @@ import blenderbim.core.geometry
 import blenderbim.core.root
 import blenderbim.core.tool
 import blenderbim.tool as tool
-from blenderbim.bim import import_ifc
+from ..bim import import_ifc
 import re
 from math import pi, cos, sin
 from mathutils import Matrix, Vector
-from blenderbim.bim.module.system.data import ObjectSystemData, SystemDecorationData
-from blenderbim.bim.module.drawing.decoration import profile_consequential
+from ..bim.module.system.data import ObjectSystemData, SystemDecorationData
+from ..bim.module.drawing.decoration import profile_consequential
 from enum import Enum
 
 
diff --git a/src/blenderbim/blenderbim/tool/web.py b/src/blenderbim/blenderbim/tool/web.py
index 1b38949ccc..43da1f14ff 100644
--- a/src/blenderbim/blenderbim/tool/web.py
+++ b/src/blenderbim/blenderbim/tool/web.py
@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-from blenderbim.bim.module.web.data import WebData
+from ..bim.module.web.data import WebData
 import blenderbim.core.tool
 import blenderbim.tool as tool
 import ifcopenshell.api.sequence