diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/core/__init__.py b/tests/core/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_config.py b/tests/core/test_config.py
similarity index 100%
rename from tests/test_config.py
rename to tests/core/test_config.py
diff --git a/tests/test_module.py b/tests/core/test_module.py
similarity index 100%
rename from tests/test_module.py
rename to tests/core/test_module.py
diff --git a/tests/test_output.py b/tests/core/test_output.py
similarity index 100%
rename from tests/test_output.py
rename to tests/core/test_output.py
diff --git a/tests/util/__init__.py b/tests/util/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_store.py b/tests/util/test_store.py
similarity index 100%
rename from tests/test_store.py
rename to tests/util/test_store.py