Merge pull request #290 from jenshnielsen/src_layout

Switch to src based layout.
QCoDeS · Jan 30, 2024 · 53af34f · 53af34f
2 parents d653a9b + 0f82c53
commit 53af34f
Show file tree

Hide file tree

Showing 225 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -56,10 +56,10 @@ jobs:
       run: |
         pip install .[test] -c requirements.txt
     - name: Run Mypy
-      run: mypy qcodes_contrib_drivers
+      run: mypy src
     - name: Run tests
       run: |
-        pytest --cov=qcodes_contrib_drivers --cov-report xml --cov-config=pyproject.toml qcodes_contrib_drivers
+        pytest --cov=qcodes_contrib_drivers --cov-report xml --cov-config=pyproject.toml tests
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v3.1.5
       with:

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1 @@
+include src/qcodes_contrib_drivers/sims/*
diff --git a/docs/Makefile b/docs/Makefile
@@ -19,8 +19,8 @@ clean:
 
 # generate api docs for instruments automatically
 genapi:
-	sphinx-apidoc -o _auto -d 10 ../qcodes_contrib_drivers \
-	    ../qcodes_contrib_drivers/drivers/Spectrum/pyspcm.py
+	sphinx-apidoc -o _auto -d 10 ../src/qcodes_contrib_drivers \
+	    ../src/qcodes_contrib_drivers/drivers/Spectrum/pyspcm.py
 	mkdir -p api/generated/
 	cp _auto/qcodes_contrib_drivers.drivers.* api/generated/
 

diff --git a/docs/make.bat b/docs/make.bat
@@ -29,8 +29,8 @@ if errorlevel 9009 (
 
 REM generate api docs
 
-sphinx-apidoc.exe -o _auto -d 10 ..\qcodes_contrib_drivers ^
-    ..\qcodes_contrib_drivers\drivers\Spectrum\pyspcm.py
+sphinx-apidoc.exe -o _auto -d 10 ..\src\qcodes_contrib_drivers ^
+    ..\src\qcodes_contrib_drivers\drivers\Spectrum\pyspcm.py
 mkdir api\generated\
 copy _auto\qcodes_contrib_drivers.drivers.* api\generated\
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -93,10 +93,6 @@ license-files = [
     "LICENSE_TEKTRONIX_AWG520_KEITHLEY_2700",
     "LICENSE",
 ]
-include-package-data = false
-
-[tool.setuptools.packages]
-find = {namespaces = false}
 
 [tool.versioningit]
 default-version = "0.0"
@@ -111,5 +107,5 @@ method = "git"
 match = ["v*"]
 
 [tool.versioningit.onbuild]
-source-file = "qcodes_contrib_drivers/_version.py"
+source-file = "src/qcodes_contrib_drivers/_version.py"
 build-file = "qcodes_contrib_drivers/_version.py"
diff --git a/qcodes_contrib_drivers/__init__.py → src/qcodes_contrib_drivers/__init__.py b/qcodes_contrib_drivers/__init__.py → src/qcodes_contrib_drivers/__init__.py
diff --git a/qcodes_contrib_drivers/_version.py → src/qcodes_contrib_drivers/_version.py b/qcodes_contrib_drivers/_version.py → src/qcodes_contrib_drivers/_version.py
@@ -6,7 +6,7 @@ def _get_version() -> str:
     import qcodes_contrib_drivers
 
     path = Path(qcodes_contrib_drivers.__file__).parent
-    return versioningit.get_version(project_dir=path.parent)
+    return versioningit.get_version(project_dir=path.parent.parent)
 
 
 __version__ = _get_version()
diff --git a/...ib_drivers/drivers/Advantech/PCIE_1751.py → ...ib_drivers/drivers/Advantech/PCIE_1751.py b/...ib_drivers/drivers/Advantech/PCIE_1751.py → ...ib_drivers/drivers/Advantech/PCIE_1751.py
diff --git a/...rib_drivers/drivers/Advantech/__init__.py → ...rib_drivers/drivers/Advantech/__init__.py b/...rib_drivers/drivers/Advantech/__init__.py → ...rib_drivers/drivers/Advantech/__init__.py
diff --git a/...rib_drivers/drivers/Advantech/_bdaqctrl.h → ...rib_drivers/drivers/Advantech/_bdaqctrl.h b/...rib_drivers/drivers/Advantech/_bdaqctrl.h → ...rib_drivers/drivers/Advantech/_bdaqctrl.h
diff --git a/...drivers/drivers/Agilent/Agilent_N9000A.py → ...drivers/drivers/Agilent/Agilent_N9000A.py b/...drivers/drivers/Agilent/Agilent_N9000A.py → ...drivers/drivers/Agilent/Agilent_N9000A.py
diff --git a/...ntrib_drivers/drivers/Agilent/__init__.py → ...ntrib_drivers/drivers/Agilent/__init__.py b/...ntrib_drivers/drivers/Agilent/__init__.py → ...ntrib_drivers/drivers/Agilent/__init__.py
diff --git a/..._contrib_drivers/drivers/AimTTi/EL320P.py → ..._contrib_drivers/drivers/AimTTi/EL320P.py b/..._contrib_drivers/drivers/AimTTi/EL320P.py → ..._contrib_drivers/drivers/AimTTi/EL320P.py
diff --git a/...ontrib_drivers/drivers/AimTTi/__init__.py → ...ontrib_drivers/drivers/AimTTi/__init__.py b/...ontrib_drivers/drivers/AimTTi/__init__.py → ...ontrib_drivers/drivers/AimTTi/__init__.py
diff --git a/...contrib_drivers/drivers/Ametek/SR_7270.py → ...contrib_drivers/drivers/Ametek/SR_7270.py b/...contrib_drivers/drivers/Ametek/SR_7270.py → ...contrib_drivers/drivers/Ametek/SR_7270.py
diff --git a/...ontrib_drivers/drivers/Ametek/__init__.py → ...ontrib_drivers/drivers/Ametek/__init__.py b/...ontrib_drivers/drivers/Ametek/__init__.py → ...ontrib_drivers/drivers/Ametek/__init__.py
diff --git a/...es_contrib_drivers/drivers/Andor/DU401.py → ...es_contrib_drivers/drivers/Andor/DU401.py b/...es_contrib_drivers/drivers/Andor/DU401.py → ...es_contrib_drivers/drivers/Andor/DU401.py
diff --git a/...contrib_drivers/drivers/Andor/__init__.py → ...contrib_drivers/drivers/Andor/__init__.py b/...contrib_drivers/drivers/Andor/__init__.py → ...contrib_drivers/drivers/Andor/__init__.py
diff --git a/...ontrib_drivers/drivers/Attocube/ANC300.py → ...ontrib_drivers/drivers/Attocube/ANC300.py b/...ontrib_drivers/drivers/Attocube/ANC300.py → ...ontrib_drivers/drivers/Attocube/ANC300.py
diff --git a/...rib_drivers/drivers/Attocube/ANC300sim.py → ...rib_drivers/drivers/Attocube/ANC300sim.py b/...rib_drivers/drivers/Attocube/ANC300sim.py → ...rib_drivers/drivers/Attocube/ANC300sim.py
diff --git a/...ontrib_drivers/drivers/Attocube/ANC350.py → ...ontrib_drivers/drivers/Attocube/ANC350.py b/...ontrib_drivers/drivers/Attocube/ANC350.py → ...ontrib_drivers/drivers/Attocube/ANC350.py
diff --git a/...rs/drivers/Attocube/ANC350Lib/__init__.py → ...rs/drivers/Attocube/ANC350Lib/__init__.py b/...rs/drivers/Attocube/ANC350Lib/__init__.py → ...rs/drivers/Attocube/ANC350Lib/__init__.py
diff --git a/...s/drivers/Attocube/ANC350Lib/interface.py → ...s/drivers/Attocube/ANC350Lib/interface.py b/...s/drivers/Attocube/ANC350Lib/interface.py → ...s/drivers/Attocube/ANC350Lib/interface.py
diff --git a/..._drivers/drivers/Attocube/ANC350Lib/v3.py → ..._drivers/drivers/Attocube/ANC350Lib/v3.py b/..._drivers/drivers/Attocube/ANC350Lib/v3.py → ..._drivers/drivers/Attocube/ANC350Lib/v3.py
diff --git a/..._drivers/drivers/Attocube/ANC350Lib/v4.py → ..._drivers/drivers/Attocube/ANC350Lib/v4.py b/..._drivers/drivers/Attocube/ANC350Lib/v4.py → ..._drivers/drivers/Attocube/ANC350Lib/v4.py
diff --git a/...trib_drivers/drivers/Attocube/__init__.py → ...trib_drivers/drivers/Attocube/__init__.py b/...trib_drivers/drivers/Attocube/__init__.py → ...trib_drivers/drivers/Attocube/__init__.py
diff --git a/...drivers/drivers/Aviosys/IP_Power_9258S.py → ...drivers/drivers/Aviosys/IP_Power_9258S.py b/...drivers/drivers/Aviosys/IP_Power_9258S.py → ...drivers/drivers/Aviosys/IP_Power_9258S.py
diff --git a/...ntrib_drivers/drivers/Aviosys/__init__.py → ...ntrib_drivers/drivers/Aviosys/__init__.py b/...ntrib_drivers/drivers/Aviosys/__init__.py → ...ntrib_drivers/drivers/Aviosys/__init__.py
diff --git a/qcodes_contrib_drivers/drivers/Bilt/ITest.py → ...des_contrib_drivers/drivers/Bilt/ITest.py b/qcodes_contrib_drivers/drivers/Bilt/ITest.py → ...des_contrib_drivers/drivers/Bilt/ITest.py
diff --git a/..._contrib_drivers/drivers/Bilt/__init__.py → ..._contrib_drivers/drivers/Bilt/__init__.py b/..._contrib_drivers/drivers/Bilt/__init__.py → ..._contrib_drivers/drivers/Bilt/__init__.py
diff --git a/...trib_drivers/drivers/BlueFors/BlueFors.py → ...trib_drivers/drivers/BlueFors/BlueFors.py b/...trib_drivers/drivers/BlueFors/BlueFors.py → ...trib_drivers/drivers/BlueFors/BlueFors.py
diff --git a/...trib_drivers/drivers/BlueFors/__init__.py → ...trib_drivers/drivers/BlueFors/__init__.py b/...trib_drivers/drivers/BlueFors/__init__.py → ...trib_drivers/drivers/BlueFors/__init__.py
diff --git a/qcodes_contrib_drivers/drivers/CMTS5048.py → ...codes_contrib_drivers/drivers/CMTS5048.py b/qcodes_contrib_drivers/drivers/CMTS5048.py → ...codes_contrib_drivers/drivers/CMTS5048.py
diff --git a/...b_drivers/drivers/CopperMountain/M5180.py → ...b_drivers/drivers/CopperMountain/M5180.py b/...b_drivers/drivers/CopperMountain/M5180.py → ...b_drivers/drivers/CopperMountain/M5180.py
diff --git a/...b_drivers/drivers/CopperMountain/S5048.py → ...b_drivers/drivers/CopperMountain/S5048.py b/...b_drivers/drivers/CopperMountain/S5048.py → ...b_drivers/drivers/CopperMountain/S5048.py
diff --git a/...rivers/drivers/CopperMountain/__init__.py → ...rivers/drivers/CopperMountain/__init__.py b/...rivers/drivers/CopperMountain/__init__.py → ...rivers/drivers/CopperMountain/__init__.py
diff --git a/...ntrib_drivers/drivers/Cryocon/__init__.py → ...ntrib_drivers/drivers/Cryocon/__init__.py b/...ntrib_drivers/drivers/Cryocon/__init__.py → ...ntrib_drivers/drivers/Cryocon/__init__.py
diff --git a/...rib_drivers/drivers/Cryocon/cryocon_26.py → ...rib_drivers/drivers/Cryocon/cryocon_26.py b/...rib_drivers/drivers/Cryocon/cryocon_26.py → ...rib_drivers/drivers/Cryocon/cryocon_26.py
diff --git a/...ers/drivers/Cryogenic/CryogenicSMS120C.py → ...ers/drivers/Cryogenic/CryogenicSMS120C.py b/...ers/drivers/Cryogenic/CryogenicSMS120C.py → ...ers/drivers/Cryogenic/CryogenicSMS120C.py
diff --git a/...rib_drivers/drivers/Cryogenic/__init__.py → ...rib_drivers/drivers/Cryogenic/__init__.py b/...rib_drivers/drivers/Cryogenic/__init__.py → ...rib_drivers/drivers/Cryogenic/__init__.py
diff --git a/...ivers/drivers/DaylightSolutions/MIRcat.py → ...ivers/drivers/DaylightSolutions/MIRcat.py b/...ivers/drivers/DaylightSolutions/MIRcat.py → ...ivers/drivers/DaylightSolutions/MIRcat.py
diff --git a/...ers/drivers/DaylightSolutions/__init__.py → ...ers/drivers/DaylightSolutions/__init__.py b/...ers/drivers/DaylightSolutions/__init__.py → ...ers/drivers/DaylightSolutions/__init__.py
diff --git a/...rivers/drivers/ERAInstruments/__init__.py → ...rivers/drivers/ERAInstruments/__init__.py b/...rivers/drivers/ERAInstruments/__init__.py → ...rivers/drivers/ERAInstruments/__init__.py
diff --git a/...rivers/drivers/ERAInstruments/erasynth.py → ...rivers/drivers/ERAInstruments/erasynth.py b/...rivers/drivers/ERAInstruments/erasynth.py → ...rivers/drivers/ERAInstruments/erasynth.py
diff --git a/...drivers/drivers/GeneralMicrowave/GM349.py → ...drivers/drivers/GeneralMicrowave/GM349.py b/...drivers/drivers/GeneralMicrowave/GM349.py → ...drivers/drivers/GeneralMicrowave/GM349.py
diff --git a/...vers/drivers/GeneralMicrowave/__init__.py → ...vers/drivers/GeneralMicrowave/__init__.py b/...vers/drivers/GeneralMicrowave/__init__.py → ...vers/drivers/GeneralMicrowave/__init__.py
diff --git a/..._drivers/drivers/Gentec/Gentec_Maestro.py → ..._drivers/drivers/Gentec/Gentec_Maestro.py b/..._drivers/drivers/Gentec/Gentec_Maestro.py → ..._drivers/drivers/Gentec/Gentec_Maestro.py
diff --git a/...ontrib_drivers/drivers/Gentec/__init__.py → ...ontrib_drivers/drivers/Gentec/__init__.py b/...ontrib_drivers/drivers/Gentec/__init__.py → ...ontrib_drivers/drivers/Gentec/__init__.py
diff --git a/qcodes_contrib_drivers/drivers/HP/HP8594E.py → ...des_contrib_drivers/drivers/HP/HP8594E.py b/qcodes_contrib_drivers/drivers/HP/HP8594E.py → ...des_contrib_drivers/drivers/HP/HP8594E.py
diff --git a/...ontrib_drivers/drivers/Holzworth/HS900.py → ...ontrib_drivers/drivers/Holzworth/HS900.py b/...ontrib_drivers/drivers/Holzworth/HS900.py → ...ontrib_drivers/drivers/Holzworth/HS900.py
diff --git a/...trib_drivers/drivers/Holzworth/HS9008B.py → ...trib_drivers/drivers/Holzworth/HS9008B.py b/...trib_drivers/drivers/Holzworth/HS9008B.py → ...trib_drivers/drivers/Holzworth/HS9008B.py
diff --git a/...rib_drivers/drivers/Holzworth/__init__.py → ...rib_drivers/drivers/Holzworth/__init__.py b/...rib_drivers/drivers/Holzworth/__init__.py → ...rib_drivers/drivers/Holzworth/__init__.py
diff --git a/...trib_drivers/drivers/Horiba/Horiba_FHR.py → ...trib_drivers/drivers/Horiba/Horiba_FHR.py b/...trib_drivers/drivers/Horiba/Horiba_FHR.py → ...trib_drivers/drivers/Horiba/Horiba_FHR.py
diff --git a/...ontrib_drivers/drivers/Horiba/__init__.py → ...ontrib_drivers/drivers/Horiba/__init__.py b/...ontrib_drivers/drivers/Horiba/__init__.py → ...ontrib_drivers/drivers/Horiba/__init__.py
diff --git a/...rivers/drivers/Horiba/private/__init__.py → ...rivers/drivers/Horiba/private/__init__.py b/...rivers/drivers/Horiba/private/__init__.py → ...rivers/drivers/Horiba/private/__init__.py
diff --git a/...vers/drivers/Horiba/private/fhr_client.py → ...vers/drivers/Horiba/private/fhr_client.py b/...vers/drivers/Horiba/private/fhr_client.py → ...vers/drivers/Horiba/private/fhr_client.py
diff --git a/...vers/drivers/Horiba/private/fhr_server.py → ...vers/drivers/Horiba/private/fhr_server.py b/...vers/drivers/Horiba/private/fhr_server.py → ...vers/drivers/Horiba/private/fhr_server.py
diff --git a/...vers/drivers/Keysight/Keysight_E36313A.py → ...vers/drivers/Keysight/Keysight_E36313A.py b/...vers/drivers/Keysight/Keysight_E36313A.py → ...vers/drivers/Keysight/Keysight_E36313A.py
diff --git a/...ivers/drivers/Keysight/Keysight_E8267D.py → ...ivers/drivers/Keysight/Keysight_E8267D.py b/...ivers/drivers/Keysight/Keysight_E8267D.py → ...ivers/drivers/Keysight/Keysight_E8267D.py
diff --git a/...rivers/drivers/Keysight/Keysight_J7211.py → ...rivers/drivers/Keysight/Keysight_J7211.py b/...rivers/drivers/Keysight/Keysight_J7211.py → ...rivers/drivers/Keysight/Keysight_J7211.py
diff --git a/...ivers/drivers/Keysight/Keysight_M3201A.py → ...ivers/drivers/Keysight/Keysight_M3201A.py b/...ivers/drivers/Keysight/Keysight_M3201A.py → ...ivers/drivers/Keysight/Keysight_M3201A.py
diff --git a/...ivers/drivers/Keysight/Keysight_M3300A.py → ...ivers/drivers/Keysight/Keysight_M3300A.py b/...ivers/drivers/Keysight/Keysight_M3300A.py → ...ivers/drivers/Keysight/Keysight_M3300A.py
diff --git a/...ontrib_drivers/drivers/Keysight/M3202A.py → ...ontrib_drivers/drivers/Keysight/M3202A.py b/...ontrib_drivers/drivers/Keysight/M3202A.py → ...ontrib_drivers/drivers/Keysight/M3202A.py
diff --git a/...vers/drivers/Keysight/SD_common/SD_AWG.py → ...vers/drivers/Keysight/SD_common/SD_AWG.py b/...vers/drivers/Keysight/SD_common/SD_AWG.py → ...vers/drivers/Keysight/SD_common/SD_AWG.py
diff --git a/...rivers/Keysight/SD_common/SD_AWG_Async.py → ...rivers/Keysight/SD_common/SD_AWG_Async.py b/...rivers/Keysight/SD_common/SD_AWG_Async.py → ...rivers/Keysight/SD_common/SD_AWG_Async.py
diff --git a/...vers/drivers/Keysight/SD_common/SD_DIG.py → ...vers/drivers/Keysight/SD_common/SD_DIG.py b/...vers/drivers/Keysight/SD_common/SD_DIG.py → ...vers/drivers/Keysight/SD_common/SD_DIG.py
diff --git a/...s/drivers/Keysight/SD_common/SD_Module.py → ...s/drivers/Keysight/SD_common/SD_Module.py b/...s/drivers/Keysight/SD_common/SD_Module.py → ...s/drivers/Keysight/SD_common/SD_Module.py
diff --git a/...rs/drivers/Keysight/SD_common/__init__.py → ...rs/drivers/Keysight/SD_common/__init__.py b/...rs/drivers/Keysight/SD_common/__init__.py → ...rs/drivers/Keysight/SD_common/__init__.py
diff --git a/...vers/Keysight/SD_common/memory_manager.py → ...vers/Keysight/SD_common/memory_manager.py b/...vers/Keysight/SD_common/memory_manager.py → ...vers/Keysight/SD_common/memory_manager.py
diff --git a/...trib_drivers/drivers/Keysight/__init__.py → ...trib_drivers/drivers/Keysight/__init__.py b/...trib_drivers/drivers/Keysight/__init__.py → ...trib_drivers/drivers/Keysight/__init__.py
diff --git a/...ib_drivers/drivers/Lakeshore/Model_331.py → ...ib_drivers/drivers/Lakeshore/Model_331.py b/...ib_drivers/drivers/Lakeshore/Model_331.py → ...ib_drivers/drivers/Lakeshore/Model_331.py
diff --git a/...ib_drivers/drivers/Lakeshore/Model_625.py → ...ib_drivers/drivers/Lakeshore/Model_625.py b/...ib_drivers/drivers/Lakeshore/Model_625.py → ...ib_drivers/drivers/Lakeshore/Model_625.py
diff --git a/...rib_drivers/drivers/Lakeshore/__init__.py → ...rib_drivers/drivers/Lakeshore/__init__.py b/...rib_drivers/drivers/Lakeshore/__init__.py → ...rib_drivers/drivers/Lakeshore/__init__.py
diff --git a/...hotonics/Lighthouse_Photonics_Sprout_G.py → ...hotonics/Lighthouse_Photonics_Sprout_G.py b/...hotonics/Lighthouse_Photonics_Sprout_G.py → ...hotonics/Lighthouse_Photonics_Sprout_G.py
diff --git a/...s/drivers/LighthousePhotonics/__init__.py → ...s/drivers/LighthousePhotonics/__init__.py b/...s/drivers/LighthousePhotonics/__init__.py → ...s/drivers/LighthousePhotonics/__init__.py
diff --git a/...ontrib_drivers/drivers/M2/M2_Solstis_3.py → ...ontrib_drivers/drivers/M2/M2_Solstis_3.py b/...ontrib_drivers/drivers/M2/M2_Solstis_3.py → ...ontrib_drivers/drivers/M2/M2_Solstis_3.py
diff --git a/...es_contrib_drivers/drivers/M2/__init__.py → ...es_contrib_drivers/drivers/M2/__init__.py b/...es_contrib_drivers/drivers/M2/__init__.py → ...es_contrib_drivers/drivers/M2/__init__.py
diff --git a/...rs/drivers/MontanaInstruments/__init__.py → ...rs/drivers/MontanaInstruments/__init__.py b/...rs/drivers/MontanaInstruments/__init__.py → ...rs/drivers/MontanaInstruments/__init__.py
diff --git a/...drivers/MontanaInstruments/cryostation.py → ...drivers/MontanaInstruments/cryostation.py b/...drivers/MontanaInstruments/cryostation.py → ...drivers/MontanaInstruments/cryostation.py
diff --git a/...rivers/drivers/NationalInstruments/DAQ.py → ...rivers/drivers/NationalInstruments/DAQ.py b/...rivers/drivers/NationalInstruments/DAQ.py → ...rivers/drivers/NationalInstruments/DAQ.py
diff --git a/.../drivers/NationalInstruments/PXIe_2597.py → .../drivers/NationalInstruments/PXIe_2597.py b/.../drivers/NationalInstruments/PXIe_2597.py → .../drivers/NationalInstruments/PXIe_2597.py
diff --git a/.../drivers/NationalInstruments/PXIe_5654.py → .../drivers/NationalInstruments/PXIe_5654.py b/.../drivers/NationalInstruments/PXIe_5654.py → .../drivers/NationalInstruments/PXIe_5654.py
diff --git a/...ers/drivers/NationalInstruments/README.md → ...ers/drivers/NationalInstruments/README.md b/...ers/drivers/NationalInstruments/README.md → ...ers/drivers/NationalInstruments/README.md
diff --git a/...ivers/drivers/NationalInstruments/RFSG.py → ...ivers/drivers/NationalInstruments/RFSG.py b/...ivers/drivers/NationalInstruments/RFSG.py → ...ivers/drivers/NationalInstruments/RFSG.py
diff --git a/...ers/drivers/NationalInstruments/Switch.py → ...ers/drivers/NationalInstruments/Switch.py b/...ers/drivers/NationalInstruments/Switch.py → ...ers/drivers/NationalInstruments/Switch.py
diff --git a/...s/drivers/NationalInstruments/__init__.py → ...s/drivers/NationalInstruments/__init__.py b/...s/drivers/NationalInstruments/__init__.py → ...s/drivers/NationalInstruments/__init__.py
diff --git a/...rivers/NationalInstruments/dll_wrapper.py → ...rivers/NationalInstruments/dll_wrapper.py b/...rivers/NationalInstruments/dll_wrapper.py → ...rivers/NationalInstruments/dll_wrapper.py
diff --git a/.../NationalInstruments/ni_dll_instrument.py → .../NationalInstruments/ni_dll_instrument.py b/.../NationalInstruments/ni_dll_instrument.py → .../NationalInstruments/ni_dll_instrument.py
diff --git a/...drivers/NationalInstruments/visa_types.py → ...drivers/NationalInstruments/visa_types.py b/...drivers/NationalInstruments/visa_types.py → ...drivers/NationalInstruments/visa_types.py
diff --git a/...contrib_drivers/drivers/Newport/AG_UC8.py → ...contrib_drivers/drivers/Newport/AG_UC8.py b/...contrib_drivers/drivers/Newport/AG_UC8.py → ...contrib_drivers/drivers/Newport/AG_UC8.py
diff --git a/...ntrib_drivers/drivers/Newport/__init__.py → ...ntrib_drivers/drivers/Newport/__init__.py b/...ntrib_drivers/drivers/Newport/__init__.py → ...ntrib_drivers/drivers/Newport/__init__.py
diff --git a/..._contrib_drivers/drivers/Oxford/ILM200.py → ..._contrib_drivers/drivers/Oxford/ILM200.py b/..._contrib_drivers/drivers/Oxford/ILM200.py → ..._contrib_drivers/drivers/Oxford/ILM200.py
diff --git a/..._contrib_drivers/drivers/Oxford/IPS120.py → ..._contrib_drivers/drivers/Oxford/IPS120.py b/..._contrib_drivers/drivers/Oxford/IPS120.py → ..._contrib_drivers/drivers/Oxford/IPS120.py
diff --git a/..._contrib_drivers/drivers/Oxford/Triton.py → ..._contrib_drivers/drivers/Oxford/Triton.py b/..._contrib_drivers/drivers/Oxford/Triton.py → ..._contrib_drivers/drivers/Oxford/Triton.py
diff --git a/...ontrib_drivers/drivers/Oxford/__init__.py → ...ontrib_drivers/drivers/Oxford/__init__.py b/...ontrib_drivers/drivers/Oxford/__init__.py → ...ontrib_drivers/drivers/Oxford/__init__.py
diff --git a/...ontrib_drivers/drivers/Oxford/kelvinox.py → ...ontrib_drivers/drivers/Oxford/kelvinox.py b/...ontrib_drivers/drivers/Oxford/kelvinox.py → ...ontrib_drivers/drivers/Oxford/kelvinox.py
diff --git a/...s_contrib_drivers/drivers/QDevil/QDAC1.py → ...s_contrib_drivers/drivers/QDevil/QDAC1.py b/...s_contrib_drivers/drivers/QDevil/QDAC1.py → ...s_contrib_drivers/drivers/QDevil/QDAC1.py
diff --git a/...s_contrib_drivers/drivers/QDevil/QDAC2.py → ...s_contrib_drivers/drivers/QDevil/QDAC2.py b/...s_contrib_drivers/drivers/QDevil/QDAC2.py → ...s_contrib_drivers/drivers/QDevil/QDAC2.py
diff --git a/...rib_drivers/drivers/QDevil/QDAC2_Array.py → ...rib_drivers/drivers/QDevil/QDAC2_Array.py b/...rib_drivers/drivers/QDevil/QDAC2_Array.py → ...rib_drivers/drivers/QDevil/QDAC2_Array.py
diff --git a/...contrib_drivers/drivers/QDevil/QSwitch.py → ...contrib_drivers/drivers/QDevil/QSwitch.py b/...contrib_drivers/drivers/QDevil/QSwitch.py → ...contrib_drivers/drivers/QDevil/QSwitch.py
diff --git a/...ontrib_drivers/drivers/QDevil/__init__.py → ...ontrib_drivers/drivers/QDevil/__init__.py b/...ontrib_drivers/drivers/QDevil/__init__.py → ...ontrib_drivers/drivers/QDevil/__init__.py
diff --git a/qcodes_contrib_drivers/drivers/QuTech/D4.py → ...odes_contrib_drivers/drivers/QuTech/D4.py b/qcodes_contrib_drivers/drivers/QuTech/D4.py → ...odes_contrib_drivers/drivers/QuTech/D4.py
diff --git a/qcodes_contrib_drivers/drivers/QuTech/D5a.py → ...des_contrib_drivers/drivers/QuTech/D5a.py b/qcodes_contrib_drivers/drivers/QuTech/D5a.py → ...des_contrib_drivers/drivers/QuTech/D5a.py
diff --git a/qcodes_contrib_drivers/drivers/QuTech/F1d.py → ...des_contrib_drivers/drivers/QuTech/F1d.py b/qcodes_contrib_drivers/drivers/QuTech/F1d.py → ...des_contrib_drivers/drivers/QuTech/F1d.py
diff --git a/...es_contrib_drivers/drivers/QuTech/IVVI.py → ...es_contrib_drivers/drivers/QuTech/IVVI.py b/...es_contrib_drivers/drivers/QuTech/IVVI.py → ...es_contrib_drivers/drivers/QuTech/IVVI.py
diff --git a/qcodes_contrib_drivers/drivers/QuTech/M2j.py → ...des_contrib_drivers/drivers/QuTech/M2j.py b/qcodes_contrib_drivers/drivers/QuTech/M2j.py → ...des_contrib_drivers/drivers/QuTech/M2j.py
diff --git a/qcodes_contrib_drivers/drivers/QuTech/S5i.py → ...des_contrib_drivers/drivers/QuTech/S5i.py b/qcodes_contrib_drivers/drivers/QuTech/S5i.py → ...des_contrib_drivers/drivers/QuTech/S5i.py
diff --git a/...ontrib_drivers/drivers/QuTech/__init__.py → ...ontrib_drivers/drivers/QuTech/__init__.py b/...ontrib_drivers/drivers/QuTech/__init__.py → ...ontrib_drivers/drivers/QuTech/__init__.py
diff --git a/...b_drivers/drivers/Rigol/Rigol_DSG3136B.py → ...b_drivers/drivers/Rigol/Rigol_DSG3136B.py b/...b_drivers/drivers/Rigol/Rigol_DSG3136B.py → ...b_drivers/drivers/Rigol/Rigol_DSG3136B.py
diff --git a/...b_drivers/drivers/RohdeSchwarz/HMC8041.py → ...b_drivers/drivers/RohdeSchwarz/HMC8041.py b/...b_drivers/drivers/RohdeSchwarz/HMC8041.py → ...b_drivers/drivers/RohdeSchwarz/HMC8041.py
diff --git a/...b_drivers/drivers/RohdeSchwarz/HMC8042.py → ...b_drivers/drivers/RohdeSchwarz/HMC8042.py b/...b_drivers/drivers/RohdeSchwarz/HMC8042.py → ...b_drivers/drivers/RohdeSchwarz/HMC8042.py
diff --git a/...b_drivers/drivers/RohdeSchwarz/HMC8043.py → ...b_drivers/drivers/RohdeSchwarz/HMC8043.py b/...b_drivers/drivers/RohdeSchwarz/HMC8043.py → ...b_drivers/drivers/RohdeSchwarz/HMC8043.py
diff --git a/...b_drivers/drivers/RohdeSchwarz/HMP2020.py → ...b_drivers/drivers/RohdeSchwarz/HMP2020.py b/...b_drivers/drivers/RohdeSchwarz/HMP2020.py → ...b_drivers/drivers/RohdeSchwarz/HMP2020.py
diff --git a/...b_drivers/drivers/RohdeSchwarz/HMP2030.py → ...b_drivers/drivers/RohdeSchwarz/HMP2030.py b/...b_drivers/drivers/RohdeSchwarz/HMP2030.py → ...b_drivers/drivers/RohdeSchwarz/HMP2030.py
diff --git a/...b_drivers/drivers/RohdeSchwarz/HMP4030.py → ...b_drivers/drivers/RohdeSchwarz/HMP4030.py b/...b_drivers/drivers/RohdeSchwarz/HMP4030.py → ...b_drivers/drivers/RohdeSchwarz/HMP4030.py
diff --git a/...b_drivers/drivers/RohdeSchwarz/HMP4040.py → ...b_drivers/drivers/RohdeSchwarz/HMP4040.py b/...b_drivers/drivers/RohdeSchwarz/HMP4040.py → ...b_drivers/drivers/RohdeSchwarz/HMP4040.py
diff --git a/...b_drivers/drivers/RohdeSchwarz/SMB100A.py → ...b_drivers/drivers/RohdeSchwarz/SMB100A.py b/...b_drivers/drivers/RohdeSchwarz/SMB100A.py → ...b_drivers/drivers/RohdeSchwarz/SMB100A.py
diff --git a/...rib_drivers/drivers/RohdeSchwarz/SMR40.py → ...rib_drivers/drivers/RohdeSchwarz/SMR40.py b/...rib_drivers/drivers/RohdeSchwarz/SMR40.py → ...rib_drivers/drivers/RohdeSchwarz/SMR40.py
diff --git a/...b_drivers/drivers/RohdeSchwarz/SMW200A.py → ...b_drivers/drivers/RohdeSchwarz/SMW200A.py b/...b_drivers/drivers/RohdeSchwarz/SMW200A.py → ...b_drivers/drivers/RohdeSchwarz/SMW200A.py
diff --git a/...rivers/drivers/RohdeSchwarz/SMW200Asim.py → ...rivers/drivers/RohdeSchwarz/SMW200Asim.py b/...rivers/drivers/RohdeSchwarz/SMW200Asim.py → ...rivers/drivers/RohdeSchwarz/SMW200Asim.py
diff --git a/...rib_drivers/drivers/RohdeSchwarz/ZVL13.py → ...rib_drivers/drivers/RohdeSchwarz/ZVL13.py b/...rib_drivers/drivers/RohdeSchwarz/ZVL13.py → ...rib_drivers/drivers/RohdeSchwarz/ZVL13.py
diff --git a/..._drivers/drivers/RohdeSchwarz/__init__.py → ..._drivers/drivers/RohdeSchwarz/__init__.py b/..._drivers/drivers/RohdeSchwarz/__init__.py → ..._drivers/drivers/RohdeSchwarz/__init__.py
diff --git a/...s/drivers/RohdeSchwarz/private/HMC804x.py → ...s/drivers/RohdeSchwarz/private/HMC804x.py b/...s/drivers/RohdeSchwarz/private/HMC804x.py → ...s/drivers/RohdeSchwarz/private/HMC804x.py
diff --git a/...ivers/drivers/RohdeSchwarz/private/HMP.py → ...ivers/drivers/RohdeSchwarz/private/HMP.py b/...ivers/drivers/RohdeSchwarz/private/HMP.py → ...ivers/drivers/RohdeSchwarz/private/HMP.py
diff --git a/.../drivers/RohdeSchwarz/private/__init__.py → .../drivers/RohdeSchwarz/private/__init__.py b/.../drivers/RohdeSchwarz/private/__init__.py → .../drivers/RohdeSchwarz/private/__init__.py
diff --git a/...contrib_drivers/drivers/Shamrock/SR750.py → ...contrib_drivers/drivers/Shamrock/SR750.py b/...contrib_drivers/drivers/Shamrock/SR750.py → ...contrib_drivers/drivers/Shamrock/SR750.py
diff --git a/...trib_drivers/drivers/Shamrock/__init__.py → ...trib_drivers/drivers/Shamrock/__init__.py b/...trib_drivers/drivers/Shamrock/__init__.py → ...trib_drivers/drivers/Shamrock/__init__.py
diff --git a/..._drivers/drivers/SignalCore/SignalCore.py → ..._drivers/drivers/SignalCore/SignalCore.py b/..._drivers/drivers/SignalCore/SignalCore.py → ..._drivers/drivers/SignalCore/SignalCore.py
diff --git a/...ib_drivers/drivers/SignalCore/__init__.py → ...ib_drivers/drivers/SignalCore/__init__.py b/...ib_drivers/drivers/SignalCore/__init__.py → ...ib_drivers/drivers/SignalCore/__init__.py
diff --git a/...rs/drivers/SingleQuantum/SingleQuantum.py → ...rs/drivers/SingleQuantum/SingleQuantum.py b/...rs/drivers/SingleQuantum/SingleQuantum.py → ...rs/drivers/SingleQuantum/SingleQuantum.py
diff --git a/...drivers/drivers/SingleQuantum/__init__.py → ...drivers/drivers/SingleQuantum/__init__.py b/...drivers/drivers/SingleQuantum/__init__.py → ...drivers/drivers/SingleQuantum/__init__.py
diff --git a/...s_contrib_drivers/drivers/Spectrum/M4i.py → ...s_contrib_drivers/drivers/Spectrum/M4i.py b/...s_contrib_drivers/drivers/Spectrum/M4i.py → ...s_contrib_drivers/drivers/Spectrum/M4i.py
diff --git a/...ontrib_drivers/drivers/Spectrum/README.md → ...ontrib_drivers/drivers/Spectrum/README.md b/...ontrib_drivers/drivers/Spectrum/README.md → ...ontrib_drivers/drivers/Spectrum/README.md
diff --git a/...trib_drivers/drivers/Spectrum/__init__.py → ...trib_drivers/drivers/Spectrum/__init__.py b/...trib_drivers/drivers/Spectrum/__init__.py → ...trib_drivers/drivers/Spectrum/__init__.py
diff --git a/...rs/drivers/Spectrum/py_header/__init__.py → ...rs/drivers/Spectrum/py_header/__init__.py b/...rs/drivers/Spectrum/py_header/__init__.py → ...rs/drivers/Spectrum/py_header/__init__.py
diff --git a/...rivers/drivers/Spectrum/py_header/h2py.py → ...rivers/drivers/Spectrum/py_header/h2py.py b/...rivers/drivers/Spectrum/py_header/h2py.py → ...rivers/drivers/Spectrum/py_header/h2py.py
diff --git a/...rivers/drivers/Spectrum/py_header/regs.py → ...rivers/drivers/Spectrum/py_header/regs.py b/...rivers/drivers/Spectrum/py_header/regs.py → ...rivers/drivers/Spectrum/py_header/regs.py
diff --git a/...vers/drivers/Spectrum/py_header/spcerr.py → ...vers/drivers/Spectrum/py_header/spcerr.py b/...vers/drivers/Spectrum/py_header/spcerr.py → ...vers/drivers/Spectrum/py_header/spcerr.py
diff --git a/...ontrib_drivers/drivers/Spectrum/pyspcm.py → ...ontrib_drivers/drivers/Spectrum/pyspcm.py b/...ontrib_drivers/drivers/Spectrum/pyspcm.py → ...ontrib_drivers/drivers/Spectrum/pyspcm.py
diff --git a/...drivers/drivers/Standa/Standa_10MWA168.py → ...drivers/drivers/Standa/Standa_10MWA168.py b/...drivers/drivers/Standa/Standa_10MWA168.py → ...drivers/drivers/Standa/Standa_10MWA168.py
diff --git a/...ontrib_drivers/drivers/Standa/__init__.py → ...ontrib_drivers/drivers/Standa/__init__.py b/...ontrib_drivers/drivers/Standa/__init__.py → ...ontrib_drivers/drivers/Standa/__init__.py
diff --git a/.../drivers/StanfordResearchSystems/CS580.py → .../drivers/StanfordResearchSystems/CS580.py b/.../drivers/StanfordResearchSystems/CS580.py → .../drivers/StanfordResearchSystems/CS580.py
diff --git a/.../drivers/StanfordResearchSystems/DG645.py → .../drivers/StanfordResearchSystems/DG645.py b/.../drivers/StanfordResearchSystems/DG645.py → .../drivers/StanfordResearchSystems/DG645.py
diff --git a/...drivers/StanfordResearchSystems/SIM928.py → ...drivers/StanfordResearchSystems/SIM928.py b/...drivers/StanfordResearchSystems/SIM928.py → ...drivers/StanfordResearchSystems/SIM928.py
diff --git a/.../drivers/StanfordResearchSystems/SR844.py → .../drivers/StanfordResearchSystems/SR844.py b/.../drivers/StanfordResearchSystems/SR844.py → .../drivers/StanfordResearchSystems/SR844.py
diff --git a/...ivers/StanfordResearchSystems/__init__.py → ...ivers/StanfordResearchSystems/__init__.py b/...ivers/StanfordResearchSystems/__init__.py → ...ivers/StanfordResearchSystems/__init__.py
diff --git a/...trib_drivers/drivers/Tektronix/AFG3000.py → ...trib_drivers/drivers/Tektronix/AFG3000.py b/...trib_drivers/drivers/Tektronix/AFG3000.py → ...trib_drivers/drivers/Tektronix/AFG3000.py
diff --git a/...ntrib_drivers/drivers/Tektronix/AWG520.py → ...ntrib_drivers/drivers/Tektronix/AWG520.py b/...ntrib_drivers/drivers/Tektronix/AWG520.py → ...ntrib_drivers/drivers/Tektronix/AWG520.py
diff --git a/...s/drivers/Tektronix/Keithley_2000_Scan.py → ...s/drivers/Tektronix/Keithley_2000_Scan.py b/...s/drivers/Tektronix/Keithley_2000_Scan.py → ...s/drivers/Tektronix/Keithley_2000_Scan.py
diff --git a/...rivers/drivers/Tektronix/Keithley_2700.py → ...rivers/drivers/Tektronix/Keithley_2700.py b/...rivers/drivers/Tektronix/Keithley_2700.py → ...rivers/drivers/Tektronix/Keithley_2700.py
diff --git a/...rivers/drivers/Tektronix/Keithley_6430.py → ...rivers/drivers/Tektronix/Keithley_6430.py b/...rivers/drivers/Tektronix/Keithley_6430.py → ...rivers/drivers/Tektronix/Keithley_6430.py
diff --git a/...rivers/drivers/Tektronix/Keithley_6500.py → ...rivers/drivers/Tektronix/Keithley_6500.py b/...rivers/drivers/Tektronix/Keithley_6500.py → ...rivers/drivers/Tektronix/Keithley_6500.py
diff --git a/...rib_drivers/drivers/Tektronix/__init__.py → ...rib_drivers/drivers/Tektronix/__init__.py b/...rib_drivers/drivers/Tektronix/__init__.py → ...rib_drivers/drivers/Tektronix/__init__.py
diff --git a/...vers/drivers/Thermotek/Thermotek_T255p.py → ...vers/drivers/Thermotek/Thermotek_T255p.py b/...vers/drivers/Thermotek/Thermotek_T255p.py → ...vers/drivers/Thermotek/Thermotek_T255p.py
diff --git a/...rib_drivers/drivers/Thermotek/__init__.py → ...rib_drivers/drivers/Thermotek/__init__.py b/...rib_drivers/drivers/Thermotek/__init__.py → ...rib_drivers/drivers/Thermotek/__init__.py
diff --git a/...ontrib_drivers/drivers/Thorlabs/K10CR1.py → ...ontrib_drivers/drivers/Thorlabs/K10CR1.py b/...ontrib_drivers/drivers/Thorlabs/K10CR1.py → ...ontrib_drivers/drivers/Thorlabs/K10CR1.py
diff --git a/...ontrib_drivers/drivers/Thorlabs/KDC101.py → ...ontrib_drivers/drivers/Thorlabs/KDC101.py b/...ontrib_drivers/drivers/Thorlabs/KDC101.py → ...ontrib_drivers/drivers/Thorlabs/KDC101.py
diff --git a/...ntrib_drivers/drivers/Thorlabs/KLS1550.py → ...ntrib_drivers/drivers/Thorlabs/KLS1550.py b/...ntrib_drivers/drivers/Thorlabs/KLS1550.py → ...ntrib_drivers/drivers/Thorlabs/KLS1550.py
diff --git a/...ontrib_drivers/drivers/Thorlabs/MFF10x.py → ...ontrib_drivers/drivers/Thorlabs/MFF10x.py b/...ontrib_drivers/drivers/Thorlabs/MFF10x.py → ...ontrib_drivers/drivers/Thorlabs/MFF10x.py
diff --git a/...ontrib_drivers/drivers/Thorlabs/PM100D.py → ...ontrib_drivers/drivers/Thorlabs/PM100D.py b/...ontrib_drivers/drivers/Thorlabs/PM100D.py → ...ontrib_drivers/drivers/Thorlabs/PM100D.py
diff --git a/...ontrib_drivers/drivers/Thorlabs/PRM1Z8.py → ...ontrib_drivers/drivers/Thorlabs/PRM1Z8.py b/...ontrib_drivers/drivers/Thorlabs/PRM1Z8.py → ...ontrib_drivers/drivers/Thorlabs/PRM1Z8.py
diff --git a/...ontrib_drivers/drivers/Thorlabs/TDC001.py → ...ontrib_drivers/drivers/Thorlabs/TDC001.py b/...ontrib_drivers/drivers/Thorlabs/TDC001.py → ...ontrib_drivers/drivers/Thorlabs/TDC001.py
diff --git a/...trib_drivers/drivers/Thorlabs/__init__.py → ...trib_drivers/drivers/Thorlabs/__init__.py b/...trib_drivers/drivers/Thorlabs/__init__.py → ...trib_drivers/drivers/Thorlabs/__init__.py
diff --git a/...b_drivers/drivers/Thorlabs/private/APT.py → ...b_drivers/drivers/Thorlabs/private/APT.py b/...b_drivers/drivers/Thorlabs/private/APT.py → ...b_drivers/drivers/Thorlabs/private/APT.py
diff --git a/...ib_drivers/drivers/Thorlabs/private/CC.py → ...ib_drivers/drivers/Thorlabs/private/CC.py b/...ib_drivers/drivers/Thorlabs/private/CC.py → ...ib_drivers/drivers/Thorlabs/private/CC.py
diff --git a/...ib_drivers/drivers/Thorlabs/private/LS.py → ...ib_drivers/drivers/Thorlabs/private/LS.py b/...ib_drivers/drivers/Thorlabs/private/LS.py → ...ib_drivers/drivers/Thorlabs/private/LS.py
diff --git a/...vers/drivers/Thorlabs/private/__init__.py → ...vers/drivers/Thorlabs/private/__init__.py b/...vers/drivers/Thorlabs/private/__init__.py → ...vers/drivers/Thorlabs/private/__init__.py
diff --git a/...ivers/drivers/Thorlabs/private/kinesis.py → ...ivers/drivers/Thorlabs/private/kinesis.py b/...ivers/drivers/Thorlabs/private/kinesis.py → ...ivers/drivers/Thorlabs/private/kinesis.py
diff --git a/...ntrib_drivers/drivers/Valon/Valon_5015.py → ...ntrib_drivers/drivers/Valon/Valon_5015.py b/...ntrib_drivers/drivers/Valon/Valon_5015.py → ...ntrib_drivers/drivers/Valon/Valon_5015.py
diff --git a/...contrib_drivers/drivers/Valon/__init__.py → ...contrib_drivers/drivers/Valon/__init__.py b/...contrib_drivers/drivers/Valon/__init__.py → ...contrib_drivers/drivers/Valon/__init__.py
diff --git a/qcodes_contrib_drivers/drivers/Vaunix/LDA.py → ...des_contrib_drivers/drivers/Vaunix/LDA.py b/qcodes_contrib_drivers/drivers/Vaunix/LDA.py → ...des_contrib_drivers/drivers/Vaunix/LDA.py
diff --git a/...ontrib_drivers/drivers/Vaunix/__init__.py → ...ontrib_drivers/drivers/Vaunix/__init__.py b/...ontrib_drivers/drivers/Vaunix/__init__.py → ...ontrib_drivers/drivers/Vaunix/__init__.py
diff --git a/...rivers/drivers/ZurichInstruments/HF2LI.py → ...rivers/drivers/ZurichInstruments/HF2LI.py b/...rivers/drivers/ZurichInstruments/HF2LI.py → ...rivers/drivers/ZurichInstruments/HF2LI.py
diff --git a/...ers/drivers/ZurichInstruments/ZIHDAWG8.py → ...ers/drivers/ZurichInstruments/ZIHDAWG8.py b/...ers/drivers/ZurichInstruments/ZIHDAWG8.py → ...ers/drivers/ZurichInstruments/ZIHDAWG8.py
diff --git a/...ers/drivers/ZurichInstruments/__init__.py → ...ers/drivers/ZurichInstruments/__init__.py b/...ers/drivers/ZurichInstruments/__init__.py → ...ers/drivers/ZurichInstruments/__init__.py
diff --git a/qcodes_contrib_drivers/drivers/__init__.py → ...codes_contrib_drivers/drivers/__init__.py b/qcodes_contrib_drivers/drivers/__init__.py → ...codes_contrib_drivers/drivers/__init__.py
diff --git a/qcodes_contrib_drivers/sims/HP8594E.yaml → src/qcodes_contrib_drivers/sims/HP8594E.yaml b/qcodes_contrib_drivers/sims/HP8594E.yaml → src/qcodes_contrib_drivers/sims/HP8594E.yaml
diff --git a/qcodes_contrib_drivers/sims/QDAC2.yaml → src/qcodes_contrib_drivers/sims/QDAC2.yaml b/qcodes_contrib_drivers/sims/QDAC2.yaml → src/qcodes_contrib_drivers/sims/QDAC2.yaml
diff --git a/qcodes_contrib_drivers/sims/QSwitch.yaml → src/qcodes_contrib_drivers/sims/QSwitch.yaml b/qcodes_contrib_drivers/sims/QSwitch.yaml → src/qcodes_contrib_drivers/sims/QSwitch.yaml
diff --git a/qcodes_contrib_drivers/sims/__init__.py → src/qcodes_contrib_drivers/sims/__init__.py b/qcodes_contrib_drivers/sims/__init__.py → src/qcodes_contrib_drivers/sims/__init__.py
diff --git a/..._contrib_drivers/tests/HP/test_HP8594E.py → tests/HP/test_HP8594E.py b/..._contrib_drivers/tests/HP/test_HP8594E.py → tests/HP/test_HP8594E.py
diff --git a/...ers/tests/Keysight/test_memory_manager.py → tests/Keysight/test_memory_manager.py b/...ers/tests/Keysight/test_memory_manager.py → tests/Keysight/test_memory_manager.py
diff --git a/..._contrib_drivers/tests/QDevil/__init__.py → tests/QDevil/__init__.py b/..._contrib_drivers/tests/QDevil/__init__.py → tests/QDevil/__init__.py
diff --git a/...es_contrib_drivers/tests/QDevil/common.py → tests/QDevil/common.py b/...es_contrib_drivers/tests/QDevil/common.py → tests/QDevil/common.py
diff --git a/...s_contrib_drivers/tests/QDevil/pytest.ini → tests/QDevil/pytest.ini b/...s_contrib_drivers/tests/QDevil/pytest.ini → tests/QDevil/pytest.ini
diff --git a/...es_contrib_drivers/tests/QDevil/readme.md → tests/QDevil/readme.md b/...es_contrib_drivers/tests/QDevil/readme.md → tests/QDevil/readme.md
diff --git a/...ivers/tests/QDevil/real_qdac2_fixtures.py → tests/QDevil/real_qdac2_fixtures.py b/...ivers/tests/QDevil/real_qdac2_fixtures.py → tests/QDevil/real_qdac2_fixtures.py
diff --git a/...rivers/tests/QDevil/sim_qdac2_fixtures.py → tests/QDevil/sim_qdac2_fixtures.py b/...rivers/tests/QDevil/sim_qdac2_fixtures.py → tests/QDevil/sim_qdac2_fixtures.py
diff --git a/...vers/tests/QDevil/sim_qswitch_fixtures.py → tests/QDevil/sim_qswitch_fixtures.py b/...vers/tests/QDevil/sim_qswitch_fixtures.py → tests/QDevil/sim_qswitch_fixtures.py
diff --git a/.../tests/QDevil/test_real_qdac2_ieee_std.py → tests/QDevil/test_real_qdac2_ieee_std.py b/.../tests/QDevil/test_real_qdac2_ieee_std.py → tests/QDevil/test_real_qdac2_ieee_std.py
diff --git a/...QDevil/test_sim_qdac2_abstract_channel.py → ...QDevil/test_sim_qdac2_abstract_channel.py b/...QDevil/test_sim_qdac2_abstract_channel.py → ...QDevil/test_sim_qdac2_abstract_channel.py
diff --git a/...ests/QDevil/test_sim_qdac2_arrangement.py → tests/QDevil/test_sim_qdac2_arrangement.py b/...ests/QDevil/test_sim_qdac2_arrangement.py → tests/QDevil/test_sim_qdac2_arrangement.py
diff --git a/...vers/tests/QDevil/test_sim_qdac2_array.py → tests/QDevil/test_sim_qdac2_array.py b/...vers/tests/QDevil/test_sim_qdac2_array.py → tests/QDevil/test_sim_qdac2_array.py
diff --git a/...rivers/tests/QDevil/test_sim_qdac2_awg.py → tests/QDevil/test_sim_qdac2_awg.py b/...rivers/tests/QDevil/test_sim_qdac2_awg.py → tests/QDevil/test_sim_qdac2_awg.py
diff --git a/...s/tests/QDevil/test_sim_qdac2_channels.py → tests/QDevil/test_sim_qdac2_channels.py b/...s/tests/QDevil/test_sim_qdac2_channels.py → tests/QDevil/test_sim_qdac2_channels.py
diff --git a/...ers/tests/QDevil/test_sim_qdac2_common.py → tests/QDevil/test_sim_qdac2_common.py b/...ers/tests/QDevil/test_sim_qdac2_common.py → tests/QDevil/test_sim_qdac2_common.py
diff --git a/...rs/tests/QDevil/test_sim_qdac2_current.py → tests/QDevil/test_sim_qdac2_current.py b/...rs/tests/QDevil/test_sim_qdac2_current.py → tests/QDevil/test_sim_qdac2_current.py
diff --git a/...s/tests/QDevil/test_sim_qdac2_external.py → tests/QDevil/test_sim_qdac2_external.py b/...s/tests/QDevil/test_sim_qdac2_external.py → tests/QDevil/test_sim_qdac2_external.py
diff --git a/...s/tests/QDevil/test_sim_qdac2_ieee_std.py → tests/QDevil/test_sim_qdac2_ieee_std.py b/...s/tests/QDevil/test_sim_qdac2_ieee_std.py → tests/QDevil/test_sim_qdac2_ieee_std.py
diff --git a/...ivers/tests/QDevil/test_sim_qdac2_init.py → tests/QDevil/test_sim_qdac2_init.py b/...ivers/tests/QDevil/test_sim_qdac2_init.py → tests/QDevil/test_sim_qdac2_init.py
diff --git a/...rs/tests/QDevil/test_sim_qdac2_leakage.py → tests/QDevil/test_sim_qdac2_leakage.py b/...rs/tests/QDevil/test_sim_qdac2_leakage.py → tests/QDevil/test_sim_qdac2_leakage.py
diff --git a/...ivers/tests/QDevil/test_sim_qdac2_sine.py → tests/QDevil/test_sim_qdac2_sine.py b/...ivers/tests/QDevil/test_sim_qdac2_sine.py → tests/QDevil/test_sim_qdac2_sine.py
diff --git a/.../tests/QDevil/test_sim_qdac2_source_dc.py → tests/QDevil/test_sim_qdac2_source_dc.py b/.../tests/QDevil/test_sim_qdac2_source_dc.py → tests/QDevil/test_sim_qdac2_source_dc.py
diff --git a/...ests/QDevil/test_sim_qdac2_source_list.py → tests/QDevil/test_sim_qdac2_source_list.py b/...ests/QDevil/test_sim_qdac2_source_list.py → tests/QDevil/test_sim_qdac2_source_list.py
diff --git a/...evil/test_sim_qdac2_source_output_mode.py → ...evil/test_sim_qdac2_source_output_mode.py b/...evil/test_sim_qdac2_source_output_mode.py → ...evil/test_sim_qdac2_source_output_mode.py
diff --git a/...sts/QDevil/test_sim_qdac2_source_sweep.py → tests/QDevil/test_sim_qdac2_source_sweep.py b/...sts/QDevil/test_sim_qdac2_source_sweep.py → tests/QDevil/test_sim_qdac2_source_sweep.py
diff --git a/...ers/tests/QDevil/test_sim_qdac2_square.py → tests/QDevil/test_sim_qdac2_square.py b/...ers/tests/QDevil/test_sim_qdac2_square.py → tests/QDevil/test_sim_qdac2_square.py
diff --git a/...ers/tests/QDevil/test_sim_qdac2_system.py → tests/QDevil/test_sim_qdac2_system.py b/...ers/tests/QDevil/test_sim_qdac2_system.py → tests/QDevil/test_sim_qdac2_system.py
diff --git a/...s/tests/QDevil/test_sim_qdac2_triangle.py → tests/QDevil/test_sim_qdac2_triangle.py b/...s/tests/QDevil/test_sim_qdac2_triangle.py → tests/QDevil/test_sim_qdac2_triangle.py
diff --git a/...s/tests/QDevil/test_sim_qdac2_triggers.py → tests/QDevil/test_sim_qdac2_triggers.py b/...s/tests/QDevil/test_sim_qdac2_triggers.py → tests/QDevil/test_sim_qdac2_triggers.py
diff --git a/...ts/QDevil/test_sim_qdac2_virtual_gates.py → tests/QDevil/test_sim_qdac2_virtual_gates.py b/...ts/QDevil/test_sim_qdac2_virtual_gates.py → tests/QDevil/test_sim_qdac2_virtual_gates.py
diff --git a/...evil/test_sim_qswitch_direct_operation.py → ...evil/test_sim_qswitch_direct_operation.py b/...evil/test_sim_qswitch_direct_operation.py → ...evil/test_sim_qswitch_direct_operation.py
diff --git a/...s/tests/QDevil/test_sim_qswitch_errors.py → tests/QDevil/test_sim_qswitch_errors.py b/...s/tests/QDevil/test_sim_qswitch_errors.py → tests/QDevil/test_sim_qswitch_errors.py
diff --git a/...tests/QDevil/test_sim_qswitch_ieee_std.py → tests/QDevil/test_sim_qswitch_ieee_std.py b/...tests/QDevil/test_sim_qswitch_ieee_std.py → tests/QDevil/test_sim_qswitch_ieee_std.py
diff --git a/...ers/tests/QDevil/test_sim_qswitch_init.py → tests/QDevil/test_sim_qswitch_init.py b/...ers/tests/QDevil/test_sim_qswitch_init.py → tests/QDevil/test_sim_qswitch_init.py
diff --git a/...tests/QDevil/test_sim_qswitch_internal.py → tests/QDevil/test_sim_qswitch_internal.py b/...tests/QDevil/test_sim_qswitch_internal.py → tests/QDevil/test_sim_qswitch_internal.py
diff --git a/...ests/QDevil/test_sim_qswitch_operation.py → tests/QDevil/test_sim_qswitch_operation.py b/...ests/QDevil/test_sim_qswitch_operation.py → tests/QDevil/test_sim_qswitch_operation.py
diff --git a/...ests/QDevil/test_sim_qswitch_snapshots.py → tests/QDevil/test_sim_qswitch_snapshots.py b/...ests/QDevil/test_sim_qswitch_snapshots.py → tests/QDevil/test_sim_qswitch_snapshots.py
diff --git a/qcodes_contrib_drivers/tests/__init__.py → tests/__init__.py b/qcodes_contrib_drivers/tests/__init__.py → tests/__init__.py
diff --git a/...rib_drivers/tests/test_Keysight_M3201A.py → tests/test_Keysight_M3201A.py b/...rib_drivers/tests/test_Keysight_M3201A.py → tests/test_Keysight_M3201A.py
diff --git a/...ontrib_drivers/tests/test_Spectrum_M4i.py → tests/test_Spectrum_M4i.py b/...ontrib_drivers/tests/test_Spectrum_M4i.py → tests/test_Spectrum_M4i.py
diff --git a/qcodes_contrib_drivers/tests/test_m2j.py → tests/test_m2j.py b/qcodes_contrib_drivers/tests/test_m2j.py → tests/test_m2j.py
diff --git a/...ontrib_drivers/tests/test_ni_pxie_2597.py → tests/test_ni_pxie_2597.py b/...ontrib_drivers/tests/test_ni_pxie_2597.py → tests/test_ni_pxie_2597.py
diff --git a/...rivers/tests/test_rohdeschwarz_HMC804x.py → tests/test_rohdeschwarz_HMC804x.py b/...rivers/tests/test_rohdeschwarz_HMC804x.py → tests/test_rohdeschwarz_HMC804x.py
diff --git a/...es_contrib_drivers/tests/test_zihdawg8.py → tests/test_zihdawg8.py b/...es_contrib_drivers/tests/test_zihdawg8.py → tests/test_zihdawg8.py