diff --git a/tests/TEST_INDEX.md b/tests/TEST_INDEX.md
index b1f8723..92cbea6 100644
--- a/tests/TEST_INDEX.md
+++ b/tests/TEST_INDEX.md
@@ -1,11 +1,12 @@
 # Test Index
 
 - `conftest.py`
+- `integration/test_agent_execution.py`
+- `integration/test_gemini_integration.py`
 - `organize_tests.py`
-- `test_agent_execution.py`
-- `test_base_agent.py`
-- `test_enhanced_structured_outputs.py`
-- `test_gemini_integration.py`
-- `test_generated_files_fix.py`
-- `test_src_error_fix.py`
-- `test_utils.py`
\ No newline at end of file
+- `setup_test_environment.py`
+- `system/test_complete_workflow.py`
+- `test_utils.py`
+- `unit/test_base_agent.py`
+- `unit/test_diagram_generation.py`
+- `unit/test_src_error_fix.py`
\ No newline at end of file
diff --git a/TEST_ORGANIZATION_SUMMARY.md b/tests/TEST_ORGANIZATION_SUMMARY.md
similarity index 100%
rename from TEST_ORGANIZATION_SUMMARY.md
rename to tests/TEST_ORGANIZATION_SUMMARY.md
diff --git a/scripts/setup_test_environment.py b/tests/setup_test_environment.py
similarity index 100%
rename from scripts/setup_test_environment.py
rename to tests/setup_test_environment.py
diff --git a/tests/unit/test_enhanced_structured_outputs.py b/tests/unit/test_enhanced_structured_outputs.py
deleted file mode 100644
index 0519ecb..0000000
--- a/tests/unit/test_enhanced_structured_outputs.py
+++ /dev/null
@@ -1 +0,0 @@
- 
\ No newline at end of file
diff --git a/tests/unit/test_generated_files_fix.py b/tests/unit/test_generated_files_fix.py
deleted file mode 100644
index 0519ecb..0000000
--- a/tests/unit/test_generated_files_fix.py
+++ /dev/null
@@ -1 +0,0 @@
- 
\ No newline at end of file