diff --git a/tests/app/__init__.py b/tests/app/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_app_cheat_entry.py b/tests/app/test_app_cheat_entry.py
similarity index 100%
rename from tests/test_app_cheat_entry.py
rename to tests/app/test_app_cheat_entry.py
diff --git a/tests/test_app_pointer_parsing.py b/tests/app/test_app_pointer_parsing.py
similarity index 100%
rename from tests/test_app_pointer_parsing.py
rename to tests/app/test_app_pointer_parsing.py
diff --git a/tests/test_app_scan_request.py b/tests/app/test_app_scan_request.py
similarity index 100%
rename from tests/test_app_scan_request.py
rename to tests/app/test_app_scan_request.py
diff --git a/tests/test_app_smoke.py b/tests/app/test_app_smoke.py
similarity index 100%
rename from tests/test_app_smoke.py
rename to tests/app/test_app_smoke.py
diff --git a/tests/test_app_value_types.py b/tests/app/test_app_value_types.py
similarity index 100%
rename from tests/test_app_value_types.py
rename to tests/app/test_app_value_types.py
diff --git a/tests/test_cheat_poll_worker.py b/tests/app/test_cheat_poll_worker.py
similarity index 100%
rename from tests/test_cheat_poll_worker.py
rename to tests/app/test_cheat_poll_worker.py
diff --git a/tests/test_refine_scan_worker.py b/tests/app/test_refine_scan_worker.py
similarity index 100%
rename from tests/test_refine_scan_worker.py
rename to tests/app/test_refine_scan_worker.py
diff --git a/tests/core/__init__.py b/tests/core/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_errors.py b/tests/core/test_errors.py
similarity index 100%
rename from tests/test_errors.py
rename to tests/core/test_errors.py
diff --git a/tests/test_logger.py b/tests/core/test_logger.py
similarity index 100%
rename from tests/test_logger.py
rename to tests/core/test_logger.py
diff --git a/tests/memory/__init__.py b/tests/memory/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_allocate_free.py b/tests/memory/test_allocate_free.py
similarity index 100%
rename from tests/test_allocate_free.py
rename to tests/memory/test_allocate_free.py
diff --git a/tests/test_bufflength_inference.py b/tests/memory/test_bufflength_inference.py
similarity index 100%
rename from tests/test_bufflength_inference.py
rename to tests/memory/test_bufflength_inference.py
diff --git a/tests/test_editor.py b/tests/memory/test_editor.py
similarity index 100%
rename from tests/test_editor.py
rename to tests/memory/test_editor.py
diff --git a/tests/test_partial_io.py b/tests/memory/test_partial_io.py
similarity index 100%
rename from tests/test_partial_io.py
rename to tests/memory/test_partial_io.py
diff --git a/tests/test_str_boundary.py b/tests/memory/test_str_boundary.py
similarity index 100%
rename from tests/test_str_boundary.py
rename to tests/memory/test_str_boundary.py
diff --git a/tests/test_str_decode_consistency.py b/tests/memory/test_str_decode_consistency.py
similarity index 100%
rename from tests/test_str_decode_consistency.py
rename to tests/memory/test_str_decode_consistency.py
diff --git a/tests/test_typed_accessors.py b/tests/memory/test_typed_accessors.py
similarity index 100%
rename from tests/test_typed_accessors.py
rename to tests/memory/test_typed_accessors.py
diff --git a/tests/test_write_safety.py b/tests/memory/test_write_safety.py
similarity index 100%
rename from tests/test_write_safety.py
rename to tests/memory/test_write_safety.py
diff --git a/tests/test_write_str_bytes_width.py b/tests/memory/test_write_str_bytes_width.py
similarity index 100%
rename from tests/test_write_str_bytes_width.py
rename to tests/memory/test_write_str_bytes_width.py
diff --git a/tests/platforms/__init__.py b/tests/platforms/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_bitness.py b/tests/platforms/test_bitness.py
similarity index 100%
rename from tests/test_bitness.py
rename to tests/platforms/test_bitness.py
diff --git a/tests/test_bitness_fallback_warns.py b/tests/platforms/test_bitness_fallback_warns.py
similarity index 100%
rename from tests/test_bitness_fallback_warns.py
rename to tests/platforms/test_bitness_fallback_warns.py
diff --git a/tests/test_linux_types.py b/tests/platforms/test_linux_types.py
similarity index 100%
rename from tests/test_linux_types.py
rename to tests/platforms/test_linux_types.py
diff --git a/tests/test_macos_protect.py b/tests/platforms/test_macos_protect.py
similarity index 100%
rename from tests/test_macos_protect.py
rename to tests/platforms/test_macos_protect.py
diff --git a/tests/test_win32_permissions.py b/tests/platforms/test_win32_permissions.py
similarity index 100%
rename from tests/test_win32_permissions.py
rename to tests/platforms/test_win32_permissions.py
diff --git a/tests/pointer/__init__.py b/tests/pointer/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_pointer_chain.py b/tests/pointer/test_pointer_chain.py
similarity index 100%
rename from tests/test_pointer_chain.py
rename to tests/pointer/test_pointer_chain.py
diff --git a/tests/test_pointer_scan.py b/tests/pointer/test_pointer_scan.py
similarity index 100%
rename from tests/test_pointer_scan.py
rename to tests/pointer/test_pointer_scan.py
diff --git a/tests/test_remote_pointer.py b/tests/pointer/test_remote_pointer.py
similarity index 100%
rename from tests/test_remote_pointer.py
rename to tests/pointer/test_remote_pointer.py
diff --git a/tests/process/__init__.py b/tests/process/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_module_enumeration.py b/tests/process/test_module_enumeration.py
similarity index 100%
rename from tests/test_module_enumeration.py
rename to tests/process/test_module_enumeration.py
diff --git a/tests/test_partial_name_match.py b/tests/process/test_partial_name_match.py
similarity index 100%
rename from tests/test_partial_name_match.py
rename to tests/process/test_partial_name_match.py
diff --git a/tests/test_process_enumeration.py b/tests/process/test_process_enumeration.py
similarity index 100%
rename from tests/test_process_enumeration.py
rename to tests/process/test_process_enumeration.py
diff --git a/tests/test_process_lookup.py b/tests/process/test_process_lookup.py
similarity index 100%
rename from tests/test_process_lookup.py
rename to tests/process/test_process_lookup.py
diff --git a/tests/test_thread_enumeration.py b/tests/process/test_thread_enumeration.py
similarity index 100%
rename from tests/test_thread_enumeration.py
rename to tests/process/test_thread_enumeration.py
diff --git a/tests/scan/__init__.py b/tests/scan/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_chunking_integration.py b/tests/scan/test_chunking_integration.py
similarity index 100%
rename from tests/test_chunking_integration.py
rename to tests/scan/test_chunking_integration.py
diff --git a/tests/test_pattern_compile.py b/tests/scan/test_pattern_compile.py
similarity index 100%
rename from tests/test_pattern_compile.py
rename to tests/scan/test_pattern_compile.py
diff --git a/tests/test_pattern_scan.py b/tests/scan/test_pattern_scan.py
similarity index 100%
rename from tests/test_pattern_scan.py
rename to tests/scan/test_pattern_scan.py
diff --git a/tests/test_region_snapshot.py b/tests/scan/test_region_snapshot.py
similarity index 100%
rename from tests/test_region_snapshot.py
rename to tests/scan/test_region_snapshot.py
diff --git a/tests/test_scan.py b/tests/scan/test_scan.py
similarity index 100%
rename from tests/test_scan.py
rename to tests/scan/test_scan.py
diff --git a/tests/test_scan_numpy.py b/tests/scan/test_scan_numpy.py
similarity index 100%
rename from tests/test_scan_numpy.py
rename to tests/scan/test_scan_numpy.py
diff --git a/tests/test_scan_properties.py b/tests/scan/test_scan_properties.py
similarity index 100%
rename from tests/test_scan_properties.py
rename to tests/scan/test_scan_properties.py
diff --git a/tests/test_scanning_helper.py b/tests/scan/test_scanning_helper.py
similarity index 100%
rename from tests/test_scanning_helper.py
rename to tests/scan/test_scanning_helper.py