diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..3c39377
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "bec"]
+	path = bec
+	url = https://gitlab.psi.ch/bec/bec.git
diff --git a/bec b/bec
new file mode 160000
index 0000000..deec158
--- /dev/null
+++ b/bec
@@ -0,0 +1 @@
+Subproject commit deec158e4e58bc703cd302a68045002c3014771d
diff --git a/bec/bec_client/hli/spec_hli.py b/bec_plugins/bec_client/hli/spec_hli.py
similarity index 100%
rename from bec/bec_client/hli/spec_hli.py
rename to bec_plugins/bec_client/hli/spec_hli.py
diff --git a/bec/bec_client/plugins/LamNI/LamNI_logo.png b/bec_plugins/bec_client/plugins/LamNI/LamNI_logo.png
similarity index 100%
rename from bec/bec_client/plugins/LamNI/LamNI_logo.png
rename to bec_plugins/bec_client/plugins/LamNI/LamNI_logo.png
diff --git a/bec/bec_client/plugins/LamNI/__init__.py b/bec_plugins/bec_client/plugins/LamNI/__init__.py
similarity index 100%
rename from bec/bec_client/plugins/LamNI/__init__.py
rename to bec_plugins/bec_client/plugins/LamNI/__init__.py
diff --git a/bec/bec_client/plugins/LamNI/bl_show_all.mac b/bec_plugins/bec_client/plugins/LamNI/bl_show_all.mac
similarity index 100%
rename from bec/bec_client/plugins/LamNI/bl_show_all.mac
rename to bec_plugins/bec_client/plugins/LamNI/bl_show_all.mac
diff --git a/bec/bec_client/plugins/LamNI/lamni_optics_mixin.py b/bec_plugins/bec_client/plugins/LamNI/lamni_optics_mixin.py
similarity index 100%
rename from bec/bec_client/plugins/LamNI/lamni_optics_mixin.py
rename to bec_plugins/bec_client/plugins/LamNI/lamni_optics_mixin.py
diff --git a/bec/bec_client/plugins/LamNI/load_additional_correction.py b/bec_plugins/bec_client/plugins/LamNI/load_additional_correction.py
similarity index 100%
rename from bec/bec_client/plugins/LamNI/load_additional_correction.py
rename to bec_plugins/bec_client/plugins/LamNI/load_additional_correction.py
diff --git a/bec/bec_client/plugins/LamNI/x_ray_eye_align.py b/bec_plugins/bec_client/plugins/LamNI/x_ray_eye_align.py
similarity index 100%
rename from bec/bec_client/plugins/LamNI/x_ray_eye_align.py
rename to bec_plugins/bec_client/plugins/LamNI/x_ray_eye_align.py
diff --git a/bec/bec_client/plugins/cSAXS/__init__.py b/bec_plugins/bec_client/plugins/cSAXS/__init__.py
similarity index 100%
rename from bec/bec_client/plugins/cSAXS/__init__.py
rename to bec_plugins/bec_client/plugins/cSAXS/__init__.py
diff --git a/bec/bec_client/plugins/cSAXS/cSAXS_beamline.py b/bec_plugins/bec_client/plugins/cSAXS/cSAXS_beamline.py
similarity index 100%
rename from bec/bec_client/plugins/cSAXS/cSAXS_beamline.py
rename to bec_plugins/bec_client/plugins/cSAXS/cSAXS_beamline.py
diff --git a/bec/scan_server/plugins/LamNIFermatScan.py b/bec_plugins/scan_server/plugins/LamNIFermatScan.py
similarity index 100%
rename from bec/scan_server/plugins/LamNIFermatScan.py
rename to bec_plugins/scan_server/plugins/LamNIFermatScan.py
diff --git a/bec/scibec/lamni_config.py b/bec_plugins/scibec/lamni_config.py
similarity index 100%
rename from bec/scibec/lamni_config.py
rename to bec_plugins/scibec/lamni_config.py
diff --git a/bec/scibec/test_config_cSAXS.yaml b/bec_plugins/scibec/test_config_cSAXS.yaml
similarity index 100%
rename from bec/scibec/test_config_cSAXS.yaml
rename to bec_plugins/scibec/test_config_cSAXS.yaml