Merge pull request #5427 from jenshnielsen/src_layout

Switch qcodes to src layout
microsoft · Oct 19, 2023 · bcb7151 · bcb7151
2 parents 788a425 + 17c5aea
commit bcb7151
Show file tree

Hide file tree

Showing 665 changed files with 60 additions and 67 deletions.
diff --git a/.github/workflows/darker.yaml b/.github/workflows/darker.yaml
@@ -20,6 +20,6 @@ jobs:
       - uses: akaihola/[email protected]
         with:
           options: "--check --diff"
-          src: "./qcodes"
+          src: "./src/qcodes"
           revision: "origin/main..."
           version: "@e3c210b5c1b91400c3f317b2474c10ab23bec1cf"
diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -82,11 +82,11 @@ jobs:
       if: ${{ !matrix.min-version }}
     - name: Run parallel tests
       run: |
-        pytest -m "not serial" --cov=qcodes --cov-report xml --hypothesis-profile ci  --durations=20 qcodes
+        pytest -m "not serial" --cov=qcodes --cov-report xml --hypothesis-profile ci  --durations=20 src/qcodes
 # a subset of the tests fails when run in parallel on Windows so run those in serial here
     - name: Run serial tests
       run: |
-        pytest -m "serial" -n 0 --dist no --cov=qcodes --cov-report xml --cov-append --hypothesis-profile ci qcodes
+        pytest -m "serial" -n 0 --dist no --cov=qcodes --cov-report xml --cov-append --hypothesis-profile ci src/qcodes
     - name: Upload coverage to Codecov
       uses: codecov/[email protected]
       with:

diff --git a/.gitmodules b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "qcodes/tests/dataset/fixtures/db_files"]
-	path = qcodes/tests/dataset/fixtures/db_files
+	path = src/qcodes/tests/dataset/fixtures/db_files
 	url = https://github.com/QCoDeS/qcodes_db_fixtures.git
 	branch = main
 [submodule "typings"]

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,11 @@
+include src/qcodes/monitor/dist/*
+include src/qcodes/monitor/dist/js/*
+include src/qcodes/monitor/dist/css/*
+include src/qcodes/configuration/*.json
+include src/qcodes/instrument/sims/*.yaml
+include src/qcodes/tests/dataset/fixtures/data_2018_01_17/*/*
+include src/qcodes/tests/delegate/data/*.yml
+include src/qcodes/tests/drivers/auxiliary_files/*
+include src/qcodes/py.typed
+include src/qcodes/dist/schemas/*
+include src/qcodes/dist/tests/station/*
diff --git a/docs/api/configuration/index.rst b/docs/api/configuration/index.rst
@@ -11,4 +11,4 @@ qcodes default configuration
 
 The following table contains the default configuration of qcodes.
 
-.. jsonschema:: ../../../qcodes/configuration/qcodesrc_schema.json
+.. jsonschema:: ../../../src/qcodes/configuration/qcodesrc_schema.json
diff --git a/docs/examples/DataSet/import-data-from-legacy-dat-files.ipynb b/docs/examples/DataSet/import-data-from-legacy-dat-files.ipynb
diff --git a/pyproject.toml b/pyproject.toml
@@ -196,9 +196,9 @@ module = [
 ignore_missing_imports = true
 
 [tool.pyright]
-include = ["qcodes"]
+include = ["src"]
 ignore = [
-    "qcodes/instrument_drivers/Harvard/Decadac.py",
+    "src/qcodes/instrument_drivers/Harvard/Decadac.py",
     ]
 reportMissingTypeStubs = true
 stubPath = "typings/stubs"
@@ -239,77 +239,59 @@ extend-include = ["*.ipynb"]
 
 extend-exclude = ["typings"]
 
+[tool.ruff.isort]
+
+known-first-party = ["qcodes"]
+
 [tool.ruff.per-file-ignores]
 # deprecated modules left
 # for backwards compatibility
-"qcodes/utils/validators.py" = ["F401"]
-"qcodes/utils/threading.py" = ["F401"]
-"qcodes/utils/plotting.py" = ["F401"]
-"qcodes/utils/metadata.py" = ["F401"]
-"qcodes/utils/helpers.py" = ["F401"]
-"qcodes/instrument_drivers/AimTTi/AimTTi_PL601P_channels.py" = ["F401"]
-"qcodes/instrument_drivers/tektronix/Keithley_6500.py" = ["F401"]
-"qcodes/instrument_drivers/tektronix/Keithley_2600_channels.py" = ["F401"]
-"qcodes/instrument_drivers/tektronix/Keithley_2450.py" = ["F401"]
-"qcodes/instrument_drivers/tektronix/keithley_7510.py" = ["F401"]
-"qcodes/instrument_drivers/signal_hound/USB_SA124B.py" = ["F401"]
-"qcodes/instrument_drivers/rohde_schwarz/RTE1000.py" = ["F401"]
-"qcodes/instrument_drivers/rigol/DS4000.py" = ["F401"]
-"qcodes/instrument_drivers/rigol/DG4000.py" = ["F401"]
-"qcodes/instrument_drivers/rigol/DP832.py" = ["F401"]
-"qcodes/instrument_drivers/rigol/DP831.py" = ["F401"]
-"qcodes/instrument_drivers/rigol/DP821.py" = ["F401"]
-"qcodes/instrument_drivers/rigol/DS1074Z.py" = ["F401"]
-"qcodes/instrument_drivers/rigol/DG1062.py" = ["F401"]
-"qcodes/instrument_drivers/devices.py" = ["F401"]
-"qcodes/instrument_drivers/basel/sp983c_remote.py" = ["F401"]
-"qcodes/instrument_drivers/Lakeshore/Model_325.py" = ["F401"]
-"qcodes/instrument_drivers/Lakeshore/Model_336.py" = ["F401"]
-"qcodes/instrument_drivers/Lakeshore/Model_372.py" = ["F401"]
-"qcodes/instrument_drivers/Minicircuits/RUDAT_13G_90.py" = ["F401"]
-"qcodes/instrument_drivers/HP/HP8133A.py" = ["F401"]
-"qcodes/instrument_drivers/HP/HP8753D.py" = ["F401"]
-"qcodes/instrument_drivers/Keysight/N9030B.py" = ["F401"]
-
-"qcodes/instrument_drivers/Keysight/KtM960x.py" = ["F405"]
-"qcodes/instrument_drivers/Keysight/KtMAwg.py" = ["F405"]
+"src/qcodes/utils/validators.py" = ["F401"]
+"src/qcodes/utils/threading.py" = ["F401"]
+"src/qcodes/utils/plotting.py" = ["F401"]
+"src/qcodes/utils/metadata.py" = ["F401"]
+"src/qcodes/utils/helpers.py" = ["F401"]
+"src/qcodes/instrument_drivers/AimTTi/AimTTi_PL601P_channels.py" = ["F401"]
+"src/qcodes/instrument_drivers/tektronix/Keithley_6500.py" = ["F401"]
+"src/qcodes/instrument_drivers/tektronix/Keithley_2600_channels.py" = ["F401"]
+"src/qcodes/instrument_drivers/tektronix/Keithley_2450.py" = ["F401"]
+"src/qcodes/instrument_drivers/tektronix/keithley_7510.py" = ["F401"]
+"src/qcodes/instrument_drivers/signal_hound/USB_SA124B.py" = ["F401"]
+"src/qcodes/instrument_drivers/rohde_schwarz/RTE1000.py" = ["F401"]
+"src/qcodes/instrument_drivers/rigol/DS4000.py" = ["F401"]
+"src/qcodes/instrument_drivers/rigol/DG4000.py" = ["F401"]
+"src/qcodes/instrument_drivers/rigol/DP832.py" = ["F401"]
+"src/qcodes/instrument_drivers/rigol/DP831.py" = ["F401"]
+"src/qcodes/instrument_drivers/rigol/DP821.py" = ["F401"]
+"src/qcodes/instrument_drivers/rigol/DS1074Z.py" = ["F401"]
+"src/qcodes/instrument_drivers/rigol/DG1062.py" = ["F401"]
+"src/qcodes/instrument_drivers/devices.py" = ["F401"]
+"src/qcodes/instrument_drivers/basel/sp983c_remote.py" = ["F401"]
+"src/qcodes/instrument_drivers/Lakeshore/Model_325.py" = ["F401"]
+"src/qcodes/instrument_drivers/Lakeshore/Model_336.py" = ["F401"]
+"src/qcodes/instrument_drivers/Lakeshore/Model_372.py" = ["F401"]
+"src/qcodes/instrument_drivers/Minicircuits/RUDAT_13G_90.py" = ["F401"]
+"src/qcodes/instrument_drivers/HP/HP8133A.py" = ["F401"]
+"src/qcodes/instrument_drivers/HP/HP8753D.py" = ["F401"]
+"src/qcodes/instrument_drivers/Keysight/N9030B.py" = ["F401"]
+
+"src/qcodes/instrument_drivers/Keysight/KtM960x.py" = ["F405"]
+"src/qcodes/instrument_drivers/Keysight/KtMAwg.py" = ["F405"]
 
 # This triggeres in notebooks even with a md cell at the top
 "*.ipynb" = ["E402"]
 
 # these imports are fine at module level
 # in tests and examples
 "docs/*" = ["TID253"]
-"qcodes/tests/*" = ["TID253"]
+"src/qcodes/tests/*" = ["TID253"]
 
 [tool.ruff.flake8-tidy-imports]
 # There modules are relatively slow to import
 # and only required in specific places so
 # don't import them at module level
 banned-module-level-imports = ["xarray", "pandas", "opencensus"]
 
-[tool.setuptools]
-zip-safe = false
-include-package-data = false
-
-[tool.setuptools.packages]
-find = {namespaces = false}
-
-[tool.setuptools.package-data]
-qcodes = [
-    "monitor/dist/*",
-    "monitor/dist/js/*",
-    "monitor/dist/css/*",
-    "configuration/*.json",
-    "instrument/sims/*.yaml",
-    "tests/dataset/fixtures/data_2018_01_17/*/*",
-    "tests/delegate/data/*.yml",
-    "tests/drivers/auxiliary_files/*",
-    "py.typed",
-    "dist/schemas/*",
-    "dist/tests/station/*",
-]
-
 [tool.towncrier]
 package = "qcodes"
 name = "QCoDeS"
@@ -344,5 +326,5 @@ method = "git"
 match = ["v*"]
 
 [tool.versioningit.onbuild]
-source-file = "qcodes/_version.py"
+source-file = "src/qcodes/_version.py"
 build-file = "qcodes/_version.py"
diff --git a/qcodes/.gitignore → src/qcodes/.gitignore b/qcodes/.gitignore → src/qcodes/.gitignore
diff --git a/qcodes/__init__.py → src/qcodes/__init__.py b/qcodes/__init__.py → src/qcodes/__init__.py
diff --git a/qcodes/_version.py → src/qcodes/_version.py b/qcodes/_version.py → src/qcodes/_version.py
@@ -9,7 +9,7 @@ def _get_version() -> str:
 
     module_path = files(root_module)
     if isinstance(module_path, Path):
-        return versioningit.get_version(project_dir=Path(module_path).parent)
+        return versioningit.get_version(project_dir=Path(module_path).parent.parent)
     else:
         return "0.0"
 

diff --git a/qcodes/calibrations/__init__.py → src/qcodes/calibrations/__init__.py b/qcodes/calibrations/__init__.py → src/qcodes/calibrations/__init__.py
diff --git a/qcodes/calibrations/keithley.py → src/qcodes/calibrations/keithley.py b/qcodes/calibrations/keithley.py → src/qcodes/calibrations/keithley.py
diff --git a/qcodes/configuration/.gitignore → src/qcodes/configuration/.gitignore b/qcodes/configuration/.gitignore → src/qcodes/configuration/.gitignore
diff --git a/qcodes/configuration/__init__.py → src/qcodes/configuration/__init__.py b/qcodes/configuration/__init__.py → src/qcodes/configuration/__init__.py
diff --git a/qcodes/configuration/config.py → src/qcodes/configuration/config.py b/qcodes/configuration/config.py → src/qcodes/configuration/config.py
diff --git a/qcodes/configuration/qcodesrc.json → src/qcodes/configuration/qcodesrc.json b/qcodes/configuration/qcodesrc.json → src/qcodes/configuration/qcodesrc.json
diff --git a/qcodes/configuration/qcodesrc_schema.json → ...qcodes/configuration/qcodesrc_schema.json b/qcodes/configuration/qcodesrc_schema.json → ...qcodes/configuration/qcodesrc_schema.json
diff --git a/qcodes/dataset/__init__.py → src/qcodes/dataset/__init__.py b/qcodes/dataset/__init__.py → src/qcodes/dataset/__init__.py
diff --git a/qcodes/dataset/data_export.py → src/qcodes/dataset/data_export.py b/qcodes/dataset/data_export.py → src/qcodes/dataset/data_export.py
diff --git a/qcodes/dataset/data_set.py → src/qcodes/dataset/data_set.py b/qcodes/dataset/data_set.py → src/qcodes/dataset/data_set.py
diff --git a/qcodes/dataset/data_set_cache.py → src/qcodes/dataset/data_set_cache.py b/qcodes/dataset/data_set_cache.py → src/qcodes/dataset/data_set_cache.py
diff --git a/qcodes/dataset/data_set_in_memory.py → src/qcodes/dataset/data_set_in_memory.py b/qcodes/dataset/data_set_in_memory.py → src/qcodes/dataset/data_set_in_memory.py
diff --git a/qcodes/dataset/data_set_info.py → src/qcodes/dataset/data_set_info.py b/qcodes/dataset/data_set_info.py → src/qcodes/dataset/data_set_info.py
diff --git a/qcodes/dataset/data_set_protocol.py → src/qcodes/dataset/data_set_protocol.py b/qcodes/dataset/data_set_protocol.py → src/qcodes/dataset/data_set_protocol.py
diff --git a/qcodes/dataset/database_extract_runs.py → src/qcodes/dataset/database_extract_runs.py b/qcodes/dataset/database_extract_runs.py → src/qcodes/dataset/database_extract_runs.py
diff --git a/qcodes/dataset/database_fix_functions.py → src/qcodes/dataset/database_fix_functions.py b/qcodes/dataset/database_fix_functions.py → src/qcodes/dataset/database_fix_functions.py
diff --git a/qcodes/dataset/dataset_helpers.py → src/qcodes/dataset/dataset_helpers.py b/qcodes/dataset/dataset_helpers.py → src/qcodes/dataset/dataset_helpers.py
diff --git a/qcodes/dataset/descriptions/__init__.py → src/qcodes/dataset/descriptions/__init__.py b/qcodes/dataset/descriptions/__init__.py → src/qcodes/dataset/descriptions/__init__.py
diff --git a/qcodes/dataset/descriptions/dependencies.py → ...odes/dataset/descriptions/dependencies.py b/qcodes/dataset/descriptions/dependencies.py → ...odes/dataset/descriptions/dependencies.py
diff --git a/qcodes/dataset/descriptions/detect_shapes.py → ...des/dataset/descriptions/detect_shapes.py b/qcodes/dataset/descriptions/detect_shapes.py → ...des/dataset/descriptions/detect_shapes.py
diff --git a/qcodes/dataset/descriptions/param_spec.py → ...qcodes/dataset/descriptions/param_spec.py b/qcodes/dataset/descriptions/param_spec.py → ...qcodes/dataset/descriptions/param_spec.py
diff --git a/qcodes/dataset/descriptions/rundescriber.py → ...odes/dataset/descriptions/rundescriber.py b/qcodes/dataset/descriptions/rundescriber.py → ...odes/dataset/descriptions/rundescriber.py
diff --git a/...taset/descriptions/versioning/__init__.py → ...taset/descriptions/versioning/__init__.py b/...taset/descriptions/versioning/__init__.py → ...taset/descriptions/versioning/__init__.py
diff --git a/...set/descriptions/versioning/converters.py → ...set/descriptions/versioning/converters.py b/...set/descriptions/versioning/converters.py → ...set/descriptions/versioning/converters.py
diff --git a/...criptions/versioning/rundescribertypes.py → ...criptions/versioning/rundescribertypes.py b/...criptions/versioning/rundescribertypes.py → ...criptions/versioning/rundescribertypes.py
diff --git a/.../descriptions/versioning/serialization.py → .../descriptions/versioning/serialization.py b/.../descriptions/versioning/serialization.py → .../descriptions/versioning/serialization.py
diff --git a/qcodes/dataset/descriptions/versioning/v0.py → ...des/dataset/descriptions/versioning/v0.py b/qcodes/dataset/descriptions/versioning/v0.py → ...des/dataset/descriptions/versioning/v0.py
diff --git a/qcodes/dataset/dond/__init__.py → src/qcodes/dataset/dond/__init__.py b/qcodes/dataset/dond/__init__.py → src/qcodes/dataset/dond/__init__.py
diff --git a/qcodes/dataset/dond/do_0d.py → src/qcodes/dataset/dond/do_0d.py b/qcodes/dataset/dond/do_0d.py → src/qcodes/dataset/dond/do_0d.py
diff --git a/qcodes/dataset/dond/do_1d.py → src/qcodes/dataset/dond/do_1d.py b/qcodes/dataset/dond/do_1d.py → src/qcodes/dataset/dond/do_1d.py
diff --git a/qcodes/dataset/dond/do_2d.py → src/qcodes/dataset/dond/do_2d.py b/qcodes/dataset/dond/do_2d.py → src/qcodes/dataset/dond/do_2d.py
diff --git a/qcodes/dataset/dond/do_nd.py → src/qcodes/dataset/dond/do_nd.py b/qcodes/dataset/dond/do_nd.py → src/qcodes/dataset/dond/do_nd.py
diff --git a/qcodes/dataset/dond/do_nd_utils.py → src/qcodes/dataset/dond/do_nd_utils.py b/qcodes/dataset/dond/do_nd_utils.py → src/qcodes/dataset/dond/do_nd_utils.py
diff --git a/qcodes/dataset/dond/sweeps.py → src/qcodes/dataset/dond/sweeps.py b/qcodes/dataset/dond/sweeps.py → src/qcodes/dataset/dond/sweeps.py
diff --git a/qcodes/dataset/experiment_container.py → src/qcodes/dataset/experiment_container.py b/qcodes/dataset/experiment_container.py → src/qcodes/dataset/experiment_container.py
diff --git a/qcodes/dataset/experiment_settings.py → src/qcodes/dataset/experiment_settings.py b/qcodes/dataset/experiment_settings.py → src/qcodes/dataset/experiment_settings.py
diff --git a/qcodes/dataset/export_config.py → src/qcodes/dataset/export_config.py b/qcodes/dataset/export_config.py → src/qcodes/dataset/export_config.py
diff --git a/qcodes/dataset/exporters/__init__.py → src/qcodes/dataset/exporters/__init__.py b/qcodes/dataset/exporters/__init__.py → src/qcodes/dataset/exporters/__init__.py
diff --git a/qcodes/dataset/exporters/export_info.py → src/qcodes/dataset/exporters/export_info.py b/qcodes/dataset/exporters/export_info.py → src/qcodes/dataset/exporters/export_info.py
diff --git a/qcodes/dataset/exporters/export_to_csv.py → ...qcodes/dataset/exporters/export_to_csv.py b/qcodes/dataset/exporters/export_to_csv.py → ...qcodes/dataset/exporters/export_to_csv.py
diff --git a/qcodes/dataset/exporters/export_to_pandas.py → ...des/dataset/exporters/export_to_pandas.py b/qcodes/dataset/exporters/export_to_pandas.py → ...des/dataset/exporters/export_to_pandas.py
diff --git a/qcodes/dataset/exporters/export_to_xarray.py → ...des/dataset/exporters/export_to_xarray.py b/qcodes/dataset/exporters/export_to_xarray.py → ...des/dataset/exporters/export_to_xarray.py
diff --git a/qcodes/dataset/guid_helpers.py → src/qcodes/dataset/guid_helpers.py b/qcodes/dataset/guid_helpers.py → src/qcodes/dataset/guid_helpers.py
diff --git a/qcodes/dataset/guids.py → src/qcodes/dataset/guids.py b/qcodes/dataset/guids.py → src/qcodes/dataset/guids.py
diff --git a/qcodes/dataset/json_exporter.py → src/qcodes/dataset/json_exporter.py b/qcodes/dataset/json_exporter.py → src/qcodes/dataset/json_exporter.py
diff --git a/qcodes/dataset/legacy_import.py → src/qcodes/dataset/legacy_import.py b/qcodes/dataset/legacy_import.py → src/qcodes/dataset/legacy_import.py
diff --git a/qcodes/dataset/linked_datasets/__init__.py → ...codes/dataset/linked_datasets/__init__.py b/qcodes/dataset/linked_datasets/__init__.py → ...codes/dataset/linked_datasets/__init__.py
diff --git a/qcodes/dataset/linked_datasets/links.py → src/qcodes/dataset/linked_datasets/links.py b/qcodes/dataset/linked_datasets/links.py → src/qcodes/dataset/linked_datasets/links.py
diff --git a/qcodes/dataset/measurement_extensions.py → src/qcodes/dataset/measurement_extensions.py b/qcodes/dataset/measurement_extensions.py → src/qcodes/dataset/measurement_extensions.py
diff --git a/qcodes/dataset/measurements.py → src/qcodes/dataset/measurements.py b/qcodes/dataset/measurements.py → src/qcodes/dataset/measurements.py
diff --git a/qcodes/dataset/plotting.py → src/qcodes/dataset/plotting.py b/qcodes/dataset/plotting.py → src/qcodes/dataset/plotting.py
diff --git a/qcodes/dataset/snapshot_utils.py → src/qcodes/dataset/snapshot_utils.py b/qcodes/dataset/snapshot_utils.py → src/qcodes/dataset/snapshot_utils.py
diff --git a/qcodes/dataset/sqlite/__init__.py → src/qcodes/dataset/sqlite/__init__.py b/qcodes/dataset/sqlite/__init__.py → src/qcodes/dataset/sqlite/__init__.py
diff --git a/qcodes/dataset/sqlite/connection.py → src/qcodes/dataset/sqlite/connection.py b/qcodes/dataset/sqlite/connection.py → src/qcodes/dataset/sqlite/connection.py
diff --git a/qcodes/dataset/sqlite/database.py → src/qcodes/dataset/sqlite/database.py b/qcodes/dataset/sqlite/database.py → src/qcodes/dataset/sqlite/database.py
diff --git a/...es/dataset/sqlite/db_upgrades/__init__.py → ...es/dataset/sqlite/db_upgrades/__init__.py b/...es/dataset/sqlite/db_upgrades/__init__.py → ...es/dataset/sqlite/db_upgrades/__init__.py
diff --git a/...aset/sqlite/db_upgrades/upgrade_2_to_3.py → ...aset/sqlite/db_upgrades/upgrade_2_to_3.py b/...aset/sqlite/db_upgrades/upgrade_2_to_3.py → ...aset/sqlite/db_upgrades/upgrade_2_to_3.py
diff --git a/...aset/sqlite/db_upgrades/upgrade_3_to_4.py → ...aset/sqlite/db_upgrades/upgrade_3_to_4.py b/...aset/sqlite/db_upgrades/upgrade_3_to_4.py → ...aset/sqlite/db_upgrades/upgrade_3_to_4.py
diff --git a/...aset/sqlite/db_upgrades/upgrade_5_to_6.py → ...aset/sqlite/db_upgrades/upgrade_5_to_6.py b/...aset/sqlite/db_upgrades/upgrade_5_to_6.py → ...aset/sqlite/db_upgrades/upgrade_5_to_6.py
diff --git a/qcodes/dataset/sqlite/db_upgrades/version.py → ...des/dataset/sqlite/db_upgrades/version.py b/qcodes/dataset/sqlite/db_upgrades/version.py → ...des/dataset/sqlite/db_upgrades/version.py
diff --git a/qcodes/dataset/sqlite/initial_schema.py → src/qcodes/dataset/sqlite/initial_schema.py b/qcodes/dataset/sqlite/initial_schema.py → src/qcodes/dataset/sqlite/initial_schema.py
diff --git a/qcodes/dataset/sqlite/queries.py → src/qcodes/dataset/sqlite/queries.py b/qcodes/dataset/sqlite/queries.py → src/qcodes/dataset/sqlite/queries.py
diff --git a/qcodes/dataset/sqlite/query_helpers.py → src/qcodes/dataset/sqlite/query_helpers.py b/qcodes/dataset/sqlite/query_helpers.py → src/qcodes/dataset/sqlite/query_helpers.py
diff --git a/qcodes/dataset/sqlite/settings.py → src/qcodes/dataset/sqlite/settings.py b/qcodes/dataset/sqlite/settings.py → src/qcodes/dataset/sqlite/settings.py
diff --git a/qcodes/dataset/subscriber.py → src/qcodes/dataset/subscriber.py b/qcodes/dataset/subscriber.py → src/qcodes/dataset/subscriber.py
diff --git a/qcodes/dataset/threading.py → src/qcodes/dataset/threading.py b/qcodes/dataset/threading.py → src/qcodes/dataset/threading.py
diff --git a/qcodes/dist/__init__.py → src/qcodes/dist/__init__.py b/qcodes/dist/__init__.py → src/qcodes/dist/__init__.py
diff --git a/qcodes/dist/schemas/__init__.py → src/qcodes/dist/schemas/__init__.py b/qcodes/dist/schemas/__init__.py → src/qcodes/dist/schemas/__init__.py
diff --git a/...dist/schemas/station-template.schema.json → ...dist/schemas/station-template.schema.json b/...dist/schemas/station-template.schema.json → ...dist/schemas/station-template.schema.json
diff --git a/qcodes/dist/tests/__init__.py → src/qcodes/dist/tests/__init__.py b/qcodes/dist/tests/__init__.py → src/qcodes/dist/tests/__init__.py
diff --git a/qcodes/dist/tests/station/__init__.py → src/qcodes/dist/tests/station/__init__.py b/qcodes/dist/tests/station/__init__.py → src/qcodes/dist/tests/station/__init__.py
diff --git a/...s/dist/tests/station/example.station.yaml → ...s/dist/tests/station/example.station.yaml b/...s/dist/tests/station/example.station.yaml → ...s/dist/tests/station/example.station.yaml
diff --git a/qcodes/extensions/__init__.py → src/qcodes/extensions/__init__.py b/qcodes/extensions/__init__.py → src/qcodes/extensions/__init__.py
diff --git a/qcodes/extensions/_log_export_info.py → src/qcodes/extensions/_log_export_info.py b/qcodes/extensions/_log_export_info.py → src/qcodes/extensions/_log_export_info.py
diff --git a/qcodes/extensions/installation.py → src/qcodes/extensions/installation.py b/qcodes/extensions/installation.py → src/qcodes/extensions/installation.py
diff --git a/qcodes/instrument/__init__.py → src/qcodes/instrument/__init__.py b/qcodes/instrument/__init__.py → src/qcodes/instrument/__init__.py
diff --git a/qcodes/instrument/base.py → src/qcodes/instrument/base.py b/qcodes/instrument/base.py → src/qcodes/instrument/base.py
diff --git a/qcodes/instrument/channel.py → src/qcodes/instrument/channel.py b/qcodes/instrument/channel.py → src/qcodes/instrument/channel.py
diff --git a/qcodes/instrument/delegate/__init__.py → src/qcodes/instrument/delegate/__init__.py b/qcodes/instrument/delegate/__init__.py → src/qcodes/instrument/delegate/__init__.py
diff --git a/...t/delegate/delegate_channel_instrument.py → ...t/delegate/delegate_channel_instrument.py b/...t/delegate/delegate_channel_instrument.py → ...t/delegate/delegate_channel_instrument.py
diff --git a/...nstrument/delegate/delegate_instrument.py → ...nstrument/delegate/delegate_instrument.py b/...nstrument/delegate/delegate_instrument.py → ...nstrument/delegate/delegate_instrument.py
diff --git a/.../instrument/delegate/grouped_parameter.py → .../instrument/delegate/grouped_parameter.py b/.../instrument/delegate/grouped_parameter.py → .../instrument/delegate/grouped_parameter.py
diff --git a/...s/instrument/delegate/instrument_group.py → ...s/instrument/delegate/instrument_group.py b/...s/instrument/delegate/instrument_group.py → ...s/instrument/delegate/instrument_group.py
diff --git a/qcodes/instrument/function.py → src/qcodes/instrument/function.py b/qcodes/instrument/function.py → src/qcodes/instrument/function.py
diff --git a/qcodes/instrument/group_parameter.py → src/qcodes/instrument/group_parameter.py b/qcodes/instrument/group_parameter.py → src/qcodes/instrument/group_parameter.py
diff --git a/qcodes/instrument/instrument.py → src/qcodes/instrument/instrument.py b/qcodes/instrument/instrument.py → src/qcodes/instrument/instrument.py
diff --git a/qcodes/instrument/instrument_base.py → src/qcodes/instrument/instrument_base.py b/qcodes/instrument/instrument_base.py → src/qcodes/instrument/instrument_base.py
diff --git a/qcodes/instrument/instrument_meta.py → src/qcodes/instrument/instrument_meta.py b/qcodes/instrument/instrument_meta.py → src/qcodes/instrument/instrument_meta.py
diff --git a/qcodes/instrument/ip.py → src/qcodes/instrument/ip.py b/qcodes/instrument/ip.py → src/qcodes/instrument/ip.py
diff --git a/qcodes/instrument/ip_to_visa.py → src/qcodes/instrument/ip_to_visa.py b/qcodes/instrument/ip_to_visa.py → src/qcodes/instrument/ip_to_visa.py
diff --git a/qcodes/instrument/mockers/__init__.py → src/qcodes/instrument/mockers/__init__.py b/qcodes/instrument/mockers/__init__.py → src/qcodes/instrument/mockers/__init__.py
diff --git a/qcodes/instrument/mockers/ami430.py → src/qcodes/instrument/mockers/ami430.py b/qcodes/instrument/mockers/ami430.py → src/qcodes/instrument/mockers/ami430.py
diff --git a/...s/instrument/mockers/simulated_ats_api.py → ...s/instrument/mockers/simulated_ats_api.py b/...s/instrument/mockers/simulated_ats_api.py → ...s/instrument/mockers/simulated_ats_api.py
diff --git a/qcodes/instrument/parameter.py → src/qcodes/instrument/parameter.py b/qcodes/instrument/parameter.py → src/qcodes/instrument/parameter.py
diff --git a/qcodes/instrument/sims/AMI430.yaml → src/qcodes/instrument/sims/AMI430.yaml b/qcodes/instrument/sims/AMI430.yaml → src/qcodes/instrument/sims/AMI430.yaml
diff --git a/qcodes/instrument/sims/AimTTi_PL601P.yaml → ...qcodes/instrument/sims/AimTTi_PL601P.yaml b/qcodes/instrument/sims/AimTTi_PL601P.yaml → ...qcodes/instrument/sims/AimTTi_PL601P.yaml
diff --git a/qcodes/instrument/sims/Keithley_2450.yaml → ...qcodes/instrument/sims/Keithley_2450.yaml b/qcodes/instrument/sims/Keithley_2450.yaml → ...qcodes/instrument/sims/Keithley_2450.yaml
diff --git a/qcodes/instrument/sims/Keithley_2600.yaml → ...qcodes/instrument/sims/Keithley_2600.yaml b/qcodes/instrument/sims/Keithley_2600.yaml → ...qcodes/instrument/sims/Keithley_2600.yaml
diff --git a/qcodes/instrument/sims/Keithley_3706A.yaml → ...codes/instrument/sims/Keithley_3706A.yaml b/qcodes/instrument/sims/Keithley_3706A.yaml → ...codes/instrument/sims/Keithley_3706A.yaml
diff --git a/qcodes/instrument/sims/Keithley_s46.yaml → src/qcodes/instrument/sims/Keithley_s46.yaml b/qcodes/instrument/sims/Keithley_s46.yaml → src/qcodes/instrument/sims/Keithley_s46.yaml
diff --git a/qcodes/instrument/sims/Keysight_33xxx.yaml → ...codes/instrument/sims/Keysight_33xxx.yaml b/qcodes/instrument/sims/Keysight_33xxx.yaml → ...codes/instrument/sims/Keysight_33xxx.yaml
diff --git a/qcodes/instrument/sims/Keysight_34465A.yaml → ...odes/instrument/sims/Keysight_34465A.yaml b/qcodes/instrument/sims/Keysight_34465A.yaml → ...odes/instrument/sims/Keysight_34465A.yaml
diff --git a/qcodes/instrument/sims/Keysight_E4980A.yaml → ...odes/instrument/sims/Keysight_E4980A.yaml b/qcodes/instrument/sims/Keysight_E4980A.yaml → ...odes/instrument/sims/Keysight_E4980A.yaml
diff --git a/qcodes/instrument/sims/Keysight_N6705B.yaml → ...odes/instrument/sims/Keysight_N6705B.yaml b/qcodes/instrument/sims/Keysight_N6705B.yaml → ...odes/instrument/sims/Keysight_N6705B.yaml
diff --git a/qcodes/instrument/sims/Keysight_N9030B.yaml → ...odes/instrument/sims/Keysight_N9030B.yaml b/qcodes/instrument/sims/Keysight_N9030B.yaml → ...odes/instrument/sims/Keysight_N9030B.yaml
diff --git a/qcodes/instrument/sims/MercuryiPS.yaml → src/qcodes/instrument/sims/MercuryiPS.yaml b/qcodes/instrument/sims/MercuryiPS.yaml → src/qcodes/instrument/sims/MercuryiPS.yaml
diff --git a/qcodes/instrument/sims/RSHMC804x.yaml → src/qcodes/instrument/sims/RSHMC804x.yaml b/qcodes/instrument/sims/RSHMC804x.yaml → src/qcodes/instrument/sims/RSHMC804x.yaml
diff --git a/qcodes/instrument/sims/RTO_1000.yaml → src/qcodes/instrument/sims/RTO_1000.yaml b/qcodes/instrument/sims/RTO_1000.yaml → src/qcodes/instrument/sims/RTO_1000.yaml
diff --git a/qcodes/instrument/sims/Rigol_DS1074Z.yaml → ...qcodes/instrument/sims/Rigol_DS1074Z.yaml b/qcodes/instrument/sims/Rigol_DS1074Z.yaml → ...qcodes/instrument/sims/Rigol_DS1074Z.yaml
diff --git a/...s/instrument/sims/Tektronix_AWG5014C.yaml → ...s/instrument/sims/Tektronix_AWG5014C.yaml b/...s/instrument/sims/Tektronix_AWG5014C.yaml → ...s/instrument/sims/Tektronix_AWG5014C.yaml
diff --git a/...es/instrument/sims/Tektronix_AWG5208.yaml → ...es/instrument/sims/Tektronix_AWG5208.yaml b/...es/instrument/sims/Tektronix_AWG5208.yaml → ...es/instrument/sims/Tektronix_AWG5208.yaml
diff --git a/.../instrument/sims/Tektronix_AWG70000A.yaml → .../instrument/sims/Tektronix_AWG70000A.yaml b/.../instrument/sims/Tektronix_AWG70000A.yaml → .../instrument/sims/Tektronix_AWG70000A.yaml
diff --git a/.../instrument/sims/Tektronix_DPO7200xx.yaml → .../instrument/sims/Tektronix_DPO7200xx.yaml b/.../instrument/sims/Tektronix_DPO7200xx.yaml → .../instrument/sims/Tektronix_DPO7200xx.yaml
diff --git a/qcodes/instrument/sims/Weinschel_8320.yaml → ...codes/instrument/sims/Weinschel_8320.yaml b/qcodes/instrument/sims/Weinschel_8320.yaml → ...codes/instrument/sims/Weinschel_8320.yaml
diff --git a/qcodes/instrument/sims/Yokogawa_GS200.yaml → ...codes/instrument/sims/Yokogawa_GS200.yaml b/qcodes/instrument/sims/Yokogawa_GS200.yaml → ...codes/instrument/sims/Yokogawa_GS200.yaml
diff --git a/qcodes/instrument/sims/__init__.py → src/qcodes/instrument/sims/__init__.py b/qcodes/instrument/sims/__init__.py → src/qcodes/instrument/sims/__init__.py
diff --git a/qcodes/instrument/sims/dummy.py → src/qcodes/instrument/sims/dummy.py b/qcodes/instrument/sims/dummy.py → src/qcodes/instrument/sims/dummy.py
diff --git a/qcodes/instrument/sims/dummy.yaml → src/qcodes/instrument/sims/dummy.yaml b/qcodes/instrument/sims/dummy.yaml → src/qcodes/instrument/sims/dummy.yaml
diff --git a/qcodes/instrument/sims/keithley_7510.yaml → ...qcodes/instrument/sims/keithley_7510.yaml b/qcodes/instrument/sims/keithley_7510.yaml → ...qcodes/instrument/sims/keithley_7510.yaml
diff --git a/qcodes/instrument/sims/keysight_34980A.yaml → ...odes/instrument/sims/keysight_34980A.yaml b/qcodes/instrument/sims/keysight_34980A.yaml → ...odes/instrument/sims/keysight_34980A.yaml
diff --git a/qcodes/instrument/sims/keysight_b1500.yaml → ...codes/instrument/sims/keysight_b1500.yaml b/qcodes/instrument/sims/keysight_b1500.yaml → ...codes/instrument/sims/keysight_b1500.yaml
diff --git a/qcodes/instrument/sims/keysight_b220x.yaml → ...codes/instrument/sims/keysight_b220x.yaml b/qcodes/instrument/sims/keysight_b220x.yaml → ...codes/instrument/sims/keysight_b220x.yaml
diff --git a/...s/instrument/sims/lakeshore_model335.yaml → ...s/instrument/sims/lakeshore_model335.yaml b/...s/instrument/sims/lakeshore_model335.yaml → ...s/instrument/sims/lakeshore_model335.yaml
diff --git a/...s/instrument/sims/lakeshore_model336.yaml → ...s/instrument/sims/lakeshore_model336.yaml b/...s/instrument/sims/lakeshore_model336.yaml → ...s/instrument/sims/lakeshore_model336.yaml
diff --git a/...s/instrument/sims/lakeshore_model372.yaml → ...s/instrument/sims/lakeshore_model372.yaml b/...s/instrument/sims/lakeshore_model372.yaml → ...s/instrument/sims/lakeshore_model372.yaml
diff --git a/qcodes/instrument/sims/stahl.yaml → src/qcodes/instrument/sims/stahl.yaml b/qcodes/instrument/sims/stahl.yaml → src/qcodes/instrument/sims/stahl.yaml
diff --git a/qcodes/instrument/specialized_parameters.py → ...odes/instrument/specialized_parameters.py b/qcodes/instrument/specialized_parameters.py → ...odes/instrument/specialized_parameters.py
diff --git a/qcodes/instrument/sweep_values.py → src/qcodes/instrument/sweep_values.py b/qcodes/instrument/sweep_values.py → src/qcodes/instrument/sweep_values.py
diff --git a/qcodes/instrument/visa.py → src/qcodes/instrument/visa.py b/qcodes/instrument/visa.py → src/qcodes/instrument/visa.py
diff --git a/..._drivers/AimTTi/AimTTi_PL601P_channels.py → ..._drivers/AimTTi/AimTTi_PL601P_channels.py b/..._drivers/AimTTi/AimTTi_PL601P_channels.py → ..._drivers/AimTTi/AimTTi_PL601P_channels.py
diff --git a/...trument_drivers/AimTTi/Aim_TTi_PL068_P.py → ...trument_drivers/AimTTi/Aim_TTi_PL068_P.py b/...trument_drivers/AimTTi/Aim_TTi_PL068_P.py → ...trument_drivers/AimTTi/Aim_TTi_PL068_P.py
diff --git a/...trument_drivers/AimTTi/Aim_TTi_PL155_P.py → ...trument_drivers/AimTTi/Aim_TTi_PL155_P.py b/...trument_drivers/AimTTi/Aim_TTi_PL155_P.py → ...trument_drivers/AimTTi/Aim_TTi_PL155_P.py
diff --git a/...ment_drivers/AimTTi/Aim_TTi_PL303QMD_P.py → ...ment_drivers/AimTTi/Aim_TTi_PL303QMD_P.py b/...ment_drivers/AimTTi/Aim_TTi_PL303QMD_P.py → ...ment_drivers/AimTTi/Aim_TTi_PL303QMD_P.py
diff --git a/...ment_drivers/AimTTi/Aim_TTi_PL303QMT_P.py → ...ment_drivers/AimTTi/Aim_TTi_PL303QMT_P.py b/...ment_drivers/AimTTi/Aim_TTi_PL303QMT_P.py → ...ment_drivers/AimTTi/Aim_TTi_PL303QMT_P.py
diff --git a/...trument_drivers/AimTTi/Aim_TTi_PL303_P.py → ...trument_drivers/AimTTi/Aim_TTi_PL303_P.py b/...trument_drivers/AimTTi/Aim_TTi_PL303_P.py → ...trument_drivers/AimTTi/Aim_TTi_PL303_P.py
diff --git a/...trument_drivers/AimTTi/Aim_TTi_PL601_P.py → ...trument_drivers/AimTTi/Aim_TTi_PL601_P.py b/...trument_drivers/AimTTi/Aim_TTi_PL601_P.py → ...trument_drivers/AimTTi/Aim_TTi_PL601_P.py
diff --git a/...rument_drivers/AimTTi/Aim_TTi_QL355_TP.py → ...rument_drivers/AimTTi/Aim_TTi_QL355_TP.py b/...rument_drivers/AimTTi/Aim_TTi_QL355_TP.py → ...rument_drivers/AimTTi/Aim_TTi_QL355_TP.py
diff --git a/...instrument_drivers/AimTTi/_AimTTi_PL_P.py → ...instrument_drivers/AimTTi/_AimTTi_PL_P.py b/...instrument_drivers/AimTTi/_AimTTi_PL_P.py → ...instrument_drivers/AimTTi/_AimTTi_PL_P.py
diff --git a/qcodes/instrument_drivers/AimTTi/__init__.py → ...des/instrument_drivers/AimTTi/__init__.py b/qcodes/instrument_drivers/AimTTi/__init__.py → ...des/instrument_drivers/AimTTi/__init__.py
diff --git a/qcodes/instrument_drivers/AlazarTech/ATS.py → ...odes/instrument_drivers/AlazarTech/ATS.py b/qcodes/instrument_drivers/AlazarTech/ATS.py → ...odes/instrument_drivers/AlazarTech/ATS.py
diff --git a/.../instrument_drivers/AlazarTech/ATS9360.py → .../instrument_drivers/AlazarTech/ATS9360.py b/.../instrument_drivers/AlazarTech/ATS9360.py → .../instrument_drivers/AlazarTech/ATS9360.py
diff --git a/.../instrument_drivers/AlazarTech/ATS9373.py → .../instrument_drivers/AlazarTech/ATS9373.py b/.../instrument_drivers/AlazarTech/ATS9373.py → .../instrument_drivers/AlazarTech/ATS9373.py
diff --git a/.../instrument_drivers/AlazarTech/ATS9440.py → .../instrument_drivers/AlazarTech/ATS9440.py b/.../instrument_drivers/AlazarTech/ATS9440.py → .../instrument_drivers/AlazarTech/ATS9440.py
diff --git a/.../instrument_drivers/AlazarTech/ATS9870.py → .../instrument_drivers/AlazarTech/ATS9870.py b/.../instrument_drivers/AlazarTech/ATS9870.py → .../instrument_drivers/AlazarTech/ATS9870.py
diff --git a/...AlazarTech/ATS_acquisition_controllers.py → ...AlazarTech/ATS_acquisition_controllers.py b/...AlazarTech/ATS_acquisition_controllers.py → ...AlazarTech/ATS_acquisition_controllers.py
diff --git a/...instrument_drivers/AlazarTech/__init__.py → ...instrument_drivers/AlazarTech/__init__.py b/...instrument_drivers/AlazarTech/__init__.py → ...instrument_drivers/AlazarTech/__init__.py
diff --git a/.../instrument_drivers/AlazarTech/ats_api.py → .../instrument_drivers/AlazarTech/ats_api.py b/.../instrument_drivers/AlazarTech/ats_api.py → .../instrument_drivers/AlazarTech/ats_api.py
diff --git a/...nstrument_drivers/AlazarTech/constants.py → ...nstrument_drivers/AlazarTech/constants.py b/...nstrument_drivers/AlazarTech/constants.py → ...nstrument_drivers/AlazarTech/constants.py
diff --git a/...trument_drivers/AlazarTech/dll_wrapper.py → ...trument_drivers/AlazarTech/dll_wrapper.py b/...trument_drivers/AlazarTech/dll_wrapper.py → ...trument_drivers/AlazarTech/dll_wrapper.py
diff --git a/.../instrument_drivers/AlazarTech/helpers.py → .../instrument_drivers/AlazarTech/helpers.py b/.../instrument_drivers/AlazarTech/helpers.py → .../instrument_drivers/AlazarTech/helpers.py
diff --git a/...es/instrument_drivers/AlazarTech/utils.py → ...es/instrument_drivers/AlazarTech/utils.py b/...es/instrument_drivers/AlazarTech/utils.py → ...es/instrument_drivers/AlazarTech/utils.py
diff --git a/qcodes/instrument_drivers/Galil/__init__.py → ...odes/instrument_drivers/Galil/__init__.py b/qcodes/instrument_drivers/Galil/__init__.py → ...odes/instrument_drivers/Galil/__init__.py
diff --git a/qcodes/instrument_drivers/Galil/dmc_41x3.py → ...odes/instrument_drivers/Galil/dmc_41x3.py b/qcodes/instrument_drivers/Galil/dmc_41x3.py → ...odes/instrument_drivers/Galil/dmc_41x3.py
diff --git a/qcodes/instrument_drivers/HP/HP8133A.py → src/qcodes/instrument_drivers/HP/HP8133A.py b/qcodes/instrument_drivers/HP/HP8133A.py → src/qcodes/instrument_drivers/HP/HP8133A.py
diff --git a/qcodes/instrument_drivers/HP/HP8753D.py → src/qcodes/instrument_drivers/HP/HP8753D.py b/qcodes/instrument_drivers/HP/HP8753D.py → src/qcodes/instrument_drivers/HP/HP8753D.py
diff --git a/qcodes/instrument_drivers/HP/HP_8133A.py → src/qcodes/instrument_drivers/HP/HP_8133A.py b/qcodes/instrument_drivers/HP/HP_8133A.py → src/qcodes/instrument_drivers/HP/HP_8133A.py
diff --git a/qcodes/instrument_drivers/HP/HP_83650A.py → ...qcodes/instrument_drivers/HP/HP_83650A.py b/qcodes/instrument_drivers/HP/HP_83650A.py → ...qcodes/instrument_drivers/HP/HP_83650A.py
diff --git a/qcodes/instrument_drivers/HP/HP_8753D.py → src/qcodes/instrument_drivers/HP/HP_8753D.py b/qcodes/instrument_drivers/HP/HP_8753D.py → src/qcodes/instrument_drivers/HP/HP_8753D.py
diff --git a/qcodes/instrument_drivers/HP/__init__.py → src/qcodes/instrument_drivers/HP/__init__.py b/qcodes/instrument_drivers/HP/__init__.py → src/qcodes/instrument_drivers/HP/__init__.py
diff --git a/qcodes/instrument_drivers/Harvard/Decadac.py → ...des/instrument_drivers/Harvard/Decadac.py b/qcodes/instrument_drivers/Harvard/Decadac.py → ...des/instrument_drivers/Harvard/Decadac.py
diff --git a/...es/instrument_drivers/Harvard/__init__.py → ...es/instrument_drivers/Harvard/__init__.py b/...es/instrument_drivers/Harvard/__init__.py → ...es/instrument_drivers/Harvard/__init__.py
diff --git a/...trument_drivers/Keithley/Keithley_2000.py → ...trument_drivers/Keithley/Keithley_2000.py b/...trument_drivers/Keithley/Keithley_2000.py → ...trument_drivers/Keithley/Keithley_2000.py
diff --git a/...trument_drivers/Keithley/Keithley_2400.py → ...trument_drivers/Keithley/Keithley_2400.py b/...trument_drivers/Keithley/Keithley_2400.py → ...trument_drivers/Keithley/Keithley_2400.py
diff --git a/...trument_drivers/Keithley/Keithley_2450.py → ...trument_drivers/Keithley/Keithley_2450.py b/...trument_drivers/Keithley/Keithley_2450.py → ...trument_drivers/Keithley/Keithley_2450.py
diff --git a/...rument_drivers/Keithley/Keithley_2601B.py → ...rument_drivers/Keithley/Keithley_2601B.py b/...rument_drivers/Keithley/Keithley_2601B.py → ...rument_drivers/Keithley/Keithley_2601B.py
diff --git a/...rument_drivers/Keithley/Keithley_2602A.py → ...rument_drivers/Keithley/Keithley_2602A.py b/...rument_drivers/Keithley/Keithley_2602A.py → ...rument_drivers/Keithley/Keithley_2602A.py
diff --git a/...rument_drivers/Keithley/Keithley_2602B.py → ...rument_drivers/Keithley/Keithley_2602B.py b/...rument_drivers/Keithley/Keithley_2602B.py → ...rument_drivers/Keithley/Keithley_2602B.py
diff --git a/...rument_drivers/Keithley/Keithley_2604B.py → ...rument_drivers/Keithley/Keithley_2604B.py b/...rument_drivers/Keithley/Keithley_2604B.py → ...rument_drivers/Keithley/Keithley_2604B.py
diff --git a/...rument_drivers/Keithley/Keithley_2611B.py → ...rument_drivers/Keithley/Keithley_2611B.py b/...rument_drivers/Keithley/Keithley_2611B.py → ...rument_drivers/Keithley/Keithley_2611B.py
diff --git a/...rument_drivers/Keithley/Keithley_2612B.py → ...rument_drivers/Keithley/Keithley_2612B.py b/...rument_drivers/Keithley/Keithley_2612B.py → ...rument_drivers/Keithley/Keithley_2612B.py
diff --git a/...rument_drivers/Keithley/Keithley_2614B.py → ...rument_drivers/Keithley/Keithley_2614B.py b/...rument_drivers/Keithley/Keithley_2614B.py → ...rument_drivers/Keithley/Keithley_2614B.py
diff --git a/...rument_drivers/Keithley/Keithley_2634B.py → ...rument_drivers/Keithley/Keithley_2634B.py b/...rument_drivers/Keithley/Keithley_2634B.py → ...rument_drivers/Keithley/Keithley_2634B.py
diff --git a/...rument_drivers/Keithley/Keithley_2635B.py → ...rument_drivers/Keithley/Keithley_2635B.py b/...rument_drivers/Keithley/Keithley_2635B.py → ...rument_drivers/Keithley/Keithley_2635B.py
diff --git a/...rument_drivers/Keithley/Keithley_2636B.py → ...rument_drivers/Keithley/Keithley_2636B.py b/...rument_drivers/Keithley/Keithley_2636B.py → ...rument_drivers/Keithley/Keithley_2636B.py
diff --git a/...rument_drivers/Keithley/Keithley_3706A.py → ...rument_drivers/Keithley/Keithley_3706A.py b/...rument_drivers/Keithley/Keithley_3706A.py → ...rument_drivers/Keithley/Keithley_3706A.py
diff --git a/...trument_drivers/Keithley/Keithley_6500.py → ...trument_drivers/Keithley/Keithley_6500.py b/...trument_drivers/Keithley/Keithley_6500.py → ...trument_drivers/Keithley/Keithley_6500.py
diff --git a/...trument_drivers/Keithley/Keithley_7510.py → ...trument_drivers/Keithley/Keithley_7510.py b/...trument_drivers/Keithley/Keithley_7510.py → ...trument_drivers/Keithley/Keithley_7510.py
diff --git a/...strument_drivers/Keithley/Keithley_s46.py → ...strument_drivers/Keithley/Keithley_s46.py b/...strument_drivers/Keithley/Keithley_s46.py → ...strument_drivers/Keithley/Keithley_s46.py
diff --git a/...rument_drivers/Keithley/_Keithley_2600.py → ...rument_drivers/Keithley/_Keithley_2600.py b/...rument_drivers/Keithley/_Keithley_2600.py → ...rument_drivers/Keithley/_Keithley_2600.py
diff --git a/...s/instrument_drivers/Keithley/__init__.py → ...s/instrument_drivers/Keithley/__init__.py b/...s/instrument_drivers/Keithley/__init__.py → ...s/instrument_drivers/Keithley/__init__.py
diff --git a/.../instrument_drivers/Keysight/Infiniium.py → .../instrument_drivers/Keysight/Infiniium.py b/.../instrument_drivers/Keysight/Infiniium.py → .../instrument_drivers/Keysight/Infiniium.py
diff --git a/...drivers/Keysight/KeysightAgilent_33XXX.py → ...drivers/Keysight/KeysightAgilent_33XXX.py b/...drivers/Keysight/KeysightAgilent_33XXX.py → ...drivers/Keysight/KeysightAgilent_33XXX.py
diff --git a/...ument_drivers/Keysight/Keysight_33210a.py → ...ument_drivers/Keysight/Keysight_33210a.py b/...ument_drivers/Keysight/Keysight_33210a.py → ...ument_drivers/Keysight/Keysight_33210a.py
diff --git a/...ument_drivers/Keysight/Keysight_33250a.py → ...ument_drivers/Keysight/Keysight_33250a.py b/...ument_drivers/Keysight/Keysight_33250a.py → ...ument_drivers/Keysight/Keysight_33250a.py
diff --git a/...ument_drivers/Keysight/Keysight_33510b.py → ...ument_drivers/Keysight/Keysight_33510b.py b/...ument_drivers/Keysight/Keysight_33510b.py → ...ument_drivers/Keysight/Keysight_33510b.py
diff --git a/...ument_drivers/Keysight/Keysight_33511b.py → ...ument_drivers/Keysight/Keysight_33511b.py b/...ument_drivers/Keysight/Keysight_33511b.py → ...ument_drivers/Keysight/Keysight_33511b.py
diff --git a/...ument_drivers/Keysight/Keysight_33512b.py → ...ument_drivers/Keysight/Keysight_33512b.py b/...ument_drivers/Keysight/Keysight_33512b.py → ...ument_drivers/Keysight/Keysight_33512b.py
diff --git a/...ument_drivers/Keysight/Keysight_33522b.py → ...ument_drivers/Keysight/Keysight_33522b.py b/...ument_drivers/Keysight/Keysight_33522b.py → ...ument_drivers/Keysight/Keysight_33522b.py
diff --git a/...ument_drivers/Keysight/Keysight_33622a.py → ...ument_drivers/Keysight/Keysight_33622a.py b/...ument_drivers/Keysight/Keysight_33622a.py → ...ument_drivers/Keysight/Keysight_33622a.py
diff --git a/...rs/Keysight/Keysight_34410A_submodules.py → ...rs/Keysight/Keysight_34410A_submodules.py b/...rs/Keysight/Keysight_34410A_submodules.py → ...rs/Keysight/Keysight_34410A_submodules.py
diff --git a/...rs/Keysight/Keysight_34411A_submodules.py → ...rs/Keysight/Keysight_34411A_submodules.py b/...rs/Keysight/Keysight_34411A_submodules.py → ...rs/Keysight/Keysight_34411A_submodules.py
diff --git a/...rs/Keysight/Keysight_34460A_submodules.py → ...rs/Keysight/Keysight_34460A_submodules.py b/...rs/Keysight/Keysight_34460A_submodules.py → ...rs/Keysight/Keysight_34460A_submodules.py
diff --git a/...rs/Keysight/Keysight_34461A_submodules.py → ...rs/Keysight/Keysight_34461A_submodules.py b/...rs/Keysight/Keysight_34461A_submodules.py → ...rs/Keysight/Keysight_34461A_submodules.py
diff --git a/...rs/Keysight/Keysight_34465A_submodules.py → ...rs/Keysight/Keysight_34465A_submodules.py b/...rs/Keysight/Keysight_34465A_submodules.py → ...rs/Keysight/Keysight_34465A_submodules.py
diff --git a/...rs/Keysight/Keysight_34470A_submodules.py → ...rs/Keysight/Keysight_34470A_submodules.py b/...rs/Keysight/Keysight_34470A_submodules.py → ...rs/Keysight/Keysight_34470A_submodules.py
diff --git a/...ument_drivers/Keysight/Keysight_B2962A.py → ...ument_drivers/Keysight/Keysight_B2962A.py b/...ument_drivers/Keysight/Keysight_B2962A.py → ...ument_drivers/Keysight/Keysight_B2962A.py
diff --git a/...ument_drivers/Keysight/Keysight_N5173B.py → ...ument_drivers/Keysight/Keysight_N5173B.py b/...ument_drivers/Keysight/Keysight_N5173B.py → ...ument_drivers/Keysight/Keysight_N5173B.py
diff --git a/...ument_drivers/Keysight/Keysight_N5183B.py → ...ument_drivers/Keysight/Keysight_N5183B.py b/...ument_drivers/Keysight/Keysight_N5183B.py → ...ument_drivers/Keysight/Keysight_N5183B.py
diff --git a/...ument_drivers/Keysight/Keysight_N5222B.py → ...ument_drivers/Keysight/Keysight_N5222B.py b/...ument_drivers/Keysight/Keysight_N5222B.py → ...ument_drivers/Keysight/Keysight_N5222B.py
diff --git a/...ument_drivers/Keysight/Keysight_N5230C.py → ...ument_drivers/Keysight/Keysight_N5230C.py b/...ument_drivers/Keysight/Keysight_N5230C.py → ...ument_drivers/Keysight/Keysight_N5230C.py
diff --git a/...ument_drivers/Keysight/Keysight_N5245A.py → ...ument_drivers/Keysight/Keysight_N5245A.py b/...ument_drivers/Keysight/Keysight_N5245A.py → ...ument_drivers/Keysight/Keysight_N5245A.py
diff --git a/...ument_drivers/Keysight/Keysight_N6705B.py → ...ument_drivers/Keysight/Keysight_N6705B.py b/...ument_drivers/Keysight/Keysight_N6705B.py → ...ument_drivers/Keysight/Keysight_N6705B.py
diff --git a/...ument_drivers/Keysight/Keysight_N9030B.py → ...ument_drivers/Keysight/Keysight_N9030B.py b/...ument_drivers/Keysight/Keysight_N9030B.py → ...ument_drivers/Keysight/Keysight_N9030B.py
diff --git a/...ument_drivers/Keysight/Keysight_P9374A.py → ...ument_drivers/Keysight/Keysight_P9374A.py b/...ument_drivers/Keysight/Keysight_P9374A.py → ...ument_drivers/Keysight/Keysight_P9374A.py
diff --git a/...es/instrument_drivers/Keysight/KtM960x.py → ...es/instrument_drivers/Keysight/KtM960x.py b/...es/instrument_drivers/Keysight/KtM960x.py → ...es/instrument_drivers/Keysight/KtM960x.py
diff --git a/...nstrument_drivers/Keysight/KtM960xDefs.py → ...nstrument_drivers/Keysight/KtM960xDefs.py b/...nstrument_drivers/Keysight/KtM960xDefs.py → ...nstrument_drivers/Keysight/KtM960xDefs.py
diff --git a/qcodes/instrument_drivers/Keysight/KtMAwg.py → ...des/instrument_drivers/Keysight/KtMAwg.py b/qcodes/instrument_drivers/Keysight/KtMAwg.py → ...des/instrument_drivers/Keysight/KtMAwg.py
diff --git a/...instrument_drivers/Keysight/KtMAwgDefs.py → ...instrument_drivers/Keysight/KtMAwgDefs.py b/...instrument_drivers/Keysight/KtMAwgDefs.py → ...instrument_drivers/Keysight/KtMAwgDefs.py
diff --git a/qcodes/instrument_drivers/Keysight/N51x1.py → ...odes/instrument_drivers/Keysight/N51x1.py b/qcodes/instrument_drivers/Keysight/N51x1.py → ...odes/instrument_drivers/Keysight/N51x1.py
diff --git a/qcodes/instrument_drivers/Keysight/N5222B.py → ...des/instrument_drivers/Keysight/N5222B.py b/qcodes/instrument_drivers/Keysight/N5222B.py → ...des/instrument_drivers/Keysight/N5222B.py
diff --git a/qcodes/instrument_drivers/Keysight/N5230C.py → ...des/instrument_drivers/Keysight/N5230C.py b/qcodes/instrument_drivers/Keysight/N5230C.py → ...des/instrument_drivers/Keysight/N5230C.py
diff --git a/qcodes/instrument_drivers/Keysight/N5245A.py → ...des/instrument_drivers/Keysight/N5245A.py b/qcodes/instrument_drivers/Keysight/N5245A.py → ...des/instrument_drivers/Keysight/N5245A.py
diff --git a/qcodes/instrument_drivers/Keysight/N52xx.py → ...odes/instrument_drivers/Keysight/N52xx.py b/qcodes/instrument_drivers/Keysight/N52xx.py → ...odes/instrument_drivers/Keysight/N52xx.py
diff --git a/qcodes/instrument_drivers/Keysight/N9030B.py → ...des/instrument_drivers/Keysight/N9030B.py b/qcodes/instrument_drivers/Keysight/N9030B.py → ...des/instrument_drivers/Keysight/N9030B.py
diff --git a/qcodes/instrument_drivers/Keysight/P9374A.py → ...des/instrument_drivers/Keysight/P9374A.py b/qcodes/instrument_drivers/Keysight/P9374A.py → ...des/instrument_drivers/Keysight/P9374A.py
diff --git a/...ment_drivers/Keysight/_Keysight_N5232B.py → ...ment_drivers/Keysight/_Keysight_N5232B.py b/...ment_drivers/Keysight/_Keysight_N5232B.py → ...ment_drivers/Keysight/_Keysight_N5232B.py
diff --git a/...s/instrument_drivers/Keysight/__init__.py → ...s/instrument_drivers/Keysight/__init__.py b/...s/instrument_drivers/Keysight/__init__.py → ...s/instrument_drivers/Keysight/__init__.py
diff --git a/...ument_drivers/Keysight/keysight_34934a.py → ...ument_drivers/Keysight/keysight_34934a.py b/...ument_drivers/Keysight/keysight_34934a.py → ...ument_drivers/Keysight/keysight_34934a.py
diff --git a/...ument_drivers/Keysight/keysight_34980a.py → ...ument_drivers/Keysight/keysight_34980a.py b/...ument_drivers/Keysight/keysight_34980a.py → ...ument_drivers/Keysight/keysight_34980a.py
diff --git a/...rs/Keysight/keysight_34980a_submodules.py → ...rs/Keysight/keysight_34980a_submodules.py b/...rs/Keysight/keysight_34980a_submodules.py → ...rs/Keysight/keysight_34980a_submodules.py
diff --git a/...rument_drivers/Keysight/keysight_b220x.py → ...rument_drivers/Keysight/keysight_b220x.py b/...rument_drivers/Keysight/keysight_b220x.py → ...rument_drivers/Keysight/keysight_b220x.py
diff --git a/...ument_drivers/Keysight/keysight_e4980a.py → ...ument_drivers/Keysight/keysight_e4980a.py b/...ument_drivers/Keysight/keysight_e4980a.py → ...ument_drivers/Keysight/keysight_e4980a.py
diff --git a/...sight/keysightb1500/KeysightB1500_base.py → ...sight/keysightb1500/KeysightB1500_base.py b/...sight/keysightb1500/KeysightB1500_base.py → ...sight/keysightb1500/KeysightB1500_base.py
diff --git a/...ght/keysightb1500/KeysightB1500_module.py → ...ght/keysightb1500/KeysightB1500_module.py b/...ght/keysightb1500/KeysightB1500_module.py → ...ght/keysightb1500/KeysightB1500_module.py
diff --git a/...500/KeysightB1500_sampling_measurement.py → ...500/KeysightB1500_sampling_measurement.py b/...500/KeysightB1500_sampling_measurement.py → ...500/KeysightB1500_sampling_measurement.py
diff --git a/.../Keysight/keysightb1500/KeysightB1511B.py → .../Keysight/keysightb1500/KeysightB1511B.py b/.../Keysight/keysightb1500/KeysightB1511B.py → .../Keysight/keysightb1500/KeysightB1511B.py
diff --git a/.../Keysight/keysightb1500/KeysightB1517A.py → .../Keysight/keysightb1500/KeysightB1517A.py b/.../Keysight/keysightb1500/KeysightB1517A.py → .../Keysight/keysightb1500/KeysightB1517A.py
diff --git a/.../Keysight/keysightb1500/KeysightB1520A.py → .../Keysight/keysightb1500/KeysightB1520A.py b/.../Keysight/keysightb1500/KeysightB1520A.py → .../Keysight/keysightb1500/KeysightB1520A.py
diff --git a/.../Keysight/keysightb1500/KeysightB1530A.py → .../Keysight/keysightb1500/KeysightB1530A.py b/.../Keysight/keysightb1500/KeysightB1530A.py → .../Keysight/keysightb1500/KeysightB1530A.py
diff --git a/...rivers/Keysight/keysightb1500/__init__.py → ...rivers/Keysight/keysightb1500/__init__.py b/...rivers/Keysight/keysightb1500/__init__.py → ...rivers/Keysight/keysightb1500/__init__.py
diff --git a/...ivers/Keysight/keysightb1500/constants.py → ...ivers/Keysight/keysightb1500/constants.py b/...ivers/Keysight/keysightb1500/constants.py → ...ivers/Keysight/keysightb1500/constants.py
diff --git a/...Keysight/keysightb1500/message_builder.py → ...Keysight/keysightb1500/message_builder.py b/...Keysight/keysightb1500/message_builder.py → ...Keysight/keysightb1500/message_builder.py
diff --git a/...ght/private/Keysight_344xxA_submodules.py → ...ght/private/Keysight_344xxA_submodules.py b/...ght/private/Keysight_344xxA_submodules.py → ...ght/private/Keysight_344xxA_submodules.py
diff --git a/...ment_drivers/Keysight/private/__init__.py → ...ment_drivers/Keysight/private/__init__.py b/...ment_drivers/Keysight/private/__init__.py → ...ment_drivers/Keysight/private/__init__.py
diff --git a/...rivers/Keysight/private/error_handling.py → ...rivers/Keysight/private/error_handling.py b/...rivers/Keysight/private/error_handling.py → ...rivers/Keysight/private/error_handling.py
diff --git a/..._drivers/Lakeshore/Lakeshore_model_325.py → ..._drivers/Lakeshore/Lakeshore_model_325.py b/..._drivers/Lakeshore/Lakeshore_model_325.py → ..._drivers/Lakeshore/Lakeshore_model_325.py
diff --git a/..._drivers/Lakeshore/Lakeshore_model_336.py → ..._drivers/Lakeshore/Lakeshore_model_336.py b/..._drivers/Lakeshore/Lakeshore_model_336.py → ..._drivers/Lakeshore/Lakeshore_model_336.py
diff --git a/..._drivers/Lakeshore/Lakeshore_model_372.py → ..._drivers/Lakeshore/Lakeshore_model_372.py b/..._drivers/Lakeshore/Lakeshore_model_372.py → ..._drivers/Lakeshore/Lakeshore_model_372.py
diff --git a/...instrument_drivers/Lakeshore/Model_325.py → ...instrument_drivers/Lakeshore/Model_325.py b/...instrument_drivers/Lakeshore/Model_325.py → ...instrument_drivers/Lakeshore/Model_325.py
diff --git a/...instrument_drivers/Lakeshore/Model_336.py → ...instrument_drivers/Lakeshore/Model_336.py b/...instrument_drivers/Lakeshore/Model_336.py → ...instrument_drivers/Lakeshore/Model_336.py
diff --git a/...instrument_drivers/Lakeshore/Model_372.py → ...instrument_drivers/Lakeshore/Model_372.py b/...instrument_drivers/Lakeshore/Model_372.py → ...instrument_drivers/Lakeshore/Model_372.py
diff --git a/.../instrument_drivers/Lakeshore/__init__.py → .../instrument_drivers/Lakeshore/__init__.py b/.../instrument_drivers/Lakeshore/__init__.py → .../instrument_drivers/Lakeshore/__init__.py
diff --git a/...drivers/Lakeshore/_lakeshore_model_335.py → ...drivers/Lakeshore/_lakeshore_model_335.py b/...drivers/Lakeshore/_lakeshore_model_335.py → ...drivers/Lakeshore/_lakeshore_model_335.py
diff --git a/...ument_drivers/Lakeshore/lakeshore_base.py → ...ument_drivers/Lakeshore/lakeshore_base.py b/...ument_drivers/Lakeshore/lakeshore_base.py → ...ument_drivers/Lakeshore/lakeshore_base.py
diff --git a/...trument_drivers/Minicircuits/Base_SPDT.py → ...trument_drivers/Minicircuits/Base_SPDT.py b/...trument_drivers/Minicircuits/Base_SPDT.py → ...trument_drivers/Minicircuits/Base_SPDT.py
diff --git a/...nstrument_drivers/Minicircuits/RC_SP4T.py → ...nstrument_drivers/Minicircuits/RC_SP4T.py b/...nstrument_drivers/Minicircuits/RC_SP4T.py → ...nstrument_drivers/Minicircuits/RC_SP4T.py
diff --git a/...nstrument_drivers/Minicircuits/RC_SPDT.py → ...nstrument_drivers/Minicircuits/RC_SPDT.py b/...nstrument_drivers/Minicircuits/RC_SPDT.py → ...nstrument_drivers/Minicircuits/RC_SPDT.py
diff --git a/...ment_drivers/Minicircuits/RUDAT_13G_90.py → ...ment_drivers/Minicircuits/RUDAT_13G_90.py b/...ment_drivers/Minicircuits/RUDAT_13G_90.py → ...ment_drivers/Minicircuits/RUDAT_13G_90.py
diff --git a/...ument_drivers/Minicircuits/USBHIDMixin.py → ...ument_drivers/Minicircuits/USBHIDMixin.py b/...ument_drivers/Minicircuits/USBHIDMixin.py → ...ument_drivers/Minicircuits/USBHIDMixin.py
diff --git a/...strument_drivers/Minicircuits/USB_SPDT.py → ...strument_drivers/Minicircuits/USB_SPDT.py b/...strument_drivers/Minicircuits/USB_SPDT.py → ...strument_drivers/Minicircuits/USB_SPDT.py
diff --git a/...strument_drivers/Minicircuits/__init__.py → ...strument_drivers/Minicircuits/__init__.py b/...strument_drivers/Minicircuits/__init__.py → ...strument_drivers/Minicircuits/__init__.py
diff --git a/...ers/Minicircuits/_minicircuits_rc_sp4t.py → ...ers/Minicircuits/_minicircuits_rc_sp4t.py b/...ers/Minicircuits/_minicircuits_rc_sp4t.py → ...ers/Minicircuits/_minicircuits_rc_sp4t.py
diff --git a/...ers/Minicircuits/_minicircuits_rc_spdt.py → ...ers/Minicircuits/_minicircuits_rc_spdt.py b/...ers/Minicircuits/_minicircuits_rc_spdt.py → ...ers/Minicircuits/_minicircuits_rc_spdt.py
diff --git a/...inicircuits/_minicircuits_rudat_13g_90.py → ...inicircuits/_minicircuits_rudat_13g_90.py b/...inicircuits/_minicircuits_rudat_13g_90.py → ...inicircuits/_minicircuits_rudat_13g_90.py
diff --git a/...rs/Minicircuits/_minicircuits_usb_spdt.py → ...rs/Minicircuits/_minicircuits_usb_spdt.py b/...rs/Minicircuits/_minicircuits_usb_spdt.py → ...rs/Minicircuits/_minicircuits_usb_spdt.py
diff --git a/.../instrument_drivers/QDev/QDac_channels.py → .../instrument_drivers/QDev/QDac_channels.py b/.../instrument_drivers/QDev/QDac_channels.py → .../instrument_drivers/QDev/QDac_channels.py
diff --git a/qcodes/instrument_drivers/QDev/__init__.py → ...codes/instrument_drivers/QDev/__init__.py b/qcodes/instrument_drivers/QDev/__init__.py → ...codes/instrument_drivers/QDev/__init__.py
diff --git a/.../instrument_drivers/QDevil/QDevil_QDAC.py → .../instrument_drivers/QDevil/QDevil_QDAC.py b/.../instrument_drivers/QDevil/QDevil_QDAC.py → .../instrument_drivers/QDevil/QDevil_QDAC.py
diff --git a/qcodes/instrument_drivers/QDevil/__init__.py → ...des/instrument_drivers/QDevil/__init__.py b/qcodes/instrument_drivers/QDevil/__init__.py → ...des/instrument_drivers/QDevil/__init__.py
diff --git a/...rs/QuantumDesign/DynaCoolPPMS/DynaCool.py → ...rs/QuantumDesign/DynaCoolPPMS/DynaCool.py b/...rs/QuantumDesign/DynaCoolPPMS/DynaCool.py → ...rs/QuantumDesign/DynaCoolPPMS/DynaCool.py
diff --git a/...rs/QuantumDesign/DynaCoolPPMS/__init__.py → ...rs/QuantumDesign/DynaCoolPPMS/__init__.py b/...rs/QuantumDesign/DynaCoolPPMS/__init__.py → ...rs/QuantumDesign/DynaCoolPPMS/__init__.py
diff --git a/...umDesign/DynaCoolPPMS/private/__init__.py → ...umDesign/DynaCoolPPMS/private/__init__.py b/...umDesign/DynaCoolPPMS/private/__init__.py → ...umDesign/DynaCoolPPMS/private/__init__.py
diff --git a/...gn/DynaCoolPPMS/private/commandhandler.py → ...gn/DynaCoolPPMS/private/commandhandler.py b/...gn/DynaCoolPPMS/private/commandhandler.py → ...gn/DynaCoolPPMS/private/commandhandler.py
diff --git a/...ntumDesign/DynaCoolPPMS/private/server.py → ...ntumDesign/DynaCoolPPMS/private/server.py b/...ntumDesign/DynaCoolPPMS/private/server.py → ...ntumDesign/DynaCoolPPMS/private/server.py
diff --git a/...trument_drivers/QuantumDesign/__init__.py → ...trument_drivers/QuantumDesign/__init__.py b/...trument_drivers/QuantumDesign/__init__.py → ...trument_drivers/QuantumDesign/__init__.py
diff --git a/qcodes/instrument_drivers/__init__.py → src/qcodes/instrument_drivers/__init__.py b/qcodes/instrument_drivers/__init__.py → src/qcodes/instrument_drivers/__init__.py
diff --git a/...trument_drivers/agilent/Agilent_34400A.py → ...trument_drivers/agilent/Agilent_34400A.py b/...trument_drivers/agilent/Agilent_34400A.py → ...trument_drivers/agilent/Agilent_34400A.py
diff --git a/...trument_drivers/agilent/Agilent_34401A.py → ...trument_drivers/agilent/Agilent_34401A.py b/...trument_drivers/agilent/Agilent_34401A.py → ...trument_drivers/agilent/Agilent_34401A.py
diff --git a/...trument_drivers/agilent/Agilent_34410A.py → ...trument_drivers/agilent/Agilent_34410A.py b/...trument_drivers/agilent/Agilent_34410A.py → ...trument_drivers/agilent/Agilent_34410A.py
diff --git a/...trument_drivers/agilent/Agilent_34411A.py → ...trument_drivers/agilent/Agilent_34411A.py b/...trument_drivers/agilent/Agilent_34411A.py → ...trument_drivers/agilent/Agilent_34411A.py
diff --git a/...trument_drivers/agilent/Agilent_E8257D.py → ...trument_drivers/agilent/Agilent_E8257D.py b/...trument_drivers/agilent/Agilent_E8257D.py → ...trument_drivers/agilent/Agilent_E8257D.py
diff --git a/...trument_drivers/agilent/Agilent_E8267C.py → ...trument_drivers/agilent/Agilent_E8267C.py b/...trument_drivers/agilent/Agilent_E8267C.py → ...trument_drivers/agilent/Agilent_E8267C.py
diff --git a/qcodes/instrument_drivers/agilent/E8267C.py → ...odes/instrument_drivers/agilent/E8267C.py b/qcodes/instrument_drivers/agilent/E8267C.py → ...odes/instrument_drivers/agilent/E8267C.py
diff --git a/qcodes/instrument_drivers/agilent/E8527D.py → ...odes/instrument_drivers/agilent/E8527D.py b/qcodes/instrument_drivers/agilent/E8527D.py → ...odes/instrument_drivers/agilent/E8527D.py
diff --git a/...rument_drivers/agilent/_Agilent_344xxA.py → ...rument_drivers/agilent/_Agilent_344xxA.py b/...rument_drivers/agilent/_Agilent_344xxA.py → ...rument_drivers/agilent/_Agilent_344xxA.py
diff --git a/...es/instrument_drivers/agilent/__init__.py → ...es/instrument_drivers/agilent/__init__.py b/...es/instrument_drivers/agilent/__init__.py → ...es/instrument_drivers/agilent/__init__.py
diff --git a/...ment_drivers/american_magnetics/AMI430.py → ...ment_drivers/american_magnetics/AMI430.py b/...ment_drivers/american_magnetics/AMI430.py → ...ment_drivers/american_magnetics/AMI430.py
diff --git a/...drivers/american_magnetics/AMI430_visa.py → ...drivers/american_magnetics/AMI430_visa.py b/...drivers/american_magnetics/AMI430_visa.py → ...drivers/american_magnetics/AMI430_visa.py
diff --git a/...nt_drivers/american_magnetics/__init__.py → ...nt_drivers/american_magnetics/__init__.py b/...nt_drivers/american_magnetics/__init__.py → ...nt_drivers/american_magnetics/__init__.py
diff --git a/...es/instrument_drivers/basel/BaselSP983.py → ...es/instrument_drivers/basel/BaselSP983.py b/...es/instrument_drivers/basel/BaselSP983.py → ...es/instrument_drivers/basel/BaselSP983.py
diff --git a/...s/instrument_drivers/basel/BaselSP983a.py → ...s/instrument_drivers/basel/BaselSP983a.py b/...s/instrument_drivers/basel/BaselSP983a.py → ...s/instrument_drivers/basel/BaselSP983a.py
diff --git a/...s/instrument_drivers/basel/BaselSP983c.py → ...s/instrument_drivers/basel/BaselSP983c.py b/...s/instrument_drivers/basel/BaselSP983c.py → ...s/instrument_drivers/basel/BaselSP983c.py
diff --git a/qcodes/instrument_drivers/basel/__init__.py → ...odes/instrument_drivers/basel/__init__.py b/qcodes/instrument_drivers/basel/__init__.py → ...odes/instrument_drivers/basel/__init__.py
diff --git a/qcodes/instrument_drivers/basel/sp983c.py → ...qcodes/instrument_drivers/basel/sp983c.py b/qcodes/instrument_drivers/basel/sp983c.py → ...qcodes/instrument_drivers/basel/sp983c.py
diff --git a/...instrument_drivers/basel/sp983c_remote.py → ...instrument_drivers/basel/sp983c_remote.py b/...instrument_drivers/basel/sp983c_remote.py → ...instrument_drivers/basel/sp983c_remote.py
diff --git a/qcodes/instrument_drivers/devices.py → src/qcodes/instrument_drivers/devices.py b/qcodes/instrument_drivers/devices.py → src/qcodes/instrument_drivers/devices.py
diff --git a/.../instrument_drivers/ithaco/Ithaco_1211.py → .../instrument_drivers/ithaco/Ithaco_1211.py b/.../instrument_drivers/ithaco/Ithaco_1211.py → .../instrument_drivers/ithaco/Ithaco_1211.py
diff --git a/qcodes/instrument_drivers/ithaco/__init__.py → ...des/instrument_drivers/ithaco/__init__.py b/qcodes/instrument_drivers/ithaco/__init__.py → ...des/instrument_drivers/ithaco/__init__.py
diff --git a/...trument_drivers/oxford/MercuryiPS_VISA.py → ...trument_drivers/oxford/MercuryiPS_VISA.py b/...trument_drivers/oxford/MercuryiPS_VISA.py → ...trument_drivers/oxford/MercuryiPS_VISA.py
diff --git a/qcodes/instrument_drivers/oxford/__init__.py → ...des/instrument_drivers/oxford/__init__.py b/qcodes/instrument_drivers/oxford/__init__.py → ...des/instrument_drivers/oxford/__init__.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,4 @@ qcodes default configuration

		The following table contains the default configuration of qcodes.

		.. jsonschema:: ../../../qcodes/configuration/qcodesrc_schema.json
		.. jsonschema:: ../../../src/qcodes/configuration/qcodesrc_schema.json