diff --git a/.agent/skills/genui-helper/SKILL.md b/.agent/skills/genui-helper/SKILL.md
index d74154b53..e1e10efd9 100644
--- a/.agent/skills/genui-helper/SKILL.md
+++ b/.agent/skills/genui-helper/SKILL.md
@@ -51,9 +51,9 @@ When creating a new UI component in `genui`:
 ## References
 
 - A2UI Specification
-  - Available in the submodule at @packages/genui/submodules/a2ui
-  - The specification documentation is available in @packages/genui/submodules/a2ui/specification/v0.9/docs
-  - The specification schemas are available in @packages/genui/submodules/a2ui/specification/v0.9/json
+  - Available in the submodule at @submodules/a2ui
+  - The specification documentation is available in @submodules/a2ui/specification/v0.9/docs
+  - The specification schemas are available in @submodules/a2ui/specification/v0.9/json
   - Because it is a submodule, you may need to update the submodule to get the latest specification.
 - To find out details of a specific dart compiler diagnostic message, use the following url format to look up the details:
   - https://dart.dev/tools/diagnostics/<message_id>
diff --git a/.gitmodules b/.gitmodules
index 8d7b0c972..60a71f889 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
-[submodule "packages/json_schema_builder/submodules/JSON-Schema-Test-Suite"]
-	path = packages/json_schema_builder/submodules/JSON-Schema-Test-Suite
+[submodule "JSON-Schema-Test-Suite"]
+	path = submodules/JSON-Schema-Test-Suite
 	url = https://github.com/json-schema-org/JSON-Schema-Test-Suite.git
 [submodule "a2ui"]
-	path = packages/genui/submodules/a2ui
+	path = submodules/a2ui
 	url = https://github.com/google/A2UI.git
 	branch = main
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 60b7cd58f..c5c631aed 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -6,7 +6,7 @@ include: package:lints/recommended.yaml
 
 analyzer:
   exclude:
-    - 'packages/genui/submodules/**'
+    - 'submodules/**'
   language:
     strict-casts: true
     strict-inference: true
diff --git a/packages/json_schema_builder/test/test_suite_test.dart b/packages/json_schema_builder/test/test_suite_test.dart
index e3668ec2f..a534737fa 100644
--- a/packages/json_schema_builder/test/test_suite_test.dart
+++ b/packages/json_schema_builder/test/test_suite_test.dart
@@ -12,9 +12,11 @@ import 'package:test/test.dart';
 
 void main() {
   final testSuiteDir = Directory(
-    'submodules/JSON-Schema-Test-Suite/tests/draft2020-12',
+    '../../submodules/JSON-Schema-Test-Suite/tests/draft2020-12',
+  );
+  final remoteDir = Directory(
+    '../../submodules/JSON-Schema-Test-Suite/remotes',
   );
-  final remoteDir = Directory('submodules/JSON-Schema-Test-Suite/remotes');
 
   // Optional tests are not required to pass for full compliance.
   final optionalTestSuiteDir = Directory('${testSuiteDir.path}/optional');
diff --git a/packages/json_schema_builder/submodules/JSON-Schema-Test-Suite b/submodules/JSON-Schema-Test-Suite
similarity index 100%
rename from packages/json_schema_builder/submodules/JSON-Schema-Test-Suite
rename to submodules/JSON-Schema-Test-Suite
diff --git a/packages/genui/submodules/a2ui b/submodules/a2ui
similarity index 100%
rename from packages/genui/submodules/a2ui
rename to submodules/a2ui