diff --git a/composer.json b/composer.json
index 986a5e0..f8ebe0b 100755
--- a/composer.json
+++ b/composer.json
@@ -5,9 +5,9 @@
   "license": [
     "MIT"
   ],
-  "version": "1.2.2",
+  "version": "1.3.0",
   "require": {
-    "algolia/algoliasearch-magento-2": "^3.9.1",
+    "algolia/algoliasearch-magento-2": "^3.14.0",
     "magento/magento-composer-installer": "*"
   },
   "extra": {
diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
index 27a56cf..804a18c 100644
--- a/view/frontend/requirejs-config.js
+++ b/view/frontend/requirejs-config.js
@@ -16,17 +16,17 @@ const config = {
     map: {
         "*": {
             // Include your own hooks to handle front end events - see https://www.algolia.com/doc/integration/magento-2/customize/custom-front-end-events/
-            algoliaHooks: 'Algolia_CustomAlgolia/hooks',
+            algoliaHooks: 'Algolia_CustomAlgolia/js/hooks',
 
             // Additional lib for recent searches plugin - OPTIONAL
-            algoliaRecentSearches: 'Algolia_CustomAlgolia/autocomplete-plugin-recent-searches'
+            algoliaRecentSearches: 'Algolia_CustomAlgolia/js/internals/autocomplete-plugin-recent-searches'
 
             ////////////////////////////////////
             // AUTOCOMPLETE TEMPLATE OVERRIDE //
             ////////////////////////////////////
 
             // Uncomment the following line to override the products.js functional template
-            // productsHtml: 'Algolia_CustomAlgolia/internals/template/autocomplete/products'
+            // productsHtml: 'Algolia_CustomAlgolia/js/internals/template/autocomplete/products'
         },
     },
 
@@ -42,20 +42,20 @@ const config = {
     config: {
         mixins: {
             // Uncomment the following mixins to override the hit template via a JavaScript mixin for a given source
-            // "Algolia_AlgoliaSearch/internals/template/autocomplete/products": {
-            //   "Algolia_CustomAlgolia/template/autocomplete/products-mixin": true,
+            "Algolia_AlgoliaSearch/js/template/autocomplete/products": {
+              "Algolia_CustomAlgolia/js/template/autocomplete/products-mixin": true,
+            }
+            // "Algolia_AlgoliaSearch/js/template/autocomplete/categories": {
+            //   "Algolia_CustomAlgolia/js/template/autocomplete/categories-mixin": true,
             // },
-            // "Algolia_AlgoliaSearch/internals/template/autocomplete/categories": {
-            //   "Algolia_CustomAlgolia/template/autocomplete/categories-mixin": true,
+            // "Algolia_AlgoliaSearch/js/template/autocomplete/pages": {
+            //   "Algolia_CustomAlgolia/js/template/autocomplete/pages-mixin": true,
             // },
-            // "Algolia_AlgoliaSearch/internals/template/autocomplete/pages": {
-            //   "Algolia_CustomAlgolia/template/autocomplete/pages-mixin": true,
+            // "Algolia_AlgoliaSearch/js/template/autocomplete/additional-section": {
+            //   "Algolia_CustomAlgolia/js/template/autocomplete/additional-section-mixin": true,
             // },
-            // "Algolia_AlgoliaSearch/internals/template/autocomplete/additional-section": {
-            //   "Algolia_CustomAlgolia/template/autocomplete/additional-section-mixin": true,
-            // },
-            // "Algolia_AlgoliaSearch/internals/template/autocomplete/suggestions": {
-            //   "Algolia_CustomAlgolia/template/autocomplete/suggestions-mixin": true,
+            // "Algolia_AlgoliaSearch/js/template/autocomplete/suggestions": {
+            //   "Algolia_CustomAlgolia/js/template/autocomplete/suggestions-mixin": true,
             // },
         },
     },
diff --git a/view/frontend/web/customalgolia.css b/view/frontend/web/css/customalgolia.css
similarity index 100%
rename from view/frontend/web/customalgolia.css
rename to view/frontend/web/css/customalgolia.css
diff --git a/view/frontend/web/hooks.js b/view/frontend/web/js/hooks.js
similarity index 100%
rename from view/frontend/web/hooks.js
rename to view/frontend/web/js/hooks.js
diff --git a/view/frontend/web/autocomplete-plugin-recent-searches.js b/view/frontend/web/js/internals/autocomplete-plugin-recent-searches.js
similarity index 100%
rename from view/frontend/web/autocomplete-plugin-recent-searches.js
rename to view/frontend/web/js/internals/autocomplete-plugin-recent-searches.js
diff --git a/view/frontend/web/template/autocomplete/additional-section-mixin.js b/view/frontend/web/js/template/autocomplete/additional-section-mixin.js
similarity index 100%
rename from view/frontend/web/template/autocomplete/additional-section-mixin.js
rename to view/frontend/web/js/template/autocomplete/additional-section-mixin.js
diff --git a/view/frontend/web/template/autocomplete/categories-mixin.js b/view/frontend/web/js/template/autocomplete/categories-mixin.js
similarity index 100%
rename from view/frontend/web/template/autocomplete/categories-mixin.js
rename to view/frontend/web/js/template/autocomplete/categories-mixin.js
diff --git a/view/frontend/web/template/autocomplete/pages-mixin.js b/view/frontend/web/js/template/autocomplete/pages-mixin.js
similarity index 100%
rename from view/frontend/web/template/autocomplete/pages-mixin.js
rename to view/frontend/web/js/template/autocomplete/pages-mixin.js
diff --git a/view/frontend/web/template/autocomplete/products-mixin.js b/view/frontend/web/js/template/autocomplete/products-mixin.js
similarity index 100%
rename from view/frontend/web/template/autocomplete/products-mixin.js
rename to view/frontend/web/js/template/autocomplete/products-mixin.js
diff --git a/view/frontend/web/template/autocomplete/suggestions-mixin.js b/view/frontend/web/js/template/autocomplete/suggestions-mixin.js
similarity index 100%
rename from view/frontend/web/template/autocomplete/suggestions-mixin.js
rename to view/frontend/web/js/template/autocomplete/suggestions-mixin.js