diff --git a/.gitmodules b/.gitmodules
index b3e42f81..2dcff02e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -33,7 +33,7 @@
 [submodule "third_party/mbedtls"]
 	path = third_party/mbedtls
 	url = https://github.com/ARMmbed/mbedtls
-[submodule "third_party/json"]
-	path = third_party/json
+[submodule "third_party/json/json"]
+	path = third_party/json/json
 	url = https://github.com/nlohmann/json
 	branch = master
diff --git a/Package.swift b/Package.swift
index 2e3de9c5..e2281732 100644
--- a/Package.swift
+++ b/Package.swift
@@ -246,23 +246,23 @@ let package = Package(
       name: "json",
       path: "third_party/json",
       exclude:[
-        "LICENSES",
-        "cmake",
-        "docs",
-        "single_include",
-        "tests",
-        "tools",
-        "CITATION.cff",
-        "CMakeLists.txt",
-        "ChangeLog.md",
-        "LICENSE.MIT",
-        "Makefile",
-        "README.md",
-        "meson.build",
-        "nlohmann_json.natvis",
-        "wsjcpp.yml",
+        "json/LICENSES",
+        "json/cmake",
+        "json/docs",
+        "json/single_include",
+        "json/tests",
+        "json/tools",
+        "json/CITATION.cff",
+        "json/CMakeLists.txt",
+        "json/ChangeLog.md",
+        "json/LICENSE.MIT",
+        "json/Makefile",
+        "json/README.md",
+        "json/meson.build",
+        "json/nlohmann_json.natvis",
+        "json/wsjcpp.yml",
       ],
-      publicHeadersPath: "include"
+      publicHeadersPath: "json/include"
     ),
     .target(
       name: "protobuf",
diff --git a/third_party/json b/third_party/json
deleted file mode 160000
index bc889afb..00000000
--- a/third_party/json
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d
diff --git a/third_party/json/json b/third_party/json/json
new file mode 160000
index 00000000..6af826d0
--- /dev/null
+++ b/third_party/json/json
@@ -0,0 +1 @@
+Subproject commit 6af826d0bdb55e4b69e3ad817576745335f243ca