diff --git a/static/resources_list.txt b/static/resources_list.txt
index e339a31a4..b9ecb268e 100644
--- a/static/resources_list.txt
+++ b/static/resources_list.txt
@@ -9,7 +9,7 @@ skin/search-icon.svg
 skin/iso6391To3.js
 skin/isotope.pkgd.min.js
 skin/index.js
-skin/autoComplete.min.js
+skin/autoComplete/autoComplete.min.js
 skin/kiwix.css
 skin/taskbar.css
 skin/index.css
@@ -43,7 +43,7 @@ templates/no_js_download.html
 opensearchdescription.xml
 ft_opensearchdescription.xml
 catalog_v2_searchdescription.xml
-skin/css/autoComplete.css
+skin/autoComplete/css/autoComplete.css
 skin/favicon/android-chrome-192x192.png
 skin/favicon/android-chrome-512x512.png
 skin/favicon/apple-touch-icon.png
diff --git a/static/skin/autoComplete.min.js b/static/skin/autoComplete/autoComplete.min.js
similarity index 100%
rename from static/skin/autoComplete.min.js
rename to static/skin/autoComplete/autoComplete.min.js
diff --git a/static/skin/css/autoComplete.css b/static/skin/autoComplete/css/autoComplete.css
similarity index 100%
rename from static/skin/css/autoComplete.css
rename to static/skin/autoComplete/css/autoComplete.css
diff --git a/static/viewer.html b/static/viewer.html
index 49899723a..99a16c22d 100644
--- a/static/viewer.html
+++ b/static/viewer.html
@@ -10,12 +10,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link type="text/css" href="./skin/kiwix.css?KIWIXCACHEID" rel="Stylesheet" />
     <link type="text/css" href="./skin/taskbar.css?KIWIXCACHEID" rel="Stylesheet" />
-    <link type="text/css" href="./skin/css/autoComplete.css?KIWIXCACHEID" rel="Stylesheet" />
+    <link type="text/css" href="./skin/autoComplete/css/autoComplete.css?KIWIXCACHEID" rel="Stylesheet" />
     <script type="text/javascript" src="./viewer_settings.js"></script>
     <script type="module" src="./skin/i18n.js?KIWIXCACHEID" defer></script>
     <script type="text/javascript" src="./skin/languages.js?KIWIXCACHEID" defer></script>
     <script type="text/javascript" src="./skin/viewer.js?KIWIXCACHEID" defer></script>
-    <script type="text/javascript" src="./skin/autoComplete.min.js?KIWIXCACHEID"></script>
+    <script type="text/javascript" src="./skin/autoComplete/autoComplete.min.js?KIWIXCACHEID"></script>
     <script>
       function getRootLocation() {
         const p = location.pathname;
diff --git a/test/server.cpp b/test/server.cpp
index 93d6bf71e..c9ef75e8c 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -54,10 +54,10 @@ const ResourceCollection resources200Compressible{
   { DYNAMIC_CONTENT, "/ROOT%23%3F/viewer" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/viewer?cacheid=whatever" },
 
-  { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/autoComplete.min.js" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/autoComplete.min.js?cacheid=1191aaaf" },
-  { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/css/autoComplete.css" },
-  { STATIC_CONTENT,  "/ROOT%23%3F/skin/css/autoComplete.css?cacheid=08951e06" },
+  { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/autoComplete/autoComplete.min.js" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/autoComplete/autoComplete.min.js?cacheid=1191aaaf" },
+  { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/autoComplete/css/autoComplete.css" },
+  { STATIC_CONTENT,  "/ROOT%23%3F/skin/autoComplete/css/autoComplete.css?cacheid=08951e06" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/i18n.js" },
   { STATIC_CONTENT,  "/ROOT%23%3F/skin/i18n.js?cacheid=6a8c6fb2" },
   { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" },
@@ -317,11 +317,11 @@ R"EXPECTEDRESULT(                                <img src="${root}/skin/download
       /* url */ "/ROOT%23%3F/viewer",
 R"EXPECTEDRESULT(    <link type="text/css" href="./skin/kiwix.css?cacheid=9b1b089f" rel="Stylesheet" />
     <link type="text/css" href="./skin/taskbar.css?cacheid=a1200d6b" rel="Stylesheet" />
-    <link type="text/css" href="./skin/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
+    <link type="text/css" href="./skin/autoComplete/css/autoComplete.css?cacheid=08951e06" rel="Stylesheet" />
     <script type="module" src="./skin/i18n.js?cacheid=6a8c6fb2" defer></script>
     <script type="text/javascript" src="./skin/languages.js?cacheid=96f2cf73" defer></script>
     <script type="text/javascript" src="./skin/viewer.js?cacheid=201653b8" defer></script>
-    <script type="text/javascript" src="./skin/autoComplete.min.js?cacheid=1191aaaf"></script>
+    <script type="text/javascript" src="./skin/autoComplete/autoComplete.min.js?cacheid=1191aaaf"></script>
       const blankPageUrl = root + "/skin/blank.html?cacheid=6b1fa032";
                  src="./skin/langSelector.svg?cacheid=00b59961">
           <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?cacheid=22b942b4" alt=""></label>
@@ -379,7 +379,7 @@ const char* urls404[] = {
   "/ROOT%23%3",
   "/ROOT%23%3Fxyz",
   "/ROOT%23%3F/skin/non-existent-skin-resource",
-  "/ROOT%23%3F/skin/autoComplete.min.js?cacheid=wrongcacheid",
+  "/ROOT%23%3F/skin/autoComplete/autoComplete.min.js?cacheid=wrongcacheid",
   "/ROOT%23%3F/catalog",
   "/ROOT%23%3F/catalog/",
   "/ROOT%23%3F/catalog/non-existent-item",