diff --git a/web_advanced_search/static/src/js/CustomFilterItem.esm.js b/web_advanced_search/static/src/js/legacy/CustomFilterItem.esm.js
similarity index 92%
rename from web_advanced_search/static/src/js/CustomFilterItem.esm.js
rename to web_advanced_search/static/src/js/legacy/CustomFilterItem.esm.js
index 7ed4d085c..a29fad4ad 100644
--- a/web_advanced_search/static/src/js/CustomFilterItem.esm.js
+++ b/web_advanced_search/static/src/js/legacy/CustomFilterItem.esm.js
@@ -2,9 +2,10 @@
 
 import {patch} from "@web/core/utils/patch";
 import CustomFilterItem from "web.CustomFilterItem";
-import {RecordPicker} from "./RecordPicker.esm";
+import {RecordPicker} from "../RecordPicker.esm";
 
-patch(CustomFilterItem.prototype, "web_advanced_search.CustomFilterItem", {
+
+patch(CustomFilterItem.prototype, "web_advanced_search.legacy.CustomFilterItem", {
     /**
      * Ideally we'd want this in setup, but CustomFilterItem does its initialization
      * in the constructor, which can't be patched.
@@ -75,7 +76,7 @@ patch(CustomFilterItem.prototype, "web_advanced_search.CustomFilterItem", {
     },
 });
 
-patch(CustomFilterItem, "web_advanced_search.CustomFilterItem", {
+patch(CustomFilterItem, "web_advanced_search.legacy.CustomFilterItem", {
     components: {
         ...CustomFilterItem.components,
         RecordPicker,
diff --git a/web_advanced_search/static/src/js/FilterMenu.esm.js b/web_advanced_search/static/src/js/legacy/FilterMenu.esm.js
similarity index 65%
rename from web_advanced_search/static/src/js/FilterMenu.esm.js
rename to web_advanced_search/static/src/js/legacy/FilterMenu.esm.js
index 255e50e4a..a32d9c40b 100644
--- a/web_advanced_search/static/src/js/FilterMenu.esm.js
+++ b/web_advanced_search/static/src/js/legacy/FilterMenu.esm.js
@@ -2,9 +2,10 @@
 
 import {patch} from "@web/core/utils/patch";
 import FilterMenu from "web.FilterMenu";
-import AdvancedFilterItem from "./AdvancedFilterItem.esm";
+import AdvancedFilterItem from "../AdvancedFilterItem.esm";
 
-patch(FilterMenu, "web_advanced_search.FilterMenu", {
+
+patch(FilterMenu, "web_advanced_search.legacy.FilterMenu", {
     components: {
         ...FilterMenu.components,
         AdvancedFilterItem,