diff --git a/README.md b/README.md
index c7267f1..cd1460f 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ pip install -e .
 To run the tests, use the following command:
 
 ```bash
-python -m unittest discover tests
+python -m unittest discover -s tests/ndi/unittest -t .
 ```
 
 ### Building Documentation
diff --git a/tests/test_fun/__init__.py b/tests/__init__.py
similarity index 100%
rename from tests/test_fun/__init__.py
rename to tests/__init__.py
diff --git a/tests/ndi/unittest/__init__.py b/tests/ndi/unittest/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/ndi/unittest/cloud/__init__.py b/tests/ndi/unittest/cloud/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/ndi/unittest/cloud/api/__init__.py b/tests/ndi/unittest/cloud/api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/ndi/unittest/cloud/api/documents/__init__.py b/tests/ndi/unittest/cloud/api/documents/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_cloud_api.py b/tests/ndi/unittest/cloud/api/test_api.py
similarity index 100%
rename from tests/test_cloud_api.py
rename to tests/ndi/unittest/cloud/api/test_api.py
diff --git a/tests/test_cloud_documents.py b/tests/ndi/unittest/cloud/api/test_documents.py
similarity index 100%
rename from tests/test_cloud_documents.py
rename to tests/ndi/unittest/cloud/api/test_documents.py
diff --git a/tests/ndi/unittest/cloud/sync/__init__.py b/tests/ndi/unittest/cloud/sync/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_cloud_sync_download_new.py b/tests/ndi/unittest/cloud/sync/test_download_new.py
similarity index 100%
rename from tests/test_cloud_sync_download_new.py
rename to tests/ndi/unittest/cloud/sync/test_download_new.py
diff --git a/tests/test_cloud_create_dataset.py b/tests/ndi/unittest/cloud/test_create_dataset.py
similarity index 100%
rename from tests/test_cloud_create_dataset.py
rename to tests/ndi/unittest/cloud/test_create_dataset.py
diff --git a/tests/ndi/unittest/daq/__init__.py b/tests/ndi/unittest/daq/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/ndi/unittest/daq/system/__init__.py b/tests/ndi/unittest/daq/system/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_daq_system.py b/tests/ndi/unittest/daq/system/test_mfdaq.py
similarity index 100%
rename from tests/test_daq_system.py
rename to tests/ndi/unittest/daq/system/test_mfdaq.py
diff --git a/tests/test_daqsystemstring.py b/tests/ndi/unittest/daq/test_daqsystemstring.py
similarity index 100%
rename from tests/test_daqsystemstring.py
rename to tests/ndi/unittest/daq/test_daqsystemstring.py
diff --git a/tests/ndi/unittest/database/__init__.py b/tests/ndi/unittest/database/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_database.py b/tests/ndi/unittest/database/test_database.py
similarity index 100%
rename from tests/test_database.py
rename to tests/ndi/unittest/database/test_database.py
diff --git a/tests/ndi/unittest/dataset/__init__.py b/tests/ndi/unittest/dataset/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_dataset.py b/tests/ndi/unittest/dataset/test_dataset.py
similarity index 100%
rename from tests/test_dataset.py
rename to tests/ndi/unittest/dataset/test_dataset.py
diff --git a/tests/ndi/unittest/element/__init__.py b/tests/ndi/unittest/element/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_element.py b/tests/ndi/unittest/element/test_element.py
similarity index 100%
rename from tests/test_element.py
rename to tests/ndi/unittest/element/test_element.py
diff --git a/tests/ndi/unittest/epoch/__init__.py b/tests/ndi/unittest/epoch/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_epochset.py b/tests/ndi/unittest/epoch/test_epochset.py
similarity index 100%
rename from tests/test_epochset.py
rename to tests/ndi/unittest/epoch/test_epochset.py
diff --git a/tests/ndi/unittest/file/__init__.py b/tests/ndi/unittest/file/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_file_navigator.py b/tests/ndi/unittest/file/test_navigator.py
similarity index 100%
rename from tests/test_file_navigator.py
rename to tests/ndi/unittest/file/test_navigator.py
diff --git a/tests/ndi/unittest/fun/__init__.py b/tests/ndi/unittest/fun/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_fun/test_doc.py b/tests/ndi/unittest/fun/test_doc.py
similarity index 100%
rename from tests/test_fun/test_doc.py
rename to tests/ndi/unittest/fun/test_doc.py
diff --git a/tests/test_fun/test_epoch.py b/tests/ndi/unittest/fun/test_epoch.py
similarity index 100%
rename from tests/test_fun/test_epoch.py
rename to tests/ndi/unittest/fun/test_epoch.py
diff --git a/tests/test_fun/test_fun_basics.py b/tests/ndi/unittest/fun/test_fun_basics.py
similarity index 100%
rename from tests/test_fun/test_fun_basics.py
rename to tests/ndi/unittest/fun/test_fun_basics.py
diff --git a/tests/test_fun/test_stimulus.py b/tests/ndi/unittest/fun/test_stimulus.py
similarity index 100%
rename from tests/test_fun/test_stimulus.py
rename to tests/ndi/unittest/fun/test_stimulus.py
diff --git a/tests/test_fun/test_table.py b/tests/ndi/unittest/fun/test_table.py
similarity index 100%
rename from tests/test_fun/test_table.py
rename to tests/ndi/unittest/fun/test_table.py
diff --git a/tests/ndi/unittest/probe/__init__.py b/tests/ndi/unittest/probe/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/ndi/unittest/probe/fun/__init__.py b/tests/ndi/unittest/probe/fun/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_probe_fun.py b/tests/ndi/unittest/probe/fun/test_fun.py
similarity index 100%
rename from tests/test_probe_fun.py
rename to tests/ndi/unittest/probe/fun/test_fun.py
diff --git a/tests/test_probe.py b/tests/ndi/unittest/probe/test_probe.py
similarity index 100%
rename from tests/test_probe.py
rename to tests/ndi/unittest/probe/test_probe.py
diff --git a/tests/ndi/unittest/session/__init__.py b/tests/ndi/unittest/session/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_session.py b/tests/ndi/unittest/session/test_session.py
similarity index 100%
rename from tests/test_session.py
rename to tests/ndi/unittest/session/test_session.py
diff --git a/tests/test_cache.py b/tests/ndi/unittest/test_cache.py
similarity index 100%
rename from tests/test_cache.py
rename to tests/ndi/unittest/test_cache.py
diff --git a/tests/test_document.py b/tests/ndi/unittest/test_document.py
similarity index 100%
rename from tests/test_document.py
rename to tests/ndi/unittest/test_document.py
diff --git a/tests/test_documentservice.py b/tests/ndi/unittest/test_documentservice.py
similarity index 100%
rename from tests/test_documentservice.py
rename to tests/ndi/unittest/test_documentservice.py
diff --git a/tests/test_ido.py b/tests/ndi/unittest/test_ido.py
similarity index 100%
rename from tests/test_ido.py
rename to tests/ndi/unittest/test_ido.py
diff --git a/tests/test_query.py b/tests/ndi/unittest/test_query.py
similarity index 100%
rename from tests/test_query.py
rename to tests/ndi/unittest/test_query.py
diff --git a/tests/test_subject.py b/tests/ndi/unittest/test_subject.py
similarity index 100%
rename from tests/test_subject.py
rename to tests/ndi/unittest/test_subject.py
diff --git a/tests/ndi/unittest/time/__init__.py b/tests/ndi/unittest/time/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_time.py b/tests/ndi/unittest/time/test_time.py
similarity index 100%
rename from tests/test_time.py
rename to tests/ndi/unittest/time/test_time.py
diff --git a/tests/test_timemapping.py b/tests/ndi/unittest/time/test_timemapping.py
similarity index 100%
rename from tests/test_timemapping.py
rename to tests/ndi/unittest/time/test_timemapping.py