diff --git a/QUICKSTART.md b/QUICKSTART.md
index dabc838..29fe23e 100644
--- a/QUICKSTART.md
+++ b/QUICKSTART.md
@@ -165,7 +165,7 @@ android_sdk.configure(
 use_repo(android_sdk, "androidsdk")
 register_toolchains("@androidsdk//:all")
 
-android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
+android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
 use_repo(android_ndk, "androidndk", "androidndk_cmake")
 register_toolchains("@androidndk//:all")
 
@@ -395,7 +395,7 @@ proxy and import, then add the plugin extension and generated segment:
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 use_repo(maven, "flutter_maven")
 
-plugins = use_extension("@rules_flutter//tools/flutter:plugins.bzl", "flutter_plugins_ext")
+plugins = use_extension("@rules_flutter//flutter:extensions.bzl", "flutter_plugins_ext")
 plugins.project(
     abis = ["arm64-v8a", "x86_64"],
     metadata = "//:.flutter-plugins-dependencies",
@@ -617,14 +617,14 @@ android_sdk.configure(
 use_repo(android_sdk, "androidsdk")
 register_toolchains("@androidsdk//:all")
 
-android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
+android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
 use_repo(android_ndk, "androidndk", "androidndk_cmake")
 register_toolchains("@androidndk//:all")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 use_repo(maven, "flutter_maven")
 
-plugins = use_extension("@rules_flutter//tools/flutter:plugins.bzl", "flutter_plugins_ext")
+plugins = use_extension("@rules_flutter//flutter:extensions.bzl", "flutter_plugins_ext")
 plugins.project(
     abis = ["arm64-v8a"],
     embedding = "//packages/host_app/android/app:flutter_embedding",
diff --git a/README.md b/README.md
index 25ac04b..fff6ecb 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ android_sdk.configure(
 use_repo(android_sdk, "androidsdk")
 register_toolchains("@androidsdk//:all")
 
-android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
+android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
 use_repo(android_ndk, "androidndk", "androidndk_cmake")
 register_toolchains("@androidndk//:all")
 
diff --git a/examples/demo_app/MODULE.bazel.lock b/examples/demo_app/MODULE.bazel.lock
index 5a6f4b0..e33df65 100644
--- a/examples/demo_app/MODULE.bazel.lock
+++ b/examples/demo_app/MODULE.bazel.lock
@@ -558,7 +558,7 @@
     "@@sameri11_rules_flutter+//flutter:extensions.bzl%android_ndk": {
       "general": {
         "bzlTransitiveDigest": "hdvS83CtH504cF/AHNScFkfQnnPeFFdgwAl9Vz64I2s=",
-        "usagesDigest": "EKTbZN96IdqkA4qQ7A5/CMRth7+5iMGDY1uCPeLj36w=",
+        "usagesDigest": "zX96yfJW4/h1cfrBMvBaUg9hTRGQp0ZuwjmqXN/HquQ=",
         "recordedInputs": [
           "REPO_MAPPING:bazel_features+,bazel_features_globals bazel_features++version_extension+bazel_features_globals",
           "REPO_MAPPING:bazel_features+,bazel_features_version bazel_features++version_extension+bazel_features_version",
@@ -594,29 +594,10 @@
         }
       }
     },
-    "@@sameri11_rules_flutter+//tools/flutter:ndk.bzl%android_ndk": {
+    "@@sameri11_rules_flutter+//flutter:extensions.bzl%flutter_plugins_ext": {
       "general": {
-        "bzlTransitiveDigest": "+yVx90itfoCuMV0GwiqbA145KmYQEsib0gKU5MAQuKM=",
-        "usagesDigest": "QrRRy1TWmQYnmdSUlW7uJgLdSfFApDsrkLaLj/wqh2g=",
-        "recordedInputs": [
-          "REPO_MAPPING:sameri11_rules_flutter+,rules_android_ndk rules_android_ndk+"
-        ],
-        "generatedRepoSpecs": {
-          "androidndk": {
-            "repoRuleId": "@@rules_android_ndk+//:rules.bzl%android_ndk_repository",
-            "attributes": {}
-          },
-          "androidndk_cmake": {
-            "repoRuleId": "@@sameri11_rules_flutter+//tools/flutter:ndk.bzl%_androidndk_cmake_repository",
-            "attributes": {}
-          }
-        }
-      }
-    },
-    "@@sameri11_rules_flutter+//tools/flutter:plugins.bzl%flutter_plugins_ext": {
-      "general": {
-        "bzlTransitiveDigest": "YkUtLkaUUzscr6grLYf7CKtO9Rmd3tq/ckkt5Z0jtEE=",
-        "usagesDigest": "F7WFYMW4xxcij40v7+FEbGw5UG1ZlPv/+chnuAng8vI=",
+        "bzlTransitiveDigest": "hdvS83CtH504cF/AHNScFkfQnnPeFFdgwAl9Vz64I2s=",
+        "usagesDigest": "frgjMNjXCjd7j75y9p+LFe3RH+RtcxxOnaCzq3dakik=",
         "recordedInputs": [
           "REPO_MAPPING:,flutter_maven rules_jvm_external++maven+flutter_maven",
           "REPO_MAPPING:bazel_features+,bazel_features_globals bazel_features++version_extension+bazel_features_globals",
@@ -638,8 +619,9 @@
           "REPO_MAPPING:rules_java++compatibility_proxy+compatibility_proxy,rules_java rules_java+",
           "REPO_MAPPING:sameri11_rules_flutter+,platforms platforms",
           "REPO_MAPPING:sameri11_rules_flutter+,rules_android rules_android+",
+          "REPO_MAPPING:sameri11_rules_flutter+,rules_android_ndk rules_android_ndk+",
           "REPO_MAPPING:sameri11_rules_flutter+,rules_java rules_java+",
-          "REPO_MAPPING:sameri11_rules_flutter+,androidndk_cmake sameri11_rules_flutter++android_ndk2+androidndk_cmake"
+          "REPO_MAPPING:sameri11_rules_flutter+,androidndk_cmake sameri11_rules_flutter++android_ndk+androidndk_cmake"
         ],
         "generatedRepoSpecs": {
           "flutter_plugins": {
@@ -665,7 +647,7 @@
               "embedding": "'@@//android/app:flutter_embedding'",
               "android_bzl": "'@@sameri11_rules_flutter+//flutter:defs.bzl'",
               "recipe_bzl": "'@@sameri11_rules_flutter+//flutter:defs.bzl'",
-              "ndk_source_properties": "'@@sameri11_rules_flutter++android_ndk2+androidndk_cmake//:ndk_source_properties'"
+              "ndk_source_properties": "'@@sameri11_rules_flutter++android_ndk+androidndk_cmake//:ndk_source_properties'"
             }
           }
         }
diff --git a/examples/demo_app/android/config.MODULE.bazel b/examples/demo_app/android/config.MODULE.bazel
index 57cec34..fb2e9e9 100644
--- a/examples/demo_app/android/config.MODULE.bazel
+++ b/examples/demo_app/android/config.MODULE.bazel
@@ -29,12 +29,12 @@ use_repo(android_sdk, "androidsdk")
 
 register_toolchains("@androidsdk//:all")
 
-android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
+android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
 use_repo(android_ndk, "androidndk", "androidndk_cmake")
 
 register_toolchains("@androidndk//:all")
 
-plugins = use_extension("@rules_flutter//tools/flutter:plugins.bzl", "flutter_plugins_ext")
+plugins = use_extension("@rules_flutter//flutter:extensions.bzl", "flutter_plugins_ext")
 plugins.project(
     abis = [
         "arm64-v8a",
diff --git a/examples/local_plugin/MODULE.bazel.lock b/examples/local_plugin/MODULE.bazel.lock
index ae195f5..c20a800 100644
--- a/examples/local_plugin/MODULE.bazel.lock
+++ b/examples/local_plugin/MODULE.bazel.lock
@@ -558,7 +558,7 @@
     "@@sameri11_rules_flutter+//flutter:extensions.bzl%android_ndk": {
       "general": {
         "bzlTransitiveDigest": "hdvS83CtH504cF/AHNScFkfQnnPeFFdgwAl9Vz64I2s=",
-        "usagesDigest": "EKTbZN96IdqkA4qQ7A5/CMRth7+5iMGDY1uCPeLj36w=",
+        "usagesDigest": "c6Q7xXhVgobmcU8bDM+vxe4f5nLrPx8SVE7jZZJGerQ=",
         "recordedInputs": [
           "REPO_MAPPING:bazel_features+,bazel_features_globals bazel_features++version_extension+bazel_features_globals",
           "REPO_MAPPING:bazel_features+,bazel_features_version bazel_features++version_extension+bazel_features_version",
@@ -594,29 +594,10 @@
         }
       }
     },
-    "@@sameri11_rules_flutter+//tools/flutter:ndk.bzl%android_ndk": {
+    "@@sameri11_rules_flutter+//flutter:extensions.bzl%flutter_plugins_ext": {
       "general": {
-        "bzlTransitiveDigest": "+yVx90itfoCuMV0GwiqbA145KmYQEsib0gKU5MAQuKM=",
-        "usagesDigest": "A7oaOkSjfvJwyjAnMsfa+v9OgvQ5pbbliBwdFibgSv4=",
-        "recordedInputs": [
-          "REPO_MAPPING:sameri11_rules_flutter+,rules_android_ndk rules_android_ndk+"
-        ],
-        "generatedRepoSpecs": {
-          "androidndk": {
-            "repoRuleId": "@@rules_android_ndk+//:rules.bzl%android_ndk_repository",
-            "attributes": {}
-          },
-          "androidndk_cmake": {
-            "repoRuleId": "@@sameri11_rules_flutter+//tools/flutter:ndk.bzl%_androidndk_cmake_repository",
-            "attributes": {}
-          }
-        }
-      }
-    },
-    "@@sameri11_rules_flutter+//tools/flutter:plugins.bzl%flutter_plugins_ext": {
-      "general": {
-        "bzlTransitiveDigest": "YkUtLkaUUzscr6grLYf7CKtO9Rmd3tq/ckkt5Z0jtEE=",
-        "usagesDigest": "VUBQEAvg1xhSGldyNPLYePHfrRP9QsreeqwpYGsvf4s=",
+        "bzlTransitiveDigest": "hdvS83CtH504cF/AHNScFkfQnnPeFFdgwAl9Vz64I2s=",
+        "usagesDigest": "ZniNXWl6OiVCASrWeGxNNsIQlgh4uDdHgYxug69NNWw=",
         "recordedInputs": [
           "REPO_MAPPING:,flutter_maven rules_jvm_external++maven+flutter_maven",
           "REPO_MAPPING:bazel_features+,bazel_features_globals bazel_features++version_extension+bazel_features_globals",
@@ -638,8 +619,9 @@
           "REPO_MAPPING:rules_java++compatibility_proxy+compatibility_proxy,rules_java rules_java+",
           "REPO_MAPPING:sameri11_rules_flutter+,platforms platforms",
           "REPO_MAPPING:sameri11_rules_flutter+,rules_android rules_android+",
+          "REPO_MAPPING:sameri11_rules_flutter+,rules_android_ndk rules_android_ndk+",
           "REPO_MAPPING:sameri11_rules_flutter+,rules_java rules_java+",
-          "REPO_MAPPING:sameri11_rules_flutter+,androidndk_cmake sameri11_rules_flutter++android_ndk2+androidndk_cmake"
+          "REPO_MAPPING:sameri11_rules_flutter+,androidndk_cmake sameri11_rules_flutter++android_ndk+androidndk_cmake"
         ],
         "generatedRepoSpecs": {
           "flutter_plugins": {
@@ -660,7 +642,7 @@
               "embedding": "'@@//packages/host_app/android/app:flutter_embedding'",
               "android_bzl": "'@@sameri11_rules_flutter+//flutter:defs.bzl'",
               "recipe_bzl": "'@@sameri11_rules_flutter+//flutter:defs.bzl'",
-              "ndk_source_properties": "'@@sameri11_rules_flutter++android_ndk2+androidndk_cmake//:ndk_source_properties'"
+              "ndk_source_properties": "'@@sameri11_rules_flutter++android_ndk+androidndk_cmake//:ndk_source_properties'"
             }
           }
         }
diff --git a/examples/local_plugin/packages/host_app/android/config.MODULE.bazel b/examples/local_plugin/packages/host_app/android/config.MODULE.bazel
index 0d98ab3..97e412b 100644
--- a/examples/local_plugin/packages/host_app/android/config.MODULE.bazel
+++ b/examples/local_plugin/packages/host_app/android/config.MODULE.bazel
@@ -20,12 +20,12 @@ use_repo(android_sdk, "androidsdk")
 
 register_toolchains("@androidsdk//:all")
 
-android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
+android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
 use_repo(android_ndk, "androidndk", "androidndk_cmake")
 
 register_toolchains("@androidndk//:all")
 
-plugins = use_extension("@rules_flutter//tools/flutter:plugins.bzl", "flutter_plugins_ext")
+plugins = use_extension("@rules_flutter//flutter:extensions.bzl", "flutter_plugins_ext")
 plugins.project(
     abis = ["arm64-v8a"],
     embedding = "//packages/host_app/android/app:flutter_embedding",
diff --git a/examples/no_plugins/MODULE.bazel.lock b/examples/no_plugins/MODULE.bazel.lock
index ace1e6f..488960d 100644
--- a/examples/no_plugins/MODULE.bazel.lock
+++ b/examples/no_plugins/MODULE.bazel.lock
@@ -558,7 +558,7 @@
     "@@sameri11_rules_flutter+//flutter:extensions.bzl%android_ndk": {
       "general": {
         "bzlTransitiveDigest": "hdvS83CtH504cF/AHNScFkfQnnPeFFdgwAl9Vz64I2s=",
-        "usagesDigest": "EKTbZN96IdqkA4qQ7A5/CMRth7+5iMGDY1uCPeLj36w=",
+        "usagesDigest": "kiRgwS+Co+SVG39rQ6d/0TSTi0aPlNWC8w8fxg1J0UE=",
         "recordedInputs": [
           "REPO_MAPPING:bazel_features+,bazel_features_globals bazel_features++version_extension+bazel_features_globals",
           "REPO_MAPPING:bazel_features+,bazel_features_version bazel_features++version_extension+bazel_features_version",
@@ -594,25 +594,6 @@
         }
       }
     },
-    "@@sameri11_rules_flutter+//tools/flutter:ndk.bzl%android_ndk": {
-      "general": {
-        "bzlTransitiveDigest": "+yVx90itfoCuMV0GwiqbA145KmYQEsib0gKU5MAQuKM=",
-        "usagesDigest": "RmWgbl3ZrcRS38YkTUmgaXvm4e7smxgPZPFePrLvlLU=",
-        "recordedInputs": [
-          "REPO_MAPPING:sameri11_rules_flutter+,rules_android_ndk rules_android_ndk+"
-        ],
-        "generatedRepoSpecs": {
-          "androidndk": {
-            "repoRuleId": "@@rules_android_ndk+//:rules.bzl%android_ndk_repository",
-            "attributes": {}
-          },
-          "androidndk_cmake": {
-            "repoRuleId": "@@sameri11_rules_flutter+//tools/flutter:ndk.bzl%_androidndk_cmake_repository",
-            "attributes": {}
-          }
-        }
-      }
-    },
     "@@sameri11_rules_flutter+//tools/flutter:repo.bzl%flutter": {
       "general": {
         "bzlTransitiveDigest": "d0akA1llff6BLmlVnXIvFQO70c00GoPx6Qps3UswgoY=",
diff --git a/examples/no_plugins/android/config.MODULE.bazel b/examples/no_plugins/android/config.MODULE.bazel
index 4476bcb..60ee64e 100644
--- a/examples/no_plugins/android/config.MODULE.bazel
+++ b/examples/no_plugins/android/config.MODULE.bazel
@@ -14,7 +14,7 @@ use_repo(android_sdk, "androidsdk")
 
 register_toolchains("@androidsdk//:all")
 
-android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
+android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
 use_repo(android_ndk, "androidndk", "androidndk_cmake")
 
 register_toolchains("@androidndk//:all")
diff --git a/examples/pub_plugins/MODULE.bazel.lock b/examples/pub_plugins/MODULE.bazel.lock
index d78bd68..4561f96 100644
--- a/examples/pub_plugins/MODULE.bazel.lock
+++ b/examples/pub_plugins/MODULE.bazel.lock
@@ -558,7 +558,7 @@
     "@@sameri11_rules_flutter+//flutter:extensions.bzl%android_ndk": {
       "general": {
         "bzlTransitiveDigest": "hdvS83CtH504cF/AHNScFkfQnnPeFFdgwAl9Vz64I2s=",
-        "usagesDigest": "EKTbZN96IdqkA4qQ7A5/CMRth7+5iMGDY1uCPeLj36w=",
+        "usagesDigest": "BVQSiaq0xrv//PzqHk1mfLYCXhD/oOSxnp1+ldQM4N8=",
         "recordedInputs": [
           "REPO_MAPPING:bazel_features+,bazel_features_globals bazel_features++version_extension+bazel_features_globals",
           "REPO_MAPPING:bazel_features+,bazel_features_version bazel_features++version_extension+bazel_features_version",
@@ -594,29 +594,10 @@
         }
       }
     },
-    "@@sameri11_rules_flutter+//tools/flutter:ndk.bzl%android_ndk": {
+    "@@sameri11_rules_flutter+//flutter:extensions.bzl%flutter_plugins_ext": {
       "general": {
-        "bzlTransitiveDigest": "+yVx90itfoCuMV0GwiqbA145KmYQEsib0gKU5MAQuKM=",
-        "usagesDigest": "DbV1H8oR3Qzpg/rrhdvrY4gJ0TwkhR++v18wnMYCt14=",
-        "recordedInputs": [
-          "REPO_MAPPING:sameri11_rules_flutter+,rules_android_ndk rules_android_ndk+"
-        ],
-        "generatedRepoSpecs": {
-          "androidndk": {
-            "repoRuleId": "@@rules_android_ndk+//:rules.bzl%android_ndk_repository",
-            "attributes": {}
-          },
-          "androidndk_cmake": {
-            "repoRuleId": "@@sameri11_rules_flutter+//tools/flutter:ndk.bzl%_androidndk_cmake_repository",
-            "attributes": {}
-          }
-        }
-      }
-    },
-    "@@sameri11_rules_flutter+//tools/flutter:plugins.bzl%flutter_plugins_ext": {
-      "general": {
-        "bzlTransitiveDigest": "YkUtLkaUUzscr6grLYf7CKtO9Rmd3tq/ckkt5Z0jtEE=",
-        "usagesDigest": "7EaQlVY1ElLzwQfzHxuszltJYgtUcQ7K4xYdgBgA7uU=",
+        "bzlTransitiveDigest": "hdvS83CtH504cF/AHNScFkfQnnPeFFdgwAl9Vz64I2s=",
+        "usagesDigest": "YHpUoRs5EUMqVpMzUL4GczEbTmnqwnkljjI69j4wkZo=",
         "recordedInputs": [
           "REPO_MAPPING:,flutter_maven rules_jvm_external++maven+flutter_maven",
           "REPO_MAPPING:bazel_features+,bazel_features_globals bazel_features++version_extension+bazel_features_globals",
@@ -638,8 +619,9 @@
           "REPO_MAPPING:rules_java++compatibility_proxy+compatibility_proxy,rules_java rules_java+",
           "REPO_MAPPING:sameri11_rules_flutter+,platforms platforms",
           "REPO_MAPPING:sameri11_rules_flutter+,rules_android rules_android+",
+          "REPO_MAPPING:sameri11_rules_flutter+,rules_android_ndk rules_android_ndk+",
           "REPO_MAPPING:sameri11_rules_flutter+,rules_java rules_java+",
-          "REPO_MAPPING:sameri11_rules_flutter+,androidndk_cmake sameri11_rules_flutter++android_ndk2+androidndk_cmake"
+          "REPO_MAPPING:sameri11_rules_flutter+,androidndk_cmake sameri11_rules_flutter++android_ndk+androidndk_cmake"
         ],
         "generatedRepoSpecs": {
           "flutter_plugins": {
@@ -660,7 +642,7 @@
               "embedding": "'@@//android/app:flutter_embedding'",
               "android_bzl": "'@@sameri11_rules_flutter+//flutter:defs.bzl'",
               "recipe_bzl": "'@@sameri11_rules_flutter+//flutter:defs.bzl'",
-              "ndk_source_properties": "'@@sameri11_rules_flutter++android_ndk2+androidndk_cmake//:ndk_source_properties'"
+              "ndk_source_properties": "'@@sameri11_rules_flutter++android_ndk+androidndk_cmake//:ndk_source_properties'"
             }
           }
         }
diff --git a/examples/pub_plugins/android/config.MODULE.bazel b/examples/pub_plugins/android/config.MODULE.bazel
index a77f024..d097026 100644
--- a/examples/pub_plugins/android/config.MODULE.bazel
+++ b/examples/pub_plugins/android/config.MODULE.bazel
@@ -20,12 +20,12 @@ use_repo(android_sdk, "androidsdk")
 
 register_toolchains("@androidsdk//:all")
 
-android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
+android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
 use_repo(android_ndk, "androidndk", "androidndk_cmake")
 
 register_toolchains("@androidndk//:all")
 
-plugins = use_extension("@rules_flutter//tools/flutter:plugins.bzl", "flutter_plugins_ext")
+plugins = use_extension("@rules_flutter//flutter:extensions.bzl", "flutter_plugins_ext")
 plugins.project(
     abis = ["arm64-v8a"],
     embedding = "//android/app:flutter_embedding",
diff --git a/tools/ci/android_toolchain_probe.py b/tools/ci/android_toolchain_probe.py
index d2c3023..a4b5ce1 100755
--- a/tools/ci/android_toolchain_probe.py
+++ b/tools/ci/android_toolchain_probe.py
@@ -403,7 +403,7 @@ def run_missing_ndk(workspace, output_base):
 use_repo(android_sdk, "androidsdk")
 register_toolchains("@androidsdk//:all")
 
-android_ndk = use_extension("@rules_flutter//tools/flutter:ndk.bzl", "android_ndk")
+android_ndk = use_extension("@rules_flutter//flutter:extensions.bzl", "android_ndk")
 use_repo(android_ndk, "androidndk", "androidndk_cmake")
 register_toolchains("@androidndk//:all")
 """
diff --git a/tools/ci/committed_lock_guard.py b/tools/ci/committed_lock_guard.py
index 7a544fc..2096db1 100755
--- a/tools/ci/committed_lock_guard.py
+++ b/tools/ci/committed_lock_guard.py
@@ -67,7 +67,7 @@ def _selftest():
     clean = json.dumps(
         {
             "moduleExtensions": {
-                "//tools/flutter:ndk.bzl%android_ndk": {
+                "//flutter:extensions.bzl%android_ndk": {
                     "general": {
                         "recordedInputs": [
                             "REPO_MAPPING:sameri11_rules_flutter+,rules_android_ndk rules_android_ndk+",