diff --git a/csaxs_bec/device_configs/bec_device_config_sastt.yaml b/csaxs_bec/device_configs/bec_device_config_sastt.yaml
index 30798d1..142794f 100755
--- a/csaxs_bec/device_configs/bec_device_config_sastt.yaml
+++ b/csaxs_bec/device_configs/bec_device_config_sastt.yaml
@@ -17,7 +17,7 @@ bpm4i:
   softwareTrigger: false
 mokev:
   description: Monochromator energy in keV
-  deviceClass: csaxs_bec.devices.epics.devices.specMotors.EnergyKev
+  deviceClass: csaxs_bec.devices.epics.specMotors.EnergyKev
   deviceConfig:
     read_pv: X12SA-OP-MO:ROX2
   deviceTags:
@@ -29,7 +29,7 @@ mokev:
   softwareTrigger: false
 mcs:
   description: Mcs scalar card for transmission readout
-  deviceClass: csaxs_bec.devices.epics.devices.MCScSAXS
+  deviceClass: csaxs_bec.devices.epics.mcs_csaxs.MCScSAXS
   deviceConfig:
     prefix: 'X12SA-MCS:'
     mcs_config:
@@ -43,7 +43,7 @@ mcs:
   softwareTrigger: false
 eiger9m:
   description: Eiger9m HPC area detector 9M
-  deviceClass: csaxs_bec.devices.epics.devices.Eiger9McSAXS
+  deviceClass: csaxs_bec.devices.epics.eiger9m_csaxs.Eiger9McSAXS
   deviceConfig:
     prefix: 'X12SA-ES-EIGER9M:'
   deviceTags:
@@ -55,7 +55,7 @@ eiger9m:
   softwareTrigger: false
 ddg_detectors:
   description: DelayGenerator for detector triggering
-  deviceClass: csaxs_bec.devices.epics.devices.DelayGeneratorcSAXS
+  deviceClass: csaxs_bec.devices.epics.delay_generator_csaxs.DelayGeneratorcSAXS
   deviceConfig:
     prefix: 'delaygen:DG1:'
     ddg_config:
@@ -82,7 +82,7 @@ ddg_detectors:
   softwareTrigger: false
 ddg_mcs:
   description: DelayGenerator for mcs triggering
-  deviceClass: csaxs_bec.devices.epics.devices.DelayGeneratorcSAXS
+  deviceClass: csaxs_bec.devices.epics.delay_generator_csaxs.DelayGeneratorcSAXS
   deviceConfig:
     prefix: 'delaygen:DG2:'
     ddg_config:
@@ -111,7 +111,7 @@ ddg_mcs:
   softwareTrigger: false
 ddg_fsh:
   description: DelayGenerator for fast shutter control
-  deviceClass: csaxs_bec.devices.epics.devices.DelayGeneratorcSAXS
+  deviceClass: csaxs_bec.devices.epics.delay_generator_csaxs.DelayGeneratorcSAXS
   deviceConfig:
     prefix: 'delaygen:DG3:'
     ddg_config:
@@ -138,7 +138,7 @@ ddg_fsh:
   softwareTrigger: false
 falcon:
   description: Falcon detector x-ray fluoresence 
-  deviceClass: csaxs_bec.devices.epics.devices.FalconcSAXS
+  deviceClass: csaxs_bec.devices.epics.falcon_csaxs.FalconcSAXS
   deviceConfig:
     prefix: 'X12SA-SITORO:'
   deviceTags:
@@ -150,7 +150,7 @@ falcon:
   softwareTrigger: false
 pilatus_2:
   description: Pilatus2 HPC area detector 300k 
-  deviceClass: csaxs_bec.devices.epics.devices.PilatuscSAXS
+  deviceClass: csaxs_bec.devices.epics.pilatus_csaxs.PilatuscSAXS
   deviceConfig:
     prefix: 'X12SA-ES-PILATUS300K:'
   deviceTags:
@@ -162,7 +162,7 @@ pilatus_2:
   softwareTrigger: false
 samx:
   description: SGalil motor stage
-  deviceClass: csaxs_bec.devices.galil.SGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.SGalilMotor
   deviceConfig:
     axis_Id: "E"
     host: '129.129.122.26'
@@ -180,7 +180,7 @@ samx:
   softwareTrigger: false
 samy:
   description: SGalil motor stage
-  deviceClass: csaxs_bec.devices.galil.SGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.SGalilMotor
   deviceConfig:
     axis_Id: "C"
     host: '129.129.122.26'
diff --git a/csaxs_bec/device_configs/e21125_lamni_config.yaml b/csaxs_bec/device_configs/e21125_lamni_config.yaml
index 9f9435b..850c044 100644
--- a/csaxs_bec/device_configs/e21125_lamni_config.yaml
+++ b/csaxs_bec/device_configs/e21125_lamni_config.yaml
@@ -3,7 +3,7 @@
 ############################################################
 leyex:
   description: phase plate angle
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: G
     host: mpc2680.psi.ch
@@ -22,7 +22,7 @@ leyex:
     in: 14.117
 leyey:
   description: phase plate angle
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: H
     host: mpc2680.psi.ch
@@ -42,7 +42,7 @@ leyey:
     out: 0.5
 loptx:
   description: phase plate angle
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: E
     host: mpc2680.psi.ch
@@ -62,7 +62,7 @@ loptx:
     out: -0.699
 lopty:
   description: phase plate angle
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: F
     host: mpc2680.psi.ch
@@ -82,7 +82,7 @@ lopty:
     out: 3.53
 loptz:
   description: phase plate angle
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: D
     host: mpc2680.psi.ch
@@ -99,7 +99,7 @@ loptz:
   readoutPriority: baseline
 lsamrot:
   description: phase plate angle
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: C
     host: mpc2680.psi.ch
@@ -116,7 +116,7 @@ lsamrot:
   readoutPriority: baseline
 lsamx:
   description: phase plate angle
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: A
     host: mpc2680.psi.ch
@@ -135,7 +135,7 @@ lsamx:
     center: 8.768
 lsamy:
   description: phase plate angle
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: B
     host: mpc2680.psi.ch
@@ -162,7 +162,7 @@ lsamy:
 ############################################################
 
 rtx:
-  deviceClass: csaxs_bec.devices.rt.rt_lamni_ophyd.RtLamniMotor
+  deviceClass: csaxs_bec.devices.omny.rt.rt_lamni_ophyd.RtLamniMotor
   deviceConfig:
     axis_Id: A
     device_access: true
@@ -179,7 +179,7 @@ rtx:
   enabled: true
   readOnly: False
 rty:
-  deviceClass: csaxs_bec.devices.rt.rt_lamni_ophyd.RtLamniMotor
+  deviceClass: csaxs_bec.devices.omny.rt.rt_lamni_ophyd.RtLamniMotor
   deviceConfig:
     axis_Id: B
     device_access: true
@@ -293,7 +293,7 @@ losaz:
 
 eiger1p5m:
   description: Eiger 1.5M in vacuum detector, in-house developed, PSI
-  deviceClass: csaxs_bec.devices.eiger1p5m_csaxs.eiger1p5m.Eiger1p5MDetector
+  deviceClass: csaxs_bec.devices.omny.eiger1p5m.Eiger1p5MDetector
   deviceConfig:
     device_access: true
   deviceTags:
@@ -802,7 +802,7 @@ bm5try:
   softwareTrigger: false
 bpm1:
   description: 'XBPM 1: Somewhere around mono (VME)'
-  deviceClass: csaxs_bec.devices.epics.devices.XbpmBase.XbpmCsaxsOp
+  deviceClass: csaxs_bec.devices.epics.XbpmBase.XbpmCsaxsOp
   deviceConfig:
     prefix: 'X12SA-OP-BPM2:'
   deviceTags:
@@ -824,7 +824,7 @@ bpm1i:
   softwareTrigger: false
 bpm2:
   description: 'XBPM 2: Somewhere around mono (VME)'
-  deviceClass: csaxs_bec.devices.epics.devices.XbpmBase.XbpmCsaxsOp
+  deviceClass: csaxs_bec.devices.epics.XbpmBase.XbpmCsaxsOp
   deviceConfig:
     prefix: 'X12SA-OP-BPM2:'
   deviceTags:
@@ -1187,7 +1187,7 @@ dtpush:
   softwareTrigger: false
 dtth:
   description: Detector tower tilt rotation
-  deviceClass: csaxs_bec.devices.epics.devices.specMotors.PmDetectorRotation
+  deviceClass: csaxs_bec.devices.epics.specMotors.PmDetectorRotation
   deviceConfig:
     prefix: X12SA-ES1-DETT:ROX1
   deviceTags:
@@ -1462,7 +1462,7 @@ fttrz:
   softwareTrigger: false
 idgap:
   description: Undulator gap size [mm]
-  deviceClass: csaxs_bec.devices.epics.devices.InsertionDevice
+  deviceClass: csaxs_bec.devices.epics.InsertionDevice.InsertionDevice
   deviceConfig:
     prefix: X12SA-ID
   deviceTags:
@@ -1561,7 +1561,7 @@ mitry3:
   softwareTrigger: false
 mobd:
   description: Monochromator bender virtual motor
-  deviceClass: csaxs_bec.devices.epics.devices.specMotors.PmMonoBender
+  deviceClass: csaxs_bec.devices.epics.specMotors.PmMonoBender
   deviceConfig:
     prefix: 'X12SA-OP-MO:'
   deviceTags:
@@ -1616,7 +1616,7 @@ mobddi:
   softwareTrigger: false
 mokev:
   description: Monochromator energy in keV
-  deviceClass: csaxs_bec.devices.epics.devices.specMotors.EnergyKev
+  deviceClass: csaxs_bec.devices.epics.specMotors.EnergyKev
   deviceConfig:
     read_pv: X12SA-OP-MO:ROX2
   deviceTags:
@@ -1671,7 +1671,7 @@ moroll2:
   softwareTrigger: false
 moth1:
   description: Monochromator Theta 1
-  deviceClass: csaxs_bec.devices.epics.devices.specMotors.MonoTheta1
+  deviceClass: csaxs_bec.devices.epics.specMotors.MonoTheta1
   deviceConfig:
     read_pv: X12SA-OP-MO:ROX1
   deviceTags:
@@ -1693,7 +1693,7 @@ moth1e:
   softwareTrigger: false
 moth2:
   description: Monochromator Theta 2
-  deviceClass: csaxs_bec.devices.epics.devices.specMotors.MonoTheta2
+  deviceClass: csaxs_bec.devices.epics.specMotors.MonoTheta2
   deviceConfig:
     read_pv: X12SA-OP-MO:ROX2
   deviceTags:
diff --git a/csaxs_bec/device_configs/flomni_config.yaml b/csaxs_bec/device_configs/flomni_config.yaml
index cdb1959..1048797 100644
--- a/csaxs_bec/device_configs/flomni_config.yaml
+++ b/csaxs_bec/device_configs/flomni_config.yaml
@@ -4,7 +4,7 @@
 
 feyex:
   description: Xray eye X
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: D
     host: mpc2844.psi.ch
@@ -22,7 +22,7 @@ feyex:
     out: -1
 feyey:
   description: Xray eye Y
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: E
     host: mpc2844.psi.ch
@@ -39,7 +39,7 @@ feyey:
     in: -10.467
 fheater:
   description: Heater Y
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: C
     host: mpc2844.psi.ch
@@ -54,7 +54,7 @@ fheater:
   readoutPriority: baseline
 foptx:
   description: Optics X
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: B
     host: mpc2844.psi.ch
@@ -71,7 +71,7 @@ foptx:
     in: -13.761
 fopty:
   description: Optics Y
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: F
     host: mpc2844.psi.ch
@@ -89,7 +89,7 @@ fopty:
     out: 0.752
 foptz:
   description: Optics Z
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: A
     host: mpc2844.psi.ch
@@ -106,7 +106,7 @@ foptz:
     in: 23
 fsamroy:
   description: Sample rotation
-  deviceClass: csaxs_bec.devices.galil.fupr_ophyd.FuprGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fupr_ophyd.FuprGalilMotor
   deviceConfig:
     axis_Id: A
     host: mpc2844.psi.ch
@@ -121,7 +121,7 @@ fsamroy:
   readoutPriority: baseline
 fsamx:
   description: Sample coarse X
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: E
     host: mpc2844.psi.ch
@@ -138,7 +138,7 @@ fsamx:
     in: -1.1
 fsamy:
   description: Sample coarse Y
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: F
     host: mpc2844.psi.ch
@@ -155,7 +155,7 @@ fsamy:
     in: 2.75
 ftracky:
   description: Laser Tracker coarse Y
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: H
     host: mpc2844.psi.ch
@@ -170,7 +170,7 @@ ftracky:
   readoutPriority: baseline
 ftrackz:
   description: Laser Tracker coarse Z
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: G
     host: mpc2844.psi.ch
@@ -185,7 +185,7 @@ ftrackz:
   readoutPriority: baseline
 ftransx:
   description: Sample transer X
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: C
     host: mpc2844.psi.ch
@@ -200,7 +200,7 @@ ftransx:
   readoutPriority: baseline
 ftransy:
   description: Sample transer Y
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: A
     host: mpc2844.psi.ch
@@ -215,7 +215,7 @@ ftransy:
   readoutPriority: baseline
 ftransz:
   description: Sample transer Z
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: B
     host: mpc2844.psi.ch
@@ -230,7 +230,7 @@ ftransz:
   readoutPriority: baseline
 ftray:
   description: Sample transfer tray
-  deviceClass: csaxs_bec.devices.galil.fgalil_ophyd.FlomniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor
   deviceConfig:
     axis_Id: D
     host: mpc2844.psi.ch
@@ -251,7 +251,7 @@ ftray:
 
 flomni_samples:
   description: Sample names and storage
-  deviceClass: csaxs_bec.devices.epics.devices.flomni_sample_storage.FlomniSampleStorage
+  deviceClass: csaxs_bec.devices.omny.flomni_sample_storage.FlomniSampleStorage
   deviceConfig: {}
   enabled: true
   onFailure: buffer
@@ -322,7 +322,7 @@ fosaz:
   
 rtx:
   description: flomni rt
-  deviceClass: csaxs_bec.devices.rt.rt_flomni_ophyd.RtFlomniMotor
+  deviceClass: csaxs_bec.devices.omny.rt.rt_flomni_ophyd.RtFlomniMotor
   deviceConfig:
     axis_Id: A
     host: mpc2844.psi.ch
@@ -338,7 +338,7 @@ rtx:
     rt_pid_voltage: -0.06219
 rty:
   description: flomni rt
-  deviceClass: csaxs_bec.devices.rt.rt_flomni_ophyd.RtFlomniMotor
+  deviceClass: csaxs_bec.devices.omny.rt.rt_flomni_ophyd.RtFlomniMotor
   deviceConfig:
     axis_Id: B
     host: mpc2844.psi.ch
@@ -352,7 +352,7 @@ rty:
     tomo_additional_offsety: 0
 rtz:
   description: flomni rt
-  deviceClass: csaxs_bec.devices.rt.rt_flomni_ophyd.RtFlomniMotor
+  deviceClass: csaxs_bec.devices.omny.rt.rt_flomni_ophyd.RtFlomniMotor
   deviceConfig:
     axis_Id: C
     host: mpc2844.psi.ch
diff --git a/csaxs_bec/device_configs/lamni_config.yaml b/csaxs_bec/device_configs/lamni_config.yaml
index cf12023..cb9bcd1 100644
--- a/csaxs_bec/device_configs/lamni_config.yaml
+++ b/csaxs_bec/device_configs/lamni_config.yaml
@@ -4,7 +4,7 @@
 
 leyex:
   description: Xray eye X
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: G
     host: mpc2680.psi.ch
@@ -23,7 +23,7 @@ leyex:
     in: 14.117
 leyey:
   description: Xray eye Y
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: H
     host: mpc2680.psi.ch
@@ -43,7 +43,7 @@ leyey:
     out: 0.5
 loptx:
   description: Optics X
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: E
     host: mpc2680.psi.ch
@@ -63,7 +63,7 @@ loptx:
     out: -0.699
 lopty:
   description: Optics Y
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: F
     host: mpc2680.psi.ch
@@ -83,7 +83,7 @@ lopty:
     out: 3.53
 loptz:
   description: Optics Z
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: D
     host: mpc2680.psi.ch
@@ -100,7 +100,7 @@ loptz:
   readoutPriority: baseline
 lsamrot:
   description: Sample rotation
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: C
     host: mpc2680.psi.ch
@@ -117,7 +117,7 @@ lsamrot:
   readoutPriority: baseline
 lsamx:
   description: Sample coarse X
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: A
     host: mpc2680.psi.ch
@@ -136,7 +136,7 @@ lsamx:
     center: 8.768
 lsamy:
   description: Sample coarse Y
-  deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
+  deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor
   deviceConfig:
     axis_Id: B
     host: mpc2680.psi.ch
@@ -224,7 +224,7 @@ losaz:
 ############################################################
 
 rtx:
-  deviceClass: csaxs_bec.devices.rt.rt_lamni_ophyd.RtLamniMotor
+  deviceClass: csaxs_bec.devices.omny.rt.rt_lamni_ophyd.RtLamniMotor
   deviceConfig:
     axis_Id: A
     device_access: true
@@ -241,7 +241,7 @@ rtx:
   enabled: true
   readOnly: False
 rty:
-  deviceClass: csaxs_bec.devices.rt.rt_lamni_ophyd.RtLamniMotor
+  deviceClass: csaxs_bec.devices.omny.rt.rt_lamni_ophyd.RtLamniMotor
   deviceConfig:
     axis_Id: B
     device_access: true
diff --git a/csaxs_bec/device_configs/omny_config.yaml b/csaxs_bec/device_configs/omny_config.yaml
index c3906be..4a0be02 100644
--- a/csaxs_bec/device_configs/omny_config.yaml
+++ b/csaxs_bec/device_configs/omny_config.yaml
@@ -1,6 +1,6 @@
 omny_samples:
   description: OMNYSampleStorage
-  deviceClass: csaxs_bec.devices.epics.devices.omny_sample_storage.OMNYSampleStorage 
+  deviceClass: csaxs_bec.devices.omny.omny_sample_storage.OMNYSampleStorage 
   deviceConfig: {}
   enabled: true
   onFailure: buffer
diff --git a/csaxs_bec/device_configs/x12sa_database.yml b/csaxs_bec/device_configs/x12sa_database.yml
index 892be0d..734bb0a 100644
--- a/csaxs_bec/device_configs/x12sa_database.yml
+++ b/csaxs_bec/device_configs/x12sa_database.yml
@@ -220,7 +220,7 @@ bm5try:
   softwareTrigger: false
 bpm1:
   description: 'XBPM 1: Somewhere around mono (VME)'
-  deviceClass: csaxs_bec.devices.epics.devices.XbpmBase.XbpmCsaxsOp
+  deviceClass: csaxs_bec.devices.epics.XbpmBase.XbpmCsaxsOp
   deviceConfig:
     prefix: 'X12SA-OP-BPM2:'
   deviceTags:
@@ -242,7 +242,7 @@ bpm1i:
   softwareTrigger: false
 bpm2:
   description: 'XBPM 2: Somewhere around mono (VME)'
-  deviceClass: csaxs_bec.devices.epics.devices.XbpmBase.XbpmCsaxsOp
+  deviceClass: csaxs_bec.devices.epics.XbpmBase.XbpmCsaxsOp
   deviceConfig:
     prefix: 'X12SA-OP-BPM2:'
   deviceTags:
@@ -605,7 +605,7 @@ dtpush:
   softwareTrigger: false
 dtth:
   description: Detector tower tilt rotation
-  deviceClass: csaxs_bec.devices.epics.devices.specMotors.PmDetectorRotation
+  deviceClass: csaxs_bec.devices.epics.specMotors.PmDetectorRotation
   deviceConfig:
     prefix: X12SA-ES1-DETT:ROX1
   deviceTags:
@@ -880,7 +880,7 @@ fttrz:
   softwareTrigger: false
 idgap:
   description: Undulator gap size [mm]
-  deviceClass: csaxs_bec.devices.epics.devices.InsertionDevice.InsertionDevice
+  deviceClass: csaxs_bec.devices.epics.InsertionDevice.InsertionDevice
   deviceConfig:
     prefix: X12SA-ID
   deviceTags:
@@ -979,7 +979,7 @@ mitry3:
   softwareTrigger: false
 mobd:
   description: Monochromator bender virtual motor
-  deviceClass: csaxs_bec.devices.epics.devices.specMotors.PmMonoBender
+  deviceClass: csaxs_bec.devices.epics.specMotors.PmMonoBender
   deviceConfig:
     prefix: 'X12SA-OP-MO:'
   deviceTags:
@@ -1034,7 +1034,7 @@ mobddi:
   softwareTrigger: false
 mokev:
   description: Monochromator energy in keV
-  deviceClass: csaxs_bec.devices.epics.devices.specMotors.EnergyKev
+  deviceClass: csaxs_bec.devices.epics.specMotors.EnergyKev
   deviceConfig:
     read_pv: X12SA-OP-MO:ROX2
   deviceTags:
@@ -1089,7 +1089,7 @@ moroll2:
   softwareTrigger: false
 moth1:
   description: Monochromator Theta 1
-  deviceClass: csaxs_bec.devices.epics.devices.specMotors.MonoTheta1
+  deviceClass: csaxs_bec.devices.epics.specMotors.MonoTheta1
   deviceConfig:
     read_pv: X12SA-OP-MO:ROX1
   deviceTags:
@@ -1111,7 +1111,7 @@ moth1e:
   softwareTrigger: false
 moth2:
   description: Monochromator Theta 2
-  deviceClass: csaxs_bec.devices.epics.devices.specMotors.MonoTheta2
+  deviceClass: csaxs_bec.devices.epics.specMotors.MonoTheta2
   deviceConfig:
     read_pv: X12SA-OP-MO:ROX2
   deviceTags:
diff --git a/csaxs_bec/devices/eiger1p5m_csaxs/__init__.py b/csaxs_bec/devices/eiger1p5m_csaxs/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/csaxs_bec/devices/epics/devices/InsertionDevice.py b/csaxs_bec/devices/epics/InsertionDevice.py
similarity index 100%
rename from csaxs_bec/devices/epics/devices/InsertionDevice.py
rename to csaxs_bec/devices/epics/InsertionDevice.py
diff --git a/csaxs_bec/devices/epics/devices/XbpmBase.py b/csaxs_bec/devices/epics/XbpmBase.py
similarity index 100%
rename from csaxs_bec/devices/epics/devices/XbpmBase.py
rename to csaxs_bec/devices/epics/XbpmBase.py
diff --git a/csaxs_bec/devices/epics/__init__.py b/csaxs_bec/devices/epics/__init__.py
index daf9275..8b13789 100644
--- a/csaxs_bec/devices/epics/__init__.py
+++ b/csaxs_bec/devices/epics/__init__.py
@@ -1,8 +1 @@
-# Standard ophyd classes
-from ophyd import EpicsMotor, EpicsSignal, EpicsSignalRO
-from ophyd.quadem import QuadEM
-from ophyd.sim import SynAxis, SynPeriodicSignal, SynSignal
 
-from .devices.delay_generator_csaxs import DelayGeneratorcSAXS
-from .devices.flomni_sample_storage import FlomniSampleStorage
-from .devices.InsertionDevice import InsertionDevice
diff --git a/csaxs_bec/devices/epics/devices/cSaxsVirtualMotors.py b/csaxs_bec/devices/epics/cSaxsVirtualMotors.py
similarity index 100%
rename from csaxs_bec/devices/epics/devices/cSaxsVirtualMotors.py
rename to csaxs_bec/devices/epics/cSaxsVirtualMotors.py
diff --git a/csaxs_bec/devices/epics/devices/delay_generator_csaxs.py b/csaxs_bec/devices/epics/delay_generator_csaxs.py
similarity index 100%
rename from csaxs_bec/devices/epics/devices/delay_generator_csaxs.py
rename to csaxs_bec/devices/epics/delay_generator_csaxs.py
diff --git a/csaxs_bec/devices/epics/devices/__init__.py b/csaxs_bec/devices/epics/devices/__init__.py
deleted file mode 100644
index 0c81223..0000000
--- a/csaxs_bec/devices/epics/devices/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Standard ophyd classes
-from ophyd import EpicsMotor, EpicsSignal, EpicsSignalRO
-from ophyd.quadem import QuadEM
-from ophyd.sim import SynAxis, SynPeriodicSignal, SynSignal
-
-from .delay_generator_csaxs import DelayGeneratorcSAXS
-from .eiger9m_csaxs import Eiger9McSAXS
-
-# cSAXS
-from .falcon_csaxs import FalconcSAXS
-from .flomni_sample_storage import FlomniSampleStorage
-from .InsertionDevice import InsertionDevice
-from .mcs_csaxs import MCScSAXS
-from .pilatus_csaxs import PilatuscSAXS
diff --git a/csaxs_bec/devices/epics/devices/eiger9m_csaxs.py b/csaxs_bec/devices/epics/eiger9m_csaxs.py
similarity index 100%
rename from csaxs_bec/devices/epics/devices/eiger9m_csaxs.py
rename to csaxs_bec/devices/epics/eiger9m_csaxs.py
diff --git a/csaxs_bec/devices/epics/devices/falcon_csaxs.py b/csaxs_bec/devices/epics/falcon_csaxs.py
similarity index 100%
rename from csaxs_bec/devices/epics/devices/falcon_csaxs.py
rename to csaxs_bec/devices/epics/falcon_csaxs.py
diff --git a/csaxs_bec/devices/epics/devices/mcs_csaxs.py b/csaxs_bec/devices/epics/mcs_csaxs.py
similarity index 100%
rename from csaxs_bec/devices/epics/devices/mcs_csaxs.py
rename to csaxs_bec/devices/epics/mcs_csaxs.py
diff --git a/csaxs_bec/devices/epics/devices/pilatus_csaxs.py b/csaxs_bec/devices/epics/pilatus_csaxs.py
similarity index 100%
rename from csaxs_bec/devices/epics/devices/pilatus_csaxs.py
rename to csaxs_bec/devices/epics/pilatus_csaxs.py
diff --git a/csaxs_bec/devices/epics/devices/specMotors.py b/csaxs_bec/devices/epics/specMotors.py
similarity index 100%
rename from csaxs_bec/devices/epics/devices/specMotors.py
rename to csaxs_bec/devices/epics/specMotors.py
diff --git a/csaxs_bec/devices/eiger1p5m_csaxs/eiger1p5m.py b/csaxs_bec/devices/omny/eiger1p5m.py
similarity index 100%
rename from csaxs_bec/devices/eiger1p5m_csaxs/eiger1p5m.py
rename to csaxs_bec/devices/omny/eiger1p5m.py
diff --git a/csaxs_bec/devices/epics/devices/flomni_sample_storage.py b/csaxs_bec/devices/omny/flomni_sample_storage.py
similarity index 100%
rename from csaxs_bec/devices/epics/devices/flomni_sample_storage.py
rename to csaxs_bec/devices/omny/flomni_sample_storage.py
diff --git a/csaxs_bec/devices/galil/__init__.py b/csaxs_bec/devices/omny/galil/__init__.py
similarity index 100%
rename from csaxs_bec/devices/galil/__init__.py
rename to csaxs_bec/devices/omny/galil/__init__.py
diff --git a/csaxs_bec/devices/galil/csaxs_sgalil_triggering.drawio b/csaxs_bec/devices/omny/galil/csaxs_sgalil_triggering.drawio
similarity index 100%
rename from csaxs_bec/devices/galil/csaxs_sgalil_triggering.drawio
rename to csaxs_bec/devices/omny/galil/csaxs_sgalil_triggering.drawio
diff --git a/csaxs_bec/devices/galil/csaxs_sgalil_triggering.png b/csaxs_bec/devices/omny/galil/csaxs_sgalil_triggering.png
similarity index 100%
rename from csaxs_bec/devices/galil/csaxs_sgalil_triggering.png
rename to csaxs_bec/devices/omny/galil/csaxs_sgalil_triggering.png
diff --git a/csaxs_bec/devices/galil/fgalil_ophyd.py b/csaxs_bec/devices/omny/galil/fgalil_ophyd.py
similarity index 99%
rename from csaxs_bec/devices/galil/fgalil_ophyd.py
rename to csaxs_bec/devices/omny/galil/fgalil_ophyd.py
index f69a3ad..42e86d7 100644
--- a/csaxs_bec/devices/galil/fgalil_ophyd.py
+++ b/csaxs_bec/devices/omny/galil/fgalil_ophyd.py
@@ -10,7 +10,7 @@ from ophyd.utils import LimitError
 from ophyd_devices.utils.controller import threadlocked
 from ophyd_devices.utils.socket import SocketIO, raise_if_disconnected
 
-from csaxs_bec.devices.galil.galil_ophyd import (
+from csaxs_bec.devices.omny.galil.galil_ophyd import (
     BECConfigError,
     GalilAxesReferenced,
     GalilController,
diff --git a/csaxs_bec/devices/galil/fupr_ophyd.py b/csaxs_bec/devices/omny/galil/fupr_ophyd.py
similarity index 99%
rename from csaxs_bec/devices/galil/fupr_ophyd.py
rename to csaxs_bec/devices/omny/galil/fupr_ophyd.py
index ed19765..ccf8ab8 100644
--- a/csaxs_bec/devices/galil/fupr_ophyd.py
+++ b/csaxs_bec/devices/omny/galil/fupr_ophyd.py
@@ -10,7 +10,7 @@ from ophyd.utils import LimitError
 from ophyd_devices.utils.controller import threadlocked
 from ophyd_devices.utils.socket import SocketIO, raise_if_disconnected
 
-from csaxs_bec.devices.galil.galil_ophyd import (
+from csaxs_bec.devices.omny.galil.galil_ophyd import (
     BECConfigError,
     GalilAxesReferenced,
     GalilController,
diff --git a/csaxs_bec/devices/galil/galil_ophyd.py b/csaxs_bec/devices/omny/galil/galil_ophyd.py
similarity index 100%
rename from csaxs_bec/devices/galil/galil_ophyd.py
rename to csaxs_bec/devices/omny/galil/galil_ophyd.py
diff --git a/csaxs_bec/devices/galil/lgalil_ophyd.py b/csaxs_bec/devices/omny/galil/lgalil_ophyd.py
similarity index 99%
rename from csaxs_bec/devices/galil/lgalil_ophyd.py
rename to csaxs_bec/devices/omny/galil/lgalil_ophyd.py
index d7935c8..3feb8dd 100644
--- a/csaxs_bec/devices/galil/lgalil_ophyd.py
+++ b/csaxs_bec/devices/omny/galil/lgalil_ophyd.py
@@ -9,7 +9,7 @@ from ophyd.status import wait as status_wait
 from ophyd.utils import LimitError
 from ophyd_devices.utils.socket import SocketIO, raise_if_disconnected
 
-from csaxs_bec.devices.galil.galil_ophyd import (
+from csaxs_bec.devices.omny.galil.galil_ophyd import (
     BECConfigError,
     GalilAxesReferenced,
     GalilController,
diff --git a/csaxs_bec/devices/galil/sgalil.dmc b/csaxs_bec/devices/omny/galil/sgalil.dmc
similarity index 100%
rename from csaxs_bec/devices/galil/sgalil.dmc
rename to csaxs_bec/devices/omny/galil/sgalil.dmc
diff --git a/csaxs_bec/devices/galil/sgalil_ophyd.py b/csaxs_bec/devices/omny/galil/sgalil_ophyd.py
similarity index 100%
rename from csaxs_bec/devices/galil/sgalil_ophyd.py
rename to csaxs_bec/devices/omny/galil/sgalil_ophyd.py
diff --git a/csaxs_bec/devices/galil/sgalil_readme.md b/csaxs_bec/devices/omny/galil/sgalil_readme.md
similarity index 98%
rename from csaxs_bec/devices/galil/sgalil_readme.md
rename to csaxs_bec/devices/omny/galil/sgalil_readme.md
index 56b5039..ac8e600 100644
--- a/csaxs_bec/devices/galil/sgalil_readme.md
+++ b/csaxs_bec/devices/omny/galil/sgalil_readme.md
@@ -4,7 +4,7 @@ Ophyd wrapper for the SGalil controller and stages.
 ## Integration of the device in IPython kernel
 BEC needs to be able to reach the host TCP to initiate a connection to the device.
 ```Python
-from csaxs_bec.devices.galil.sgalil_ophyd import SGalilMotor
+from csaxs_bec.devices.omny.galil.sgalil_ophyd import SGalilMotor
 samx = SGalilMotor("E", name="samx", host="129.129.122.26", port=23, sign=-1)
 samy = SGalilMotor("C", name="samy", host="129.129.122.26", port=23, sign=-1)
 # connect to the controller
diff --git a/csaxs_bec/devices/epics/devices/omny_sample_storage.py b/csaxs_bec/devices/omny/omny_sample_storage.py
similarity index 100%
rename from csaxs_bec/devices/epics/devices/omny_sample_storage.py
rename to csaxs_bec/devices/omny/omny_sample_storage.py
diff --git a/csaxs_bec/devices/rt/__init__.py b/csaxs_bec/devices/omny/rt/__init__.py
similarity index 100%
rename from csaxs_bec/devices/rt/__init__.py
rename to csaxs_bec/devices/omny/rt/__init__.py
diff --git a/csaxs_bec/devices/rt/rt_flomni_ophyd.py b/csaxs_bec/devices/omny/rt/rt_flomni_ophyd.py
similarity index 99%
rename from csaxs_bec/devices/rt/rt_flomni_ophyd.py
rename to csaxs_bec/devices/omny/rt/rt_flomni_ophyd.py
index 53f9cb1..13e7b35 100644
--- a/csaxs_bec/devices/rt/rt_flomni_ophyd.py
+++ b/csaxs_bec/devices/omny/rt/rt_flomni_ophyd.py
@@ -13,7 +13,7 @@ from ophyd_devices.utils.controller import Controller, threadlocked
 from ophyd_devices.utils.socket import SocketIO, raise_if_disconnected
 from prettytable import PrettyTable
 
-from csaxs_bec.devices.rt.rt_ophyd import (
+from csaxs_bec.devices.omny.rt.rt_ophyd import (
     BECConfigError,
     RtCommunicationError,
     RtError,
diff --git a/csaxs_bec/devices/rt/rt_lamni_ophyd.py b/csaxs_bec/devices/omny/rt/rt_lamni_ophyd.py
similarity index 99%
rename from csaxs_bec/devices/rt/rt_lamni_ophyd.py
rename to csaxs_bec/devices/omny/rt/rt_lamni_ophyd.py
index 462ce26..1d50e6e 100644
--- a/csaxs_bec/devices/rt/rt_lamni_ophyd.py
+++ b/csaxs_bec/devices/omny/rt/rt_lamni_ophyd.py
@@ -12,7 +12,7 @@ from ophyd.utils import LimitError, ReadOnlyError
 from ophyd_devices.utils.controller import Controller, threadlocked
 from ophyd_devices.utils.socket import SocketIO, SocketSignal, raise_if_disconnected
 
-from csaxs_bec.devices.rt.rt_ophyd import RtCommunicationError, RtError
+from csaxs_bec.devices.omny.rt.rt_ophyd import RtCommunicationError, RtError
 
 logger = bec_logger.logger
 
diff --git a/csaxs_bec/devices/rt/rt_ophyd.py b/csaxs_bec/devices/omny/rt/rt_ophyd.py
similarity index 100%
rename from csaxs_bec/devices/rt/rt_ophyd.py
rename to csaxs_bec/devices/omny/rt/rt_ophyd.py
diff --git a/tests/tests_devices/test_delay_generator_csaxs.py b/tests/tests_devices/test_delay_generator_csaxs.py
index d5de3ff..1afe0ea 100644
--- a/tests/tests_devices/test_delay_generator_csaxs.py
+++ b/tests/tests_devices/test_delay_generator_csaxs.py
@@ -4,7 +4,7 @@ from unittest import mock
 import pytest
 from ophyd_devices.interfaces.base_classes.psi_delay_generator_base import TriggerSource
 
-from csaxs_bec.devices.epics.devices.delay_generator_csaxs import DDGSetup
+from csaxs_bec.devices.epics.delay_generator_csaxs import DDGSetup
 
 
 def patch_dual_pvs(device):
diff --git a/tests/tests_devices/test_eiger9m_csaxs.py b/tests/tests_devices/test_eiger9m_csaxs.py
index 50af077..127b0d3 100644
--- a/tests/tests_devices/test_eiger9m_csaxs.py
+++ b/tests/tests_devices/test_eiger9m_csaxs.py
@@ -9,7 +9,7 @@ from bec_lib.endpoints import MessageEndpoints
 from bec_server.device_server.tests.utils import DMMock
 from ophyd_devices.tests.utils import MockPV
 
-from csaxs_bec.devices.epics.devices.eiger9m_csaxs import Eiger9McSAXS
+from csaxs_bec.devices.epics.eiger9m_csaxs import Eiger9McSAXS
 
 
 def patch_dual_pvs(device):
@@ -63,13 +63,13 @@ def test_init():
                 mock_cl.get_pv = MockPV
                 with (
                     mock.patch(
-                        "csaxs_bec.devices.epics.devices.eiger9m_csaxs.Eiger9MSetup.initialize_default_parameter"
+                        "csaxs_bec.devices.epics.eiger9m_csaxs.Eiger9MSetup.initialize_default_parameter"
                     ) as mock_default,
                     mock.patch(
-                        "csaxs_bec.devices.epics.devices.eiger9m_csaxs.Eiger9MSetup.initialize_detector"
+                        "csaxs_bec.devices.epics.eiger9m_csaxs.Eiger9MSetup.initialize_detector"
                     ) as mock_init_det,
                     mock.patch(
-                        "csaxs_bec.devices.epics.devices.eiger9m_csaxs.Eiger9MSetup.initialize_detector_backend"
+                        "csaxs_bec.devices.epics.eiger9m_csaxs.Eiger9MSetup.initialize_detector_backend"
                     ) as mock_init_backend,
                 ):
                     Eiger9McSAXS(name=name, prefix=prefix, device_manager=dm, sim_mode=sim_mode)
@@ -147,7 +147,7 @@ def test_initialize_detector_backend(
 
     Validation upon checking set values in mocked std_daq instance
     """
-    with mock.patch("csaxs_bec.devices.epics.devices.eiger9m_csaxs.StdDaqClient") as mock_std_daq:
+    with mock.patch("csaxs_bec.devices.epics.eiger9m_csaxs.StdDaqClient") as mock_std_daq:
         instance = mock_std_daq.return_value
         instance.stop_writer.return_value = None
         instance.get_status.return_value = daq_status
diff --git a/tests/tests_devices/test_falcon_csaxs.py b/tests/tests_devices/test_falcon_csaxs.py
index b07f75f..6f95a42 100644
--- a/tests/tests_devices/test_falcon_csaxs.py
+++ b/tests/tests_devices/test_falcon_csaxs.py
@@ -10,7 +10,7 @@ from bec_lib.endpoints import MessageEndpoints
 from bec_server.device_server.tests.utils import DMMock
 from ophyd_devices.tests.utils import MockPV
 
-from csaxs_bec.devices.epics.devices.falcon_csaxs import FalconcSAXS, FalconTimeoutError
+from csaxs_bec.devices.epics.falcon_csaxs import FalconcSAXS, FalconTimeoutError
 
 
 def patch_dual_pvs(device):
diff --git a/tests/tests_devices/test_fupr_ophyd.py b/tests/tests_devices/test_fupr_ophyd.py
index b8ba38e..615e088 100644
--- a/tests/tests_devices/test_fupr_ophyd.py
+++ b/tests/tests_devices/test_fupr_ophyd.py
@@ -3,7 +3,7 @@ from unittest import mock
 import pytest
 from ophyd_devices.tests.utils import SocketMock
 
-from csaxs_bec.devices.galil.fupr_ophyd import FuprGalilController, FuprGalilMotor
+from csaxs_bec.devices.omny.galil.fupr_ophyd import FuprGalilController, FuprGalilMotor
 
 
 @pytest.fixture
diff --git a/tests/tests_devices/test_galil.py b/tests/tests_devices/test_galil.py
index 1964243..b76854f 100644
--- a/tests/tests_devices/test_galil.py
+++ b/tests/tests_devices/test_galil.py
@@ -4,7 +4,7 @@ from unittest import mock
 import pytest
 from ophyd_devices.tests.utils import SocketMock
 
-from csaxs_bec.devices.galil.lgalil_ophyd import LamniGalilController, LamniGalilMotor
+from csaxs_bec.devices.omny.galil.lgalil_ophyd import LamniGalilController, LamniGalilMotor
 
 
 @pytest.fixture(scope="function")
diff --git a/tests/tests_devices/test_galil_flomni.py b/tests/tests_devices/test_galil_flomni.py
index f31c281..fe24030 100644
--- a/tests/tests_devices/test_galil_flomni.py
+++ b/tests/tests_devices/test_galil_flomni.py
@@ -3,7 +3,7 @@ import copy
 import pytest
 from ophyd_devices.tests.utils import SocketMock
 
-from csaxs_bec.devices.galil.fgalil_ophyd import FlomniGalilController, FlomniGalilMotor
+from csaxs_bec.devices.omny.galil.fgalil_ophyd import FlomniGalilController, FlomniGalilMotor
 
 
 @pytest.fixture(scope="function")
diff --git a/tests/tests_devices/test_mcs_card.py b/tests/tests_devices/test_mcs_card.py
index e325416..13fc5e5 100644
--- a/tests/tests_devices/test_mcs_card.py
+++ b/tests/tests_devices/test_mcs_card.py
@@ -9,7 +9,7 @@ from bec_lib.endpoints import MessageEndpoints
 from bec_server.device_server.tests.utils import DMMock
 from ophyd_devices.tests.utils import MockPV
 
-from csaxs_bec.devices.epics.devices.mcs_csaxs import (
+from csaxs_bec.devices.epics.mcs_csaxs import (
     MCScSAXS,
     MCSError,
     MCSTimeoutError,
@@ -69,13 +69,13 @@ def test_init():
                 mock_cl.get_pv = MockPV
                 with (
                     mock.patch(
-                        "csaxs_bec.devices.epics.devices.mcs_csaxs.MCSSetup.initialize_default_parameter"
+                        "csaxs_bec.devices.epics.mcs_csaxs.MCSSetup.initialize_default_parameter"
                     ) as mock_default,
                     mock.patch(
-                        "csaxs_bec.devices.epics.devices.mcs_csaxs.MCSSetup.initialize_detector"
+                        "csaxs_bec.devices.epics.mcs_csaxs.MCSSetup.initialize_detector"
                     ) as mock_init_det,
                     mock.patch(
-                        "csaxs_bec.devices.epics.devices.mcs_csaxs.MCSSetup.initialize_detector_backend"
+                        "csaxs_bec.devices.epics.mcs_csaxs.MCSSetup.initialize_detector_backend"
                     ) as mock_init_backend,
                 ):
                     MCScSAXS(name=name, prefix=prefix, device_manager=dm, sim_mode=sim_mode)
diff --git a/tests/tests_devices/test_pilatus_csaxs.py b/tests/tests_devices/test_pilatus_csaxs.py
index c8fa2bb..c4aae36 100644
--- a/tests/tests_devices/test_pilatus_csaxs.py
+++ b/tests/tests_devices/test_pilatus_csaxs.py
@@ -10,7 +10,7 @@ from bec_lib.endpoints import MessageEndpoints
 from bec_server.device_server.tests.utils import DMMock
 from ophyd_devices.tests.utils import MockPV
 
-from csaxs_bec.devices.epics.devices.pilatus_csaxs import PilatuscSAXS
+from csaxs_bec.devices.epics.pilatus_csaxs import PilatuscSAXS
 
 
 def patch_dual_pvs(device):
diff --git a/tests/tests_devices/test_rt_flomni.py b/tests/tests_devices/test_rt_flomni.py
index 6151005..e6f7ae8 100644
--- a/tests/tests_devices/test_rt_flomni.py
+++ b/tests/tests_devices/test_rt_flomni.py
@@ -3,8 +3,8 @@ from unittest import mock
 import pytest
 from ophyd_devices.tests.utils import SocketMock
 
-from csaxs_bec.devices.rt import RtFlomniController, RtFlomniMotor
-from csaxs_bec.devices.rt.rt_ophyd import RtError
+from csaxs_bec.devices.omny.rt import RtFlomniController, RtFlomniMotor
+from csaxs_bec.devices.omny.rt.rt_ophyd import RtError
 
 
 @pytest.fixture()