diff --git a/layout/_layout.swig b/layout/_layout.swig
index fe396b0220..8001d05240 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -103,23 +103,18 @@
   {% include '_scripts/scroll-cookie.swig' %}
   {% include '_scripts/exturl.swig' %}
   {% include '_scripts/three.swig' %}
+  {% include '_third-party/math/index.swig' %}
+  {% include '_third-party/pangu.swig' %}
   {% include '_third-party/quicklink.swig' %}
+  {% include '_third-party/bookmark.swig' %}
+  {% include '_third-party/schedule.swig' %}
   {% include '_third-party/comments/index.swig' %}
   {% include '_third-party/search/index.swig' %}
-  {% include '_third-party/analytics/lean-analytics.swig' %}
-  {% include '_third-party/analytics/firestore.swig' %}
-  {% include '_third-party/math/index.swig' %}
-  {% include '_third-party/pdf.swig' %}
-  {% include '_third-party/mermaid.swig' %}
-  {% include '_third-party/caniuse.swig' %}
+  {% include '_third-party/chat/index.swig' %}
+  {% include '_third-party/tags/index.swig' %}
   {% include '_third-party/baidu-push.swig' %}
-  {% include '_third-party/schedule.swig' %}
   {% include '_third-party/needsharebutton.swig' %}
   {% include '_third-party/rating.swig' %}
-  {% include '_third-party/pangu.swig' %}
-  {% include '_third-party/bookmark.swig' %}
-  {% include '_third-party/chatra.swig' %}
-  {% include '_third-party/tidio.swig' %}
 
   {% for inject_item in theme.injects.bodyEnd %}
     {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
diff --git a/layout/_third-party/analytics/index.swig b/layout/_third-party/analytics/index.swig
index 15eae6789b..91e0e0cb7d 100644
--- a/layout/_third-party/analytics/index.swig
+++ b/layout/_third-party/analytics/index.swig
@@ -4,3 +4,5 @@
 {% include 'baidu-analytics.swig' %}
 {% include 'application-insights.swig' %}
 {% include 'growingio.swig' %}
+{% include 'lean-analytics.swig' %}
+{% include 'firestore.swig' %}
diff --git a/layout/_third-party/chatra.swig b/layout/_third-party/chat/chatra.swig
similarity index 100%
rename from layout/_third-party/chatra.swig
rename to layout/_third-party/chat/chatra.swig
diff --git a/layout/_third-party/chat/index.swig b/layout/_third-party/chat/index.swig
new file mode 100644
index 0000000000..821753dd06
--- /dev/null
+++ b/layout/_third-party/chat/index.swig
@@ -0,0 +1,2 @@
+{% include 'chatra.swig' %}
+{% include 'tidio.swig' %}
diff --git a/layout/_third-party/tidio.swig b/layout/_third-party/chat/tidio.swig
similarity index 100%
rename from layout/_third-party/tidio.swig
rename to layout/_third-party/chat/tidio.swig
diff --git a/layout/_third-party/caniuse.swig b/layout/_third-party/tags/caniuse.swig
similarity index 100%
rename from layout/_third-party/caniuse.swig
rename to layout/_third-party/tags/caniuse.swig
diff --git a/layout/_third-party/tags/index.swig b/layout/_third-party/tags/index.swig
new file mode 100644
index 0000000000..22e22b9340
--- /dev/null
+++ b/layout/_third-party/tags/index.swig
@@ -0,0 +1,3 @@
+{% include 'pdf.swig' %}
+{% include 'mermaid.swig' %}
+{% include 'caniuse.swig' %}
diff --git a/layout/_third-party/mermaid.swig b/layout/_third-party/tags/mermaid.swig
similarity index 100%
rename from layout/_third-party/mermaid.swig
rename to layout/_third-party/tags/mermaid.swig
diff --git a/layout/_third-party/pdf.swig b/layout/_third-party/tags/pdf.swig
similarity index 100%
rename from layout/_third-party/pdf.swig
rename to layout/_third-party/tags/pdf.swig