diff --git a/layouts/partials/search.html b/layouts/partials/search.html
index 1813289f6f..e1158e9ba7 100644
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@@ -16,7 +16,7 @@
         {{- $quotedcontentlangs := slice }}
         {{- $missingcontentlangs := slice }}
         {{- range $contentlangs }}
-          {{- $f := printf "/static/js/lunr.%s.min.js" . }}
+          {{- $f := printf "/static/js/lunr/lunr.%s.min.js" . }}
           {{- if partialCached "fileExists.hugo" $f $f }}
             {{- $quotedcontentlangs = $quotedcontentlangs | append (printf "'%s'" .) }}
           {{- else }}
@@ -28,11 +28,11 @@
           var contentLangs=[{{ delimit $quotedcontentlangs ", " | safeJS }}];
         </script>
         <script src="{{"js/auto-complete.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" defer></script>
-        <script src="{{"js/lunr.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" defer></script>
-        <script src="{{"js/lunr.stemmer.support.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" defer></script>
-        <script src="{{"js/lunr.multi.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" defer></script>
+        <script src="{{"js/lunr/lunr.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" defer></script>
+        <script src="{{"js/lunr/lunr.stemmer.support.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" defer></script>
+        <script src="{{"js/lunr/lunr.multi.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" defer></script>
         {{- range $contentlangs }}
-          {{- $file := (printf "js/lunr.%s.min.js" .) }}
+          {{- $file := (printf "js/lunr/lunr.%s.min.js" .) }}
         <script src="{{ $file | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" defer></script>
         {{- end }}
         <script src="{{ "js/search.js" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" defer></script>
\ No newline at end of file
diff --git a/static/js/lunr.ar.min.js b/static/js/lunr/lunr.ar.min.js
similarity index 100%
rename from static/js/lunr.ar.min.js
rename to static/js/lunr/lunr.ar.min.js
diff --git a/static/js/lunr.da.min.js b/static/js/lunr/lunr.da.min.js
similarity index 100%
rename from static/js/lunr.da.min.js
rename to static/js/lunr/lunr.da.min.js
diff --git a/static/js/lunr.de.min.js b/static/js/lunr/lunr.de.min.js
similarity index 100%
rename from static/js/lunr.de.min.js
rename to static/js/lunr/lunr.de.min.js
diff --git a/static/js/lunr.du.min.js b/static/js/lunr/lunr.du.min.js
similarity index 100%
rename from static/js/lunr.du.min.js
rename to static/js/lunr/lunr.du.min.js
diff --git a/static/js/lunr.en.min.js b/static/js/lunr/lunr.en.min.js
similarity index 100%
rename from static/js/lunr.en.min.js
rename to static/js/lunr/lunr.en.min.js
diff --git a/static/js/lunr.es.min.js b/static/js/lunr/lunr.es.min.js
similarity index 100%
rename from static/js/lunr.es.min.js
rename to static/js/lunr/lunr.es.min.js
diff --git a/static/js/lunr.fi.min.js b/static/js/lunr/lunr.fi.min.js
similarity index 100%
rename from static/js/lunr.fi.min.js
rename to static/js/lunr/lunr.fi.min.js
diff --git a/static/js/lunr.fr.min.js b/static/js/lunr/lunr.fr.min.js
similarity index 100%
rename from static/js/lunr.fr.min.js
rename to static/js/lunr/lunr.fr.min.js
diff --git a/static/js/lunr.hi.min.js b/static/js/lunr/lunr.hi.min.js
similarity index 100%
rename from static/js/lunr.hi.min.js
rename to static/js/lunr/lunr.hi.min.js
diff --git a/static/js/lunr.hu.min.js b/static/js/lunr/lunr.hu.min.js
similarity index 100%
rename from static/js/lunr.hu.min.js
rename to static/js/lunr/lunr.hu.min.js
diff --git a/static/js/lunr.it.min.js b/static/js/lunr/lunr.it.min.js
similarity index 100%
rename from static/js/lunr.it.min.js
rename to static/js/lunr/lunr.it.min.js
diff --git a/static/js/lunr.ja.min.js b/static/js/lunr/lunr.ja.min.js
similarity index 100%
rename from static/js/lunr.ja.min.js
rename to static/js/lunr/lunr.ja.min.js
diff --git a/static/js/lunr.jp.min.js b/static/js/lunr/lunr.jp.min.js
similarity index 100%
rename from static/js/lunr.jp.min.js
rename to static/js/lunr/lunr.jp.min.js
diff --git a/static/js/lunr.ko.min.js b/static/js/lunr/lunr.ko.min.js
similarity index 100%
rename from static/js/lunr.ko.min.js
rename to static/js/lunr/lunr.ko.min.js
diff --git a/static/js/lunr.min.js b/static/js/lunr/lunr.min.js
similarity index 100%
rename from static/js/lunr.min.js
rename to static/js/lunr/lunr.min.js
diff --git a/static/js/lunr.multi.min.js b/static/js/lunr/lunr.multi.min.js
similarity index 100%
rename from static/js/lunr.multi.min.js
rename to static/js/lunr/lunr.multi.min.js
diff --git a/static/js/lunr.nl.min.js b/static/js/lunr/lunr.nl.min.js
similarity index 100%
rename from static/js/lunr.nl.min.js
rename to static/js/lunr/lunr.nl.min.js
diff --git a/static/js/lunr.no.min.js b/static/js/lunr/lunr.no.min.js
similarity index 100%
rename from static/js/lunr.no.min.js
rename to static/js/lunr/lunr.no.min.js
diff --git a/static/js/lunr.pt.min.js b/static/js/lunr/lunr.pt.min.js
similarity index 100%
rename from static/js/lunr.pt.min.js
rename to static/js/lunr/lunr.pt.min.js
diff --git a/static/js/lunr.ro.min.js b/static/js/lunr/lunr.ro.min.js
similarity index 100%
rename from static/js/lunr.ro.min.js
rename to static/js/lunr/lunr.ro.min.js
diff --git a/static/js/lunr.ru.min.js b/static/js/lunr/lunr.ru.min.js
similarity index 100%
rename from static/js/lunr.ru.min.js
rename to static/js/lunr/lunr.ru.min.js
diff --git a/static/js/lunr.stemmer.support.min.js b/static/js/lunr/lunr.stemmer.support.min.js
similarity index 100%
rename from static/js/lunr.stemmer.support.min.js
rename to static/js/lunr/lunr.stemmer.support.min.js
diff --git a/static/js/lunr.sv.min.js b/static/js/lunr/lunr.sv.min.js
similarity index 100%
rename from static/js/lunr.sv.min.js
rename to static/js/lunr/lunr.sv.min.js
diff --git a/static/js/lunr.ta.min.js b/static/js/lunr/lunr.ta.min.js
similarity index 100%
rename from static/js/lunr.ta.min.js
rename to static/js/lunr/lunr.ta.min.js
diff --git a/static/js/lunr.th.min.js b/static/js/lunr/lunr.th.min.js
similarity index 100%
rename from static/js/lunr.th.min.js
rename to static/js/lunr/lunr.th.min.js
diff --git a/static/js/lunr.tr.min.js b/static/js/lunr/lunr.tr.min.js
similarity index 100%
rename from static/js/lunr.tr.min.js
rename to static/js/lunr/lunr.tr.min.js
diff --git a/static/js/lunr.vi.min.js b/static/js/lunr/lunr.vi.min.js
similarity index 100%
rename from static/js/lunr.vi.min.js
rename to static/js/lunr/lunr.vi.min.js
diff --git a/static/js/lunr.zh.min.js b/static/js/lunr/lunr.zh.min.js
similarity index 100%
rename from static/js/lunr.zh.min.js
rename to static/js/lunr/lunr.zh.min.js