diff --git a/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni.py b/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni.py
index 9f332e9..a3d065e 100644
--- a/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni.py
+++ b/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni.py
@@ -12,7 +12,7 @@ from bec_lib.pdf_writer import PDFWriter
 from bec_lib.scan_repeat import scan_repeat
 from typeguard import typechecked
 
-from csaxs_bec.bec_ipython_client.plugins.omny.omny_general_tools import (
+from csaxs_bec.bec_ipython_client.plugins.OMNY_shared.omny_general_tools import (
     OMNYTools,
     PtychoReconstructor,
     TomoIDManager,
diff --git a/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py b/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py
index 5cbf41b..a7f8683 100644
--- a/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py
+++ b/csaxs_bec/bec_ipython_client/plugins/LamNI/lamni_optics_mixin.py
@@ -7,7 +7,7 @@ from rich.console import Console
 from rich.table import Table
 
 from csaxs_bec.bec_ipython_client.plugins.cSAXS import epics_put
-from csaxs_bec.bec_ipython_client.plugins.omny.omny_general_tools import OMNYTools
+from csaxs_bec.bec_ipython_client.plugins.OMNY_shared.omny_general_tools import OMNYTools
 
 dev = builtins.__dict__.get("dev")
 bec = builtins.__dict__.get("bec")
diff --git a/csaxs_bec/bec_ipython_client/plugins/omny/omny_general_tools.py b/csaxs_bec/bec_ipython_client/plugins/OMNY_shared/omny_general_tools.py
similarity index 100%
rename from csaxs_bec/bec_ipython_client/plugins/omny/omny_general_tools.py
rename to csaxs_bec/bec_ipython_client/plugins/OMNY_shared/omny_general_tools.py
diff --git a/csaxs_bec/bec_ipython_client/plugins/cSAXS/cSAXS.py b/csaxs_bec/bec_ipython_client/plugins/cSAXS/cSAXS.py
index 42325de..da74795 100644
--- a/csaxs_bec/bec_ipython_client/plugins/cSAXS/cSAXS.py
+++ b/csaxs_bec/bec_ipython_client/plugins/cSAXS/cSAXS.py
@@ -11,7 +11,7 @@ from csaxs_bec.bec_ipython_client.plugins.cSAXS.intensity_map_predict_gap import
 from csaxs_bec.bec_ipython_client.plugins.cSAXS.slits import cSAXSSlits
 from csaxs_bec.bec_ipython_client.plugins.cSAXS.smaract import cSAXSInitSmaractStages
 from csaxs_bec.bec_ipython_client.plugins.cSAXS.smaract import cSAXSSmaract
-from csaxs_bec.bec_ipython_client.plugins.omny.omny_general_tools import OMNYTools
+from csaxs_bec.bec_ipython_client.plugins.OMNY_shared.omny_general_tools import OMNYTools
 
 logger = bec_logger.logger
 
diff --git a/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py b/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py
index ff7cb1c..5cf7676 100644
--- a/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py
+++ b/csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py
@@ -23,7 +23,7 @@ from csaxs_bec.bec_ipython_client.plugins.OMNY_shared.tomo_queue_mixin import (
     TomoQueueMixin,
     _GlobalVarParam,
 )
-from csaxs_bec.bec_ipython_client.plugins.omny.omny_general_tools import (
+from csaxs_bec.bec_ipython_client.plugins.OMNY_shared.omny_general_tools import (
     OMNYTools,
     PtychoReconstructor,
     TomoIDManager,
diff --git a/csaxs_bec/bec_ipython_client/plugins/omny/omny.py b/csaxs_bec/bec_ipython_client/plugins/omny/omny.py
index a6bcb36..68c49de 100644
--- a/csaxs_bec/bec_ipython_client/plugins/omny/omny.py
+++ b/csaxs_bec/bec_ipython_client/plugins/omny/omny.py
@@ -14,7 +14,7 @@ from typeguard import typechecked
 from csaxs_bec.bec_ipython_client.plugins.cSAXS import cSAXSBeamlineChecks
 from csaxs_bec.bec_ipython_client.plugins.omny.gui_tools import OMNYGuiTools
 from csaxs_bec.bec_ipython_client.plugins.omny.omny_alignment_mixin import OMNYAlignmentMixin
-from csaxs_bec.bec_ipython_client.plugins.omny.omny_general_tools import OMNYTools
+from csaxs_bec.bec_ipython_client.plugins.OMNY_shared.omny_general_tools import OMNYTools
 from csaxs_bec.bec_ipython_client.plugins.omny.omny_optics_mixin import OMNYOpticsMixin
 from csaxs_bec.bec_ipython_client.plugins.omny.omny_rt import OMNY_rt_client
 from csaxs_bec.bec_ipython_client.plugins.omny.omny_sample_transfer_mixin import (