diff --git a/tests/models/__init__.py b/tests/models/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_block.py b/tests/models/test_block.py similarity index 100% rename from tests/test_block.py rename to tests/models/test_block.py diff --git a/tests/test_enums.py b/tests/models/test_enums.py similarity index 100% rename from tests/test_enums.py rename to tests/models/test_enums.py diff --git a/tests/test_event.py b/tests/models/test_event.py similarity index 100% rename from tests/test_event.py rename to tests/models/test_event.py diff --git a/tests/query/__init__.py b/tests/query/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_query_builder.py b/tests/query/test_builder.py similarity index 100% rename from tests/test_query_builder.py rename to tests/query/test_builder.py diff --git a/tests/test_query_condition.py b/tests/query/test_condition.py similarity index 100% rename from tests/test_query_condition.py rename to tests/query/test_condition.py diff --git a/tests/test_query_config.py b/tests/query/test_config.py similarity index 100% rename from tests/test_query_config.py rename to tests/query/test_config.py diff --git a/tests/test_query_executor.py b/tests/query/test_executor.py similarity index 100% rename from tests/test_query_executor.py rename to tests/query/test_executor.py diff --git a/tests/test_query_mapper.py b/tests/query/test_mapper.py similarity index 100% rename from tests/test_query_mapper.py rename to tests/query/test_mapper.py diff --git a/tests/test_query_registry.py b/tests/query/test_registry.py similarity index 100% rename from tests/test_query_registry.py rename to tests/query/test_registry.py