diff --git a/benchmarking/benchmarks/dataset.py b/benchmarking/benchmarks/dataset.py
index 6e596811282..0dee26ed37c 100644
--- a/benchmarking/benchmarks/dataset.py
+++ b/benchmarking/benchmarks/dataset.py
@@ -13,7 +13,7 @@
 from qcodes import ManualParameter
 from qcodes.dataset.measurements import Measurement
 from qcodes.dataset.experiment_container import new_experiment
-from qcodes.dataset.database import initialise_database
+from qcodes.dataset.sqlite.database import initialise_database
 
 
 class Adding5Params:
diff --git a/qcodes/__init__.py b/qcodes/__init__.py
index 46f6ddfc03f..1a255bc1cd8 100644
--- a/qcodes/__init__.py
+++ b/qcodes/__init__.py
@@ -81,7 +81,7 @@
     load_last_experiment, experiments, load_or_create_experiment
 from qcodes.dataset.sqlite.settings import SQLiteSettings
 from qcodes.dataset.param_spec import ParamSpec
-from qcodes.dataset.database import initialise_database, \
+from qcodes.dataset.sqlite.database import initialise_database, \
     initialise_or_create_database_at
 
 try:
diff --git a/qcodes/dataset/data_set.py b/qcodes/dataset/data_set.py
index e44d204598f..84eafa206ac 100644
--- a/qcodes/dataset/data_set.py
+++ b/qcodes/dataset/data_set.py
@@ -50,7 +50,7 @@
                                          InterDependencies_,
                                          old_to_new, new_to_old,
                                          DependencyError)
-from qcodes.dataset.database import get_DB_location
+from qcodes.dataset.sqlite.database import get_DB_location
 from qcodes.dataset.guids import generate_guid
 from qcodes.utils.deprecate import deprecate
 import qcodes.config
diff --git a/qcodes/dataset/experiment_container.py b/qcodes/dataset/experiment_container.py
index a65762de776..d1d8a896783 100644
--- a/qcodes/dataset/experiment_container.py
+++ b/qcodes/dataset/experiment_container.py
@@ -16,7 +16,7 @@
                                         get_sample_name_from_experiment_id,
                                         ConnectionPlus)
 from qcodes.dataset.sqlite_base import new_experiment as ne
-from qcodes.dataset.database import get_DB_location, get_DB_debug
+from qcodes.dataset.sqlite.database import get_DB_location, get_DB_debug
 
 
 log = logging.getLogger(__name__)
diff --git a/qcodes/tests/dataset/temporary_databases.py b/qcodes/tests/dataset/temporary_databases.py
index d4807580925..24474fc99fc 100644
--- a/qcodes/tests/dataset/temporary_databases.py
+++ b/qcodes/tests/dataset/temporary_databases.py
@@ -6,7 +6,7 @@
 import pytest
 
 import qcodes as qc
-from qcodes.dataset.database import initialise_database
+from qcodes.dataset.sqlite.database import initialise_database
 from qcodes import new_experiment, new_data_set
 from qcodes.dataset.sqlite_base import connect
 
diff --git a/qcodes/tests/dataset/test_database_creation_and_upgrading.py b/qcodes/tests/dataset/test_database_creation_and_upgrading.py
index f4851cc5722..2e5e8500a75 100644
--- a/qcodes/tests/dataset/test_database_creation_and_upgrading.py
+++ b/qcodes/tests/dataset/test_database_creation_and_upgrading.py
@@ -12,8 +12,8 @@
 from qcodes.dataset.param_spec import ParamSpecBase
 from qcodes.dataset.descriptions import RunDescriber
 from qcodes.dataset.dependencies import InterDependencies, InterDependencies_
-from qcodes.dataset.database import (initialise_database,
-                                     initialise_or_create_database_at)
+from qcodes.dataset.sqlite.database import (initialise_database,
+                                            initialise_or_create_database_at)
 # pylint: disable=unused-import
 from qcodes.tests.common import error_caused_by
 from qcodes.tests.dataset.temporary_databases import (empty_temp_db,
diff --git a/qcodes/tests/dataset/test_database_extract_runs.py b/qcodes/tests/dataset/test_database_extract_runs.py
index b242203af1e..25662f1ba7a 100644
--- a/qcodes/tests/dataset/test_database_extract_runs.py
+++ b/qcodes/tests/dataset/test_database_extract_runs.py
@@ -13,7 +13,7 @@
 from qcodes.dataset.experiment_container import Experiment
 from qcodes.dataset.data_set import (DataSet, load_by_guid, load_by_counter,
                                      load_by_id)
-from qcodes.dataset.database import path_to_dbfile
+from qcodes.dataset.sqlite.database import path_to_dbfile
 from qcodes.dataset.database_extract_runs import extract_runs_into_db
 from qcodes.tests.dataset.temporary_databases import two_empty_temp_db_connections
 from qcodes.tests.dataset.test_descriptions import some_paramspecs
diff --git a/qcodes/tests/dataset/test_dataset_basic.py b/qcodes/tests/dataset/test_dataset_basic.py
index 4542e0db2f0..f99ad7f1ac2 100644
--- a/qcodes/tests/dataset/test_dataset_basic.py
+++ b/qcodes/tests/dataset/test_dataset_basic.py
@@ -18,7 +18,7 @@
 from qcodes.dataset.param_spec import ParamSpecBase
 from qcodes.tests.common import error_caused_by
 from qcodes.dataset.sqlite_base import _unicode_categories, get_non_dependencies
-from qcodes.dataset.database import get_DB_location
+from qcodes.dataset.sqlite.database import get_DB_location
 from qcodes.dataset.data_set import CompletedError, DataSet
 from qcodes.dataset.guids import parse_guid
 # pylint: disable=unused-import
diff --git a/qcodes/tests/dataset/test_experiment_container.py b/qcodes/tests/dataset/test_experiment_container.py
index 486bfdb746c..47a22dd42d4 100644
--- a/qcodes/tests/dataset/test_experiment_container.py
+++ b/qcodes/tests/dataset/test_experiment_container.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from qcodes.dataset.database import get_DB_location
+from qcodes.dataset.sqlite.database import get_DB_location
 from qcodes.dataset.experiment_container import (load_experiment_by_name,
                                                  new_experiment,
                                                  load_or_create_experiment,
diff --git a/qcodes/tests/dataset/test_sqlite_base.py b/qcodes/tests/dataset/test_sqlite_base.py
index 41f5c58c0f7..2970ea35219 100644
--- a/qcodes/tests/dataset/test_sqlite_base.py
+++ b/qcodes/tests/dataset/test_sqlite_base.py
@@ -17,7 +17,7 @@
 from qcodes.dataset.descriptions import RunDescriber
 from qcodes.dataset.dependencies import InterDependencies
 import qcodes.dataset.sqlite_base as mut  # mut: module under test
-from qcodes.dataset.database import get_DB_location, path_to_dbfile
+from qcodes.dataset.sqlite.database import get_DB_location, path_to_dbfile
 from qcodes.dataset.guids import generate_guid
 from qcodes.dataset.data_set import DataSet
 from qcodes.dataset.param_spec import ParamSpec