diff --git a/src/blenderbim/blenderbim/bim/handler.py b/src/blenderbim/blenderbim/bim/handler.py
index dbbb001d78..730ad37198 100644
--- a/src/blenderbim/blenderbim/bim/handler.py
+++ b/src/blenderbim/blenderbim/bim/handler.py
@@ -25,7 +25,7 @@ import ifcopenshell.util.representation
 import ifcopenshell.api.owner.settings
 import blenderbim.bim
 from .. import tool
-import blenderbim.core.owner as core_owner
+from ..core import owner as core_owner
 from bpy.app.handlers import persistent
 from .ifc import IfcStore
 from .module.owner.prop import get_user_person, get_user_organisation
diff --git a/src/blenderbim/blenderbim/bim/module/aggregate/operator.py b/src/blenderbim/blenderbim/bim/module/aggregate/operator.py
index b5f542ce2d..f3679bd998 100644
--- a/src/blenderbim/blenderbim/bim/module/aggregate/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/aggregate/operator.py
@@ -20,7 +20,7 @@ import bpy
 import ifcopenshell
 import ifcopenshell.util.element
 from .... import tool
-import blenderbim.core.aggregate as core
+from ....core import aggregate as core
 import blenderbim.core.spatial
 import blenderbim.bim.handler
 from ...ifc import IfcStore
diff --git a/src/blenderbim/blenderbim/bim/module/attribute/operator.py b/src/blenderbim/blenderbim/bim/module/attribute/operator.py
index ac5af42920..3e323fe25d 100644
--- a/src/blenderbim/blenderbim/bim/module/attribute/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/attribute/operator.py
@@ -24,7 +24,7 @@ import ifcopenshell.guid
 import blenderbim.bim.helper
 import blenderbim.bim.handler
 from .... import tool
-import blenderbim.core.attribute as core
+from ....core import attribute as core
 from ...ifc import IfcStore
 
 
diff --git a/src/blenderbim/blenderbim/bim/module/bcf/operator.py b/src/blenderbim/blenderbim/bim/module/bcf/operator.py
index 9ddbc6e5dc..29d09f5895 100644
--- a/src/blenderbim/blenderbim/bim/module/bcf/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/bcf/operator.py
@@ -27,7 +27,7 @@ import tempfile
 import webbrowser
 import ifcopenshell
 import ifcopenshell.util.unit
-import blenderbim.bim.module.bcf.prop as bcf_prop
+from . import prop as bcf_prop
 from . import bcfstore
 from pathlib import Path
 from ...ifc import IfcStore
diff --git a/src/blenderbim/blenderbim/bim/module/brick/operator.py b/src/blenderbim/blenderbim/bim/module/brick/operator.py
index d0ce1b4a72..ea3b2ef587 100644
--- a/src/blenderbim/blenderbim/bim/module/brick/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/brick/operator.py
@@ -20,7 +20,7 @@ import os
 import bpy
 import ifcopenshell.api
 from .... import tool
-import blenderbim.core.brick as core
+from ....core import brick as core
 import blenderbim.bim.handler
 from ...ifc import IfcStore
 from ....tool.brick import BrickStore
diff --git a/src/blenderbim/blenderbim/bim/module/brick/prop.py b/src/blenderbim/blenderbim/bim/module/brick/prop.py
index edd617f5aa..6f742c089b 100644
--- a/src/blenderbim/blenderbim/bim/module/brick/prop.py
+++ b/src/blenderbim/blenderbim/bim/module/brick/prop.py
@@ -30,8 +30,8 @@ from bpy.props import (
     FloatVectorProperty,
     CollectionProperty,
 )
-import blenderbim.core.brick as core
-import blenderbim.tool.brick as tool
+from ....core import brick as core
+from ....tool import brick as tool
 from ....tool.brick import BrickStore
 
 def update_active_brick_index(self, context):
diff --git a/src/blenderbim/blenderbim/bim/module/cad/workspace.py b/src/blenderbim/blenderbim/bim/module/cad/workspace.py
index a4857adb1a..dd69c17dc6 100644
--- a/src/blenderbim/blenderbim/bim/module/cad/workspace.py
+++ b/src/blenderbim/blenderbim/bim/module/cad/workspace.py
@@ -19,7 +19,7 @@
 import os
 import bpy
 from .... import tool
-import blenderbim.bim.module.type.prop as type_prop
+from ..type import prop as type_prop
 import ifcopenshell.util.unit
 from bpy.types import WorkSpaceTool
 from ..model.data import AuthoringData, RailingData, RoofData
diff --git a/src/blenderbim/blenderbim/bim/module/classification/ui.py b/src/blenderbim/blenderbim/bim/module/classification/ui.py
index bce4dc4396..6ddf4d0384 100644
--- a/src/blenderbim/blenderbim/bim/module/classification/ui.py
+++ b/src/blenderbim/blenderbim/bim/module/classification/ui.py
@@ -18,7 +18,7 @@
 
 import blenderbim.bim.helper
 from .... import tool
-import blenderbim.bim.module.classification.prop as classification_prop
+from . import prop as classification_prop
 from bpy.types import Panel, UIList
 from ...ifc import IfcStore
 from .data import (
diff --git a/src/blenderbim/blenderbim/bim/module/context/operator.py b/src/blenderbim/blenderbim/bim/module/context/operator.py
index 7bc379af7b..d9bc2d0616 100644
--- a/src/blenderbim/blenderbim/bim/module/context/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/context/operator.py
@@ -18,7 +18,7 @@
 
 import bpy
 from .... import tool
-import blenderbim.core.context as core
+from ....core import context as core
 import blenderbim.bim.module.context.data
 import blenderbim.bim.handler
 from ...ifc import IfcStore
diff --git a/src/blenderbim/blenderbim/bim/module/cost/operator.py b/src/blenderbim/blenderbim/bim/module/cost/operator.py
index 9696c0d7c4..2ff726889d 100644
--- a/src/blenderbim/blenderbim/bim/module/cost/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/cost/operator.py
@@ -25,7 +25,7 @@ import blenderbim.bim.helper
 from .... import tool
 from bpy_extras.io_utils import ImportHelper
 from .... import tool
-import blenderbim.core.cost as core
+from ....core import cost as core
 
 
 class AddCostSchedule(bpy.types.Operator, tool.Ifc.Operator):
diff --git a/src/blenderbim/blenderbim/bim/module/cost/ui.py b/src/blenderbim/blenderbim/bim/module/cost/ui.py
index 1fe9c045d7..ca50427c35 100644
--- a/src/blenderbim/blenderbim/bim/module/cost/ui.py
+++ b/src/blenderbim/blenderbim/bim/module/cost/ui.py
@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import blenderbim.bim.helper
-import blenderbim.bim.module.cost.prop as CostProp
+from . import prop as CostProp
 from bpy.types import Panel, UIList
 from ...ifc import IfcStore
 from .data import CostSchedulesData
diff --git a/src/blenderbim/blenderbim/bim/module/debug/operator.py b/src/blenderbim/blenderbim/bim/module/debug/operator.py
index db0838ce13..0e7e231051 100644
--- a/src/blenderbim/blenderbim/bim/module/debug/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/debug/operator.py
@@ -32,7 +32,7 @@ import ifcopenshell.util.element
 import ifcopenshell.util.placement
 import ifcopenshell.util.representation
 from .... import tool
-import blenderbim.core.debug as core
+from ....core import debug as core
 import blenderbim.bim.handler
 from ... import import_ifc
 from pathlib import Path
diff --git a/src/blenderbim/blenderbim/bim/module/demo/operator.py b/src/blenderbim/blenderbim/bim/module/demo/operator.py
index bb2914e373..7c163b3fc9 100644
--- a/src/blenderbim/blenderbim/bim/module/demo/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/demo/operator.py
@@ -29,7 +29,7 @@
 
 import bpy
 from .... import tool
-import blenderbim.core.demo as core
+from ....core import demo as core
 import blenderbim.bim.handler
 
 
diff --git a/src/blenderbim/blenderbim/bim/module/document/operator.py b/src/blenderbim/blenderbim/bim/module/document/operator.py
index 8003132b25..87975d18c7 100644
--- a/src/blenderbim/blenderbim/bim/module/document/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/document/operator.py
@@ -21,7 +21,7 @@ import json
 import ifcopenshell.api
 import ifcopenshell.util.attribute
 from .... import tool
-import blenderbim.core.document as core
+from ....core import document as core
 from ...ifc import IfcStore
 
 
diff --git a/src/blenderbim/blenderbim/bim/module/drawing/operator.py b/src/blenderbim/blenderbim/bim/module/drawing/operator.py
index 6dbaaf818e..a79398600a 100644
--- a/src/blenderbim/blenderbim/bim/module/drawing/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/drawing/operator.py
@@ -40,7 +40,7 @@ import blenderbim.bim.helper
 import blenderbim.bim.handler
 from .... import tool
 import blenderbim.core.geometry
-import blenderbim.core.drawing as core
+from ....core import drawing as core
 from . import svgwriter
 from . import annotation
 from . import sheeter
diff --git a/src/blenderbim/blenderbim/bim/module/drawing/prop.py b/src/blenderbim/blenderbim/bim/module/drawing/prop.py
index aa62306e99..45ec39aa82 100644
--- a/src/blenderbim/blenderbim/bim/module/drawing/prop.py
+++ b/src/blenderbim/blenderbim/bim/module/drawing/prop.py
@@ -22,7 +22,7 @@ import json
 import enum
 import ifcopenshell
 from .... import tool
-import blenderbim.core.drawing as core
+from ....core import drawing as core
 from . import annotation
 from . import decoration
 from ...prop import BIMFilterGroup
diff --git a/src/blenderbim/blenderbim/bim/module/geometry/operator.py b/src/blenderbim/blenderbim/bim/module/geometry/operator.py
index cb79833272..0eb313eb41 100644
--- a/src/blenderbim/blenderbim/bim/module/geometry/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/geometry/operator.py
@@ -29,7 +29,7 @@ import ifcopenshell.util.representation
 import ifcopenshell.util.placement
 import ifcopenshell.api
 import blenderbim.core.geometry
-import blenderbim.core.geometry as core
+from ....core import geometry as core
 import blenderbim.core.aggregate
 import blenderbim.core.style
 import blenderbim.core.root
diff --git a/src/blenderbim/blenderbim/bim/module/georeference/operator.py b/src/blenderbim/blenderbim/bim/module/georeference/operator.py
index f6bc1d6b08..2d3e4d43aa 100644
--- a/src/blenderbim/blenderbim/bim/module/georeference/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/georeference/operator.py
@@ -19,7 +19,7 @@
 import bpy
 
 from .... import tool
-import blenderbim.core.georeference as core
+from ....core import georeference as core
 from .decorator import GeoreferenceDecorator
 
 
diff --git a/src/blenderbim/blenderbim/bim/module/ifcgit/operator.py b/src/blenderbim/blenderbim/bim/module/ifcgit/operator.py
index fe00910080..866313d29b 100644
--- a/src/blenderbim/blenderbim/bim/module/ifcgit/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/ifcgit/operator.py
@@ -1,7 +1,7 @@
 import os
 import re
 import bpy
-import blenderbim.core.ifcgit as core
+from ....core import ifcgit as core
 from .... import tool
 from .data import IfcGitData, refresh
 
diff --git a/src/blenderbim/blenderbim/bim/module/library/operator.py b/src/blenderbim/blenderbim/bim/module/library/operator.py
index ad8e030342..a57aa80d22 100644
--- a/src/blenderbim/blenderbim/bim/module/library/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/library/operator.py
@@ -19,7 +19,7 @@
 import bpy
 import ifcopenshell.api
 from .... import tool
-import blenderbim.core.library as core
+from ....core import library as core
 import blenderbim.bim.handler
 from ...ifc import IfcStore
 
diff --git a/src/blenderbim/blenderbim/bim/module/material/operator.py b/src/blenderbim/blenderbim/bim/module/material/operator.py
index 2ad0cca580..679a83a2ec 100644
--- a/src/blenderbim/blenderbim/bim/module/material/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/material/operator.py
@@ -25,8 +25,8 @@ import ifcopenshell.util.representation
 import blenderbim.bim.helper
 from .... import tool
 import blenderbim.core.style
-import blenderbim.core.material as core
-import blenderbim.bim.module.model.profile as model_profile
+from ....core import material as core
+from ..model import profile as model_profile
 from .prop import purge as material_prop_purge
 from ...ifc import IfcStore
 
diff --git a/src/blenderbim/blenderbim/bim/module/misc/operator.py b/src/blenderbim/blenderbim/bim/module/misc/operator.py
index 5793523cc9..467eed8fe3 100644
--- a/src/blenderbim/blenderbim/bim/module/misc/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/misc/operator.py
@@ -21,8 +21,8 @@ import numpy as np
 import ifcopenshell
 import blenderbim.bim.handler
 from .... import tool
-import blenderbim.core.misc as core
-import blenderbim.core.geometry as core_geometry
+from ....core import misc as core
+from ....core import geometry as core_geometry
 import blenderbim.core.root
 from ...ifc import IfcStore
 from mathutils import Vector, Matrix, Euler
diff --git a/src/blenderbim/blenderbim/bim/module/model/covering.py b/src/blenderbim/blenderbim/bim/module/model/covering.py
index 0cc51fb205..3761b8034f 100644
--- a/src/blenderbim/blenderbim/bim/module/model/covering.py
+++ b/src/blenderbim/blenderbim/bim/module/model/covering.py
@@ -20,7 +20,7 @@
 import bpy
 import ifcopenshell
 from .... import tool
-import blenderbim.core.covering as core
+from ....core import covering as core
 
 
 class AddInstanceFlooringCoveringFromCursor(bpy.types.Operator, tool.Ifc.Operator):
diff --git a/src/blenderbim/blenderbim/bim/module/model/door.py b/src/blenderbim/blenderbim/bim/module/model/door.py
index 893780705c..3645927323 100644
--- a/src/blenderbim/blenderbim/bim/module/model/door.py
+++ b/src/blenderbim/blenderbim/bim/module/model/door.py
@@ -28,7 +28,7 @@ import ifcopenshell.util.representation
 from ifcopenshell.util.shape_builder import V
 from .... import tool
 import blenderbim.core.geometry
-import blenderbim.core.geometry as core
+from ....core import geometry as core
 import blenderbim.core.root
 from .window import create_bm_window, create_bm_box
 
diff --git a/src/blenderbim/blenderbim/bim/module/model/space.py b/src/blenderbim/blenderbim/bim/module/model/space.py
index 691f6b7f36..9c0e810a99 100644
--- a/src/blenderbim/blenderbim/bim/module/model/space.py
+++ b/src/blenderbim/blenderbim/bim/module/model/space.py
@@ -19,7 +19,7 @@
 
 import bpy
 from .... import tool
-import blenderbim.core.spatial as core
+from ....core import spatial as core
 
 
 class GenerateSpace(bpy.types.Operator, tool.Ifc.Operator):
diff --git a/src/blenderbim/blenderbim/bim/module/model/wall.py b/src/blenderbim/blenderbim/bim/module/model/wall.py
index 340ce714ab..2b63be8b2f 100644
--- a/src/blenderbim/blenderbim/bim/module/model/wall.py
+++ b/src/blenderbim/blenderbim/bim/module/model/wall.py
@@ -32,7 +32,7 @@ import blenderbim.bim.handler
 import blenderbim.core.type
 import blenderbim.core.root
 import blenderbim.core.geometry
-import blenderbim.core.model as core
+from ....core import model as core
 from .... import tool
 from ...ifc import IfcStore
 from math import pi, sin, cos, degrees
diff --git a/src/blenderbim/blenderbim/bim/module/model/workspace.py b/src/blenderbim/blenderbim/bim/module/model/workspace.py
index a95dc96062..7d161277cf 100644
--- a/src/blenderbim/blenderbim/bim/module/model/workspace.py
+++ b/src/blenderbim/blenderbim/bim/module/model/workspace.py
@@ -19,7 +19,7 @@
 import os
 import bpy
 from .... import tool
-import blenderbim.core.model as core
+from ....core import model as core
 from .wall import DumbWallJoiner
 from ...helper import prop_with_search
 from bpy.types import WorkSpaceTool
diff --git a/src/blenderbim/blenderbim/bim/module/nest/operator.py b/src/blenderbim/blenderbim/bim/module/nest/operator.py
index 179c23bdbd..7f4bb20236 100644
--- a/src/blenderbim/blenderbim/bim/module/nest/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/nest/operator.py
@@ -20,7 +20,7 @@ import bpy
 import ifcopenshell
 import ifcopenshell.util.element
 from .... import tool
-import blenderbim.core.nest as core
+from ....core import nest as core
 import blenderbim.core.spatial
 import blenderbim.bim.handler
 from ...ifc import IfcStore
diff --git a/src/blenderbim/blenderbim/bim/module/owner/operator.py b/src/blenderbim/blenderbim/bim/module/owner/operator.py
index efb1f0a0ea..e91cbf90ec 100644
--- a/src/blenderbim/blenderbim/bim/module/owner/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/owner/operator.py
@@ -18,7 +18,7 @@
 
 import bpy
 from .... import tool
-import blenderbim.core.owner as core
+from ....core import owner as core
 import blenderbim.bim.handler
 from ...ifc import IfcStore
 
diff --git a/src/blenderbim/blenderbim/bim/module/patch/operator.py b/src/blenderbim/blenderbim/bim/module/patch/operator.py
index a35bf297fe..1f29a79516 100644
--- a/src/blenderbim/blenderbim/bim/module/patch/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/patch/operator.py
@@ -21,7 +21,7 @@ import bpy
 import json
 import ifcopenshell
 from .... import tool
-import blenderbim.core.patch as core
+from ....core import patch as core
 import blenderbim.bim.handler
 from pathlib import Path
 
diff --git a/src/blenderbim/blenderbim/bim/module/profile/operator.py b/src/blenderbim/blenderbim/bim/module/profile/operator.py
index 5fa30a90de..0f88538709 100644
--- a/src/blenderbim/blenderbim/bim/module/profile/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/profile/operator.py
@@ -20,8 +20,8 @@ import bpy
 import ifcopenshell.api
 import blenderbim.bim.helper
 from .... import tool
-import blenderbim.bim.module.model.profile as model_profile
-import blenderbim.core.profile as core
+from ..model import profile as model_profile
+from ....core import profile as core
 from ..model.decorator import ProfileDecorator
 from .prop import generate_thumbnail_for_active_profile
 from .data import refresh
diff --git a/src/blenderbim/blenderbim/bim/module/project/operator.py b/src/blenderbim/blenderbim/bim/module/project/operator.py
index 9037c96b2a..9fe9bd7766 100644
--- a/src/blenderbim/blenderbim/bim/module/project/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/project/operator.py
@@ -40,7 +40,7 @@ import ifcopenshell.util.unit
 import blenderbim.bim.handler
 import blenderbim.bim.schema
 from .... import tool
-import blenderbim.core.project as core
+from ....core import project as core
 import blenderbim.core.context
 import blenderbim.core.owner
 import blenderbim.core.spatial
diff --git a/src/blenderbim/blenderbim/bim/module/pset/operator.py b/src/blenderbim/blenderbim/bim/module/pset/operator.py
index be27a8e5fd..8dab1944b8 100644
--- a/src/blenderbim/blenderbim/bim/module/pset/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/pset/operator.py
@@ -26,7 +26,7 @@ import blenderbim.bim.schema
 import blenderbim.bim.helper
 import blenderbim.bim.handler
 from .... import tool
-import blenderbim.core.pset as core
+from ....core import pset as core
 import blenderbim.bim.module.pset.data
 from ...ifc import IfcStore
 
diff --git a/src/blenderbim/blenderbim/bim/module/qto/operator.py b/src/blenderbim/blenderbim/bim/module/qto/operator.py
index 6353b9748e..c5bb888952 100644
--- a/src/blenderbim/blenderbim/bim/module/qto/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/qto/operator.py
@@ -20,7 +20,7 @@ import bpy
 import ifcopenshell
 import ifcopenshell.api
 from .... import tool
-import blenderbim.core.qto as core
+from ....core import qto as core
 from ...ifc import IfcStore
 from . import helper
 
diff --git a/src/blenderbim/blenderbim/bim/module/resource/operator.py b/src/blenderbim/blenderbim/bim/module/resource/operator.py
index dc23d8627b..e4dff76725 100644
--- a/src/blenderbim/blenderbim/bim/module/resource/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/resource/operator.py
@@ -19,7 +19,7 @@
 import bpy
 from bpy_extras.io_utils import ImportHelper
 from .ui import draw_productivity_ui
-import blenderbim.core.resource as core
+from ....core import resource as core
 from .... import tool
 
 
diff --git a/src/blenderbim/blenderbim/bim/module/root/operator.py b/src/blenderbim/blenderbim/bim/module/root/operator.py
index a16a844839..9fd6e4dbb5 100644
--- a/src/blenderbim/blenderbim/bim/module/root/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/root/operator.py
@@ -28,7 +28,7 @@ import blenderbim.core.material
 import blenderbim.core.spatial
 import blenderbim.core.style
 import blenderbim.core.type
-import blenderbim.core.root as core
+from ....core import root as core
 from .... import tool
 from ...ifc import IfcStore
 from ...helper import get_enum_items
diff --git a/src/blenderbim/blenderbim/bim/module/root/ui.py b/src/blenderbim/blenderbim/bim/module/root/ui.py
index 6bca66d10f..d4be030182 100644
--- a/src/blenderbim/blenderbim/bim/module/root/ui.py
+++ b/src/blenderbim/blenderbim/bim/module/root/ui.py
@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-import blenderbim.bim.module.root.prop as root_prop
+from . import prop as root_prop
 from bpy.types import Panel
 from ...ifc import IfcStore
 from ...helper import prop_with_search
diff --git a/src/blenderbim/blenderbim/bim/module/search/operator.py b/src/blenderbim/blenderbim/bim/module/search/operator.py
index 8d2011ed3e..e077336b26 100644
--- a/src/blenderbim/blenderbim/bim/module/search/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/search/operator.py
@@ -25,7 +25,7 @@ import ifcopenshell.util.element
 import ifcopenshell.util.selector
 from .... import tool
 from ...ifc import IfcStore
-import blenderbim.core.search as core
+from ....core import search as core
 from itertools import cycle
 from bpy.types import PropertyGroup, Operator
 from bpy.props import (
diff --git a/src/blenderbim/blenderbim/bim/module/sequence/operator.py b/src/blenderbim/blenderbim/bim/module/sequence/operator.py
index 09473eaa66..4be77a498c 100644
--- a/src/blenderbim/blenderbim/bim/module/sequence/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/sequence/operator.py
@@ -22,7 +22,7 @@ import json
 import time
 import calendar
 import isodate
-import blenderbim.core.sequence as core
+from ....core import sequence as core
 from .... import tool
 from . import helper
 import ifcopenshell.util.sequence
diff --git a/src/blenderbim/blenderbim/bim/module/sequence/prop.py b/src/blenderbim/blenderbim/bim/module/sequence/prop.py
index cc6605271d..64447abe36 100644
--- a/src/blenderbim/blenderbim/bim/module/sequence/prop.py
+++ b/src/blenderbim/blenderbim/bim/module/sequence/prop.py
@@ -22,7 +22,7 @@ import ifcopenshell.api
 import ifcopenshell.util.attribute
 from ifcopenshell.util.doc import get_predefined_type_doc
 from .... import tool
-import blenderbim.core.sequence as core
+from ....core import sequence as core
 from ...ifc import IfcStore
 from .data import SequenceData, AnimationColorSchemeData, refresh as refresh_sequence_data
 import blenderbim.bim.module.resource.data
diff --git a/src/blenderbim/blenderbim/bim/module/spatial/operator.py b/src/blenderbim/blenderbim/bim/module/spatial/operator.py
index 31a1ad6cdb..8759f58395 100644
--- a/src/blenderbim/blenderbim/bim/module/spatial/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/spatial/operator.py
@@ -19,7 +19,7 @@
 import bpy
 import ifcopenshell.util.element
 from .... import tool
-import blenderbim.core.spatial as core
+from ....core import spatial as core
 import blenderbim.core.geometry
 import blenderbim.core.aggregate
 import blenderbim.core.root
diff --git a/src/blenderbim/blenderbim/bim/module/structural/operator.py b/src/blenderbim/blenderbim/bim/module/structural/operator.py
index 0a48da6e05..1a5ae1c3ce 100644
--- a/src/blenderbim/blenderbim/bim/module/structural/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/structural/operator.py
@@ -23,7 +23,7 @@ import ifcopenshell.api
 import ifcopenshell.util.attribute
 import blenderbim.bim.helper
 import blenderbim.bim.handler
-import blenderbim.core.structural as core
+from ....core import structural as core
 from .... import tool
 import blenderbim.core.context
 from math import degrees
diff --git a/src/blenderbim/blenderbim/bim/module/style/operator.py b/src/blenderbim/blenderbim/bim/module/style/operator.py
index 1cda5f6db9..60c7daf8b1 100644
--- a/src/blenderbim/blenderbim/bim/module/style/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/style/operator.py
@@ -21,7 +21,7 @@ import bpy
 import blenderbim.bim.helper
 import blenderbim.bim.handler
 from .... import tool
-import blenderbim.core.style as core
+from ....core import style as core
 import ifcopenshell.api
 import ifcopenshell.api.style
 import ifcopenshell.util.representation
diff --git a/src/blenderbim/blenderbim/bim/module/system/operator.py b/src/blenderbim/blenderbim/bim/module/system/operator.py
index 1f3ce57ac7..ae8c2aaeaf 100644
--- a/src/blenderbim/blenderbim/bim/module/system/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/system/operator.py
@@ -19,7 +19,7 @@
 import bpy
 import ifcopenshell.api
 from .... import tool
-import blenderbim.core.system as core
+from ....core import system as core
 import blenderbim.bim.handler
 import blenderbim.bim.helper
 from ...ifc import IfcStore
diff --git a/src/blenderbim/blenderbim/bim/module/type/operator.py b/src/blenderbim/blenderbim/bim/module/type/operator.py
index 36e07ca07a..e142c23801 100644
--- a/src/blenderbim/blenderbim/bim/module/type/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/type/operator.py
@@ -26,7 +26,7 @@ import ifcopenshell.util.unit
 import ifcopenshell.api
 from .... import tool
 import blenderbim.core.geometry
-import blenderbim.core.type as core
+from ....core import type as core
 import blenderbim.core.root
 from ...ifc import IfcStore
 
diff --git a/src/blenderbim/blenderbim/bim/module/type/ui.py b/src/blenderbim/blenderbim/bim/module/type/ui.py
index 18bee59380..9e3f6b3669 100644
--- a/src/blenderbim/blenderbim/bim/module/type/ui.py
+++ b/src/blenderbim/blenderbim/bim/module/type/ui.py
@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 from .... import tool
-import blenderbim.bim.module.type.prop as type_prop
+from . import prop as type_prop
 from bpy.types import Panel
 from ...ifc import IfcStore
 from ...helper import prop_with_search
diff --git a/src/blenderbim/blenderbim/bim/module/unit/operator.py b/src/blenderbim/blenderbim/bim/module/unit/operator.py
index 9c99751d33..1d9b52c67f 100644
--- a/src/blenderbim/blenderbim/bim/module/unit/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/unit/operator.py
@@ -23,7 +23,7 @@ import ifcopenshell.util.unit
 import blenderbim.bim.helper
 import blenderbim.bim.handler
 from .... import tool
-import blenderbim.core.unit as core
+from ....core import unit as core
 from ...ifc import IfcStore
 
 
diff --git a/src/blenderbim/blenderbim/bim/module/web/operator.py b/src/blenderbim/blenderbim/bim/module/web/operator.py
index b1a2df0c21..f79b4f550b 100644
--- a/src/blenderbim/blenderbim/bim/module/web/operator.py
+++ b/src/blenderbim/blenderbim/bim/module/web/operator.py
@@ -18,7 +18,7 @@
 
 import os
 import bpy
-import blenderbim.core.web as core
+from ....core import web as core
 from .... import tool