diff --git a/speckle_toolbox/esri/toolboxes/Speckle.pyt b/speckle_toolbox/esri/toolboxes/Speckle.pyt
index 4dd8691..8c7f9dc 100644
--- a/speckle_toolbox/esri/toolboxes/Speckle.pyt
+++ b/speckle_toolbox/esri/toolboxes/Speckle.pyt
@@ -1,2 +1,2 @@
-try: from speckle.speckle_arcgis import *
-except: from speckle_toolbox.esri.toolboxes.speckle.speckle_arcgis import *
\ No newline at end of file
+try: from speckle.speckle.speckle_arcgis import *
+except: from speckle_toolbox.esri.toolboxes.speckle.speckle.speckle_arcgis import *
\ No newline at end of file
diff --git a/speckle_toolbox/esri/toolboxes/Speckle.pyt.xml b/speckle_toolbox/esri/toolboxes/Speckle.pyt.xml
index 61c9d6b..12662eb 100644
--- a/speckle_toolbox/esri/toolboxes/Speckle.pyt.xml
+++ b/speckle_toolbox/esri/toolboxes/Speckle.pyt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metadata xml:lang="en"><Esri><CreaDate>20220718</CreaDate><CreaTime>13500100</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>TRUE</SyncOnce><ModDate>20230303</ModDate><ModTime>104937</ModTime><scaleRange><minScale>150000000</minScale><maxScale>5000</maxScale></scaleRange><ArcGISProfile>ItemDescription</ArcGISProfile></Esri><toolbox name="Speckle" alias="speckle_toolbox_"><arcToolboxHelpPath>c:\program files\arcgis\pro\Resources\Help\gp</arcToolboxHelpPath><toolsets/></toolbox><dataIdInfo><idCitation><resTitle>Speckle</resTitle></idCitation><idPurp>Speckle connector for ArcGIS</idPurp><searchKeys><keyword>speckle3d</keyword></searchKeys></dataIdInfo><distInfo><distributor><distorFormat><formatName>ArcToolbox Toolbox</formatName></distorFormat></distributor></distInfo><mdHrLv><ScopeCd value="005"></ScopeCd></mdHrLv><Binary><Thumbnail><Data EsriPropertyType="PictureX">/9j/4AAQSkZJRgABAQEAYABgAAD/4gxYSUNDX1BST0ZJTEUAAQEAAAxITGlubwIQAABtbnRyUkdC
+<metadata xml:lang="en"><Esri><CreaDate>20220718</CreaDate><CreaTime>13500100</CreaTime><ArcGISFormat>1.0</ArcGISFormat><SyncOnce>TRUE</SyncOnce><ModDate>20230912</ModDate><ModTime>150318</ModTime><scaleRange><minScale>150000000</minScale><maxScale>5000</maxScale></scaleRange><ArcGISProfile>ItemDescription</ArcGISProfile></Esri><toolbox name="Speckle" alias="speckle_toolbox_"><arcToolboxHelpPath>c:\program files\arcgis\pro\Resources\Help\gp</arcToolboxHelpPath><toolsets/></toolbox><dataIdInfo><idCitation><resTitle>Speckle</resTitle></idCitation><idPurp>Speckle connector for ArcGIS</idPurp><searchKeys><keyword>speckle3d</keyword></searchKeys></dataIdInfo><distInfo><distributor><distorFormat><formatName>ArcToolbox Toolbox</formatName></distorFormat></distributor></distInfo><mdHrLv><ScopeCd value="005"></ScopeCd></mdHrLv><Binary><Thumbnail><Data EsriPropertyType="PictureX">/9j/4AAQSkZJRgABAQEAYABgAAD/4gxYSUNDX1BST0ZJTEUAAQEAAAxITGlubwIQAABtbnRyUkdC
 IFhZWiAHzgACAAkABgAxAABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAA
 AADTLUhQICAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFj
 cHJ0AAABUAAAADNkZXNjAAABhAAAAGx3dHB0AAAB8AAAABRia3B0AAACBAAAABRyWFlaAAACGAAA
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/__init__.py b/speckle_toolbox/esri/toolboxes/speckle/__init__.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/__init__.py
rename to speckle_toolbox/esri/toolboxes/speckle/__init__.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/__init__.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/geometry/__init__.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/geometry/__init__.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/geometry/__init__.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/geometry/__init__.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/geometry/mesh.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/geometry/mesh.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/geometry/mesh.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/geometry/mesh.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/geometry/point.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/geometry/point.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/geometry/point.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/geometry/point.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/geometry/polygon.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/geometry/polygon.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/geometry/polygon.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/geometry/polygon.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/geometry/polyline.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/geometry/polyline.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/geometry/polyline.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/geometry/polyline.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/geometry/utils.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/geometry/utils.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/geometry/utils.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/geometry/utils.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/layers/CRS.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/CRS.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/layers/CRS.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/CRS.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/layers/Layer.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/Layer.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/layers/Layer.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/Layer.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/layers/__init__.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/__init__.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/layers/__init__.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/__init__.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/layers/emptyLayerTemplates.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/emptyLayerTemplates.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/layers/emptyLayerTemplates.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/emptyLayerTemplates.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/layers/feature.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/feature.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/layers/feature.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/feature.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/layers/symbology.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/symbology.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/layers/symbology.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/symbology.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/converter/layers/utils.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/utils.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/converter/layers/utils.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/utils.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/plugin_utils/helpers.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/helpers.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/plugin_utils/helpers.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/helpers.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/plugin_utils/install_message.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/install_message.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/plugin_utils/install_message.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/install_message.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/plugin_utils/object_utils.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/object_utils.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/plugin_utils/object_utils.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/object_utils.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/plugin_utils/speckle.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/speckle.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/plugin_utils/speckle.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/speckle.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/plugin_utils/speckle_large.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/speckle_large.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/plugin_utils/speckle_large.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/speckle_large.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/plugin_utils/testing_from_file.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/testing_from_file.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/plugin_utils/testing_from_file.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/testing_from_file.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/plugin_utils/unit_tests.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/unit_tests.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/plugin_utils/unit_tests.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/plugin_utils/unit_tests.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/speckle_arcgis.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/speckle_arcgis.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/speckle_arcgis.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/speckle_arcgis.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/LogWidget.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/LogWidget.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/LogWidget.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/LogWidget.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/add_stream_modal.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/add_stream_modal.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/add_stream_modal.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/add_stream_modal.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/add_stream_modal.ui b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/add_stream_modal.ui
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/add_stream_modal.ui
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/add_stream_modal.ui
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/create_branch.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/create_branch.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/create_branch.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/create_branch.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/create_branch.ui b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/create_branch.ui
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/create_branch.ui
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/create_branch.ui
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/create_stream.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/create_stream.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/create_stream.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/create_stream.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/create_stream.ui b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/create_stream.ui
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/create_stream.ui
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/create_stream.ui
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/cube-receive-black.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/cube-receive-black.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/cube-receive-black.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/cube-receive-black.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/cube-receive-blue.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/cube-receive-blue.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/cube-receive-blue.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/cube-receive-blue.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/cube-receive.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/cube-receive.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/cube-receive.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/cube-receive.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/cube-send-black.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/cube-send-black.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/cube-send-black.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/cube-send-black.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/cube-send-blue.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/cube-send-blue.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/cube-send-blue.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/cube-send-blue.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/cube-send.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/cube-send.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/cube-send.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/cube-send.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/delete-blue.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/delete-blue.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/delete-blue.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/delete-blue.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/delete.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/delete.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/delete.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/delete.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/legend_line.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/legend_line.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/legend_line.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/legend_line.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/legend_point.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/legend_point.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/legend_point.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/legend_point.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/legend_polygon.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/legend_polygon.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/legend_polygon.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/legend_polygon.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/legend_raster.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/legend_raster.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/legend_raster.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/legend_raster.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/logger.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/logger.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/logger.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/logger.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/logo-slab-white@0.5x.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/logo-slab-white@0.5x.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/logo-slab-white@0.5x.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/logo-slab-white@0.5x.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/magnify.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/magnify.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/magnify.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/magnify.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/project_vars.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/project_vars.py
similarity index 99%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/project_vars.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/project_vars.py
index 5bed93d..d616f18 100644
--- a/speckle_toolbox/esri/toolboxes/speckle/ui/project_vars.py
+++ b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/project_vars.py
@@ -27,7 +27,7 @@ try:
     from speckle.ui.logger import logToUser
 except: 
     from speckle_toolbox.esri.toolboxes.speckle.ui.validation import tryGetStream
-    from speckle_toolbox.esri.toolboxes.speckle.speckle_arcgis import SpeckleGIS
+    from speckle_toolbox.esri.toolboxes.speckle.speckle.speckle_arcgis import SpeckleGIS
     from speckle_toolbox.esri.toolboxes.speckle.converter.layers import getAllProjLayers
     from speckle_toolbox.esri.toolboxes.speckle.ui.logger import logToUser
 
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/size-xxl.png b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/size-xxl.png
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/size-xxl.png
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/size-xxl.png
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/speckle_qgis_dialog.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/speckle_qgis_dialog.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/speckle_qgis_dialog.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/speckle_qgis_dialog.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/speckle_qgis_dialog_base.ui b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/speckle_qgis_dialog_base.ui
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/speckle_qgis_dialog_base.ui
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/speckle_qgis_dialog_base.ui
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/streamlist_dialog.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/streamlist_dialog.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/streamlist_dialog.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/streamlist_dialog.py
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/streamlist_dialog.ui b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/streamlist_dialog.ui
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/streamlist_dialog.ui
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/streamlist_dialog.ui
diff --git a/speckle_toolbox/esri/toolboxes/speckle/ui/validation.py b/speckle_toolbox/esri/toolboxes/speckle/speckle/ui/validation.py
similarity index 100%
rename from speckle_toolbox/esri/toolboxes/speckle/ui/validation.py
rename to speckle_toolbox/esri/toolboxes/speckle/speckle/ui/validation.py
diff --git a/tests/tests_unittest.py b/tests/tests_unittest.py
index 8c73abd..8727d74 100644
--- a/tests/tests_unittest.py
+++ b/tests/tests_unittest.py
@@ -1,4 +1,4 @@
-from speckle_toolbox.esri.toolboxes.speckle.speckle_arcgis import Toolbox, Speckle   # The code to test
+from speckle_toolbox.esri.toolboxes.speckle.speckle.speckle_arcgis import Toolbox, Speckle   # The code to test
 from speckle_toolbox.esri.toolboxes.speckle.ui.project_vars import speckleInputsClass, toolboxInputsClass
 
 import arcpy