diff --git a/clients/algoliasearch-client-javascript/packages/client-abtesting/browser.ts b/clients/algoliasearch-client-javascript/packages/client-abtesting/builds/browser.ts
similarity index 81%
rename from clients/algoliasearch-client-javascript/packages/client-abtesting/browser.ts
rename to clients/algoliasearch-client-javascript/packages/client-abtesting/builds/browser.ts
index cf297e23e6..37f81c68ae 100644
--- a/clients/algoliasearch-client-javascript/packages/client-abtesting/browser.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-abtesting/builds/browser.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { XhrRequester } from '@algolia/requester-browser-xhr';
 
-import { createAbtestingApi } from './src/abtestingApi';
-import type { AbtestingApi, Region } from './src/abtestingApi';
+import { createAbtestingApi } from '../src/abtestingApi';
+import type { AbtestingApi, Region } from '../src/abtestingApi';
 
-export * from './src/abtestingApi';
+export * from '../src/abtestingApi';
 
 export function abtestingApi(
   appId: string,
diff --git a/clients/algoliasearch-client-javascript/packages/client-abtesting/node.ts b/clients/algoliasearch-client-javascript/packages/client-abtesting/builds/node.ts
similarity index 81%
rename from clients/algoliasearch-client-javascript/packages/client-abtesting/node.ts
rename to clients/algoliasearch-client-javascript/packages/client-abtesting/builds/node.ts
index 1a0d587d0b..74c0d7c77d 100644
--- a/clients/algoliasearch-client-javascript/packages/client-abtesting/node.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-abtesting/builds/node.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { HttpRequester } from '@algolia/requester-node-http';
 
-import { createAbtestingApi } from './src/abtestingApi';
-import type { AbtestingApi, Region } from './src/abtestingApi';
+import { createAbtestingApi } from '../src/abtestingApi';
+import type { AbtestingApi, Region } from '../src/abtestingApi';
 
-export * from './src/abtestingApi';
+export * from '../src/abtestingApi';
 
 export function abtestingApi(
   appId: string,
diff --git a/clients/algoliasearch-client-javascript/packages/client-abtesting/package.json b/clients/algoliasearch-client-javascript/packages/client-abtesting/package.json
index 594d47a2a7..dcc5d106b3 100644
--- a/clients/algoliasearch-client-javascript/packages/client-abtesting/package.json
+++ b/clients/algoliasearch-client-javascript/packages/client-abtesting/package.json
@@ -6,12 +6,12 @@
   "author": "Algolia",
   "private": true,
   "license": "MIT",
-  "main": "./dist/node.js",
-  "types": "./dist/node.d.ts",
-  "jsdelivr": "./dist/browser.js",
-  "unpkg": "./dist/browser.js",
+  "main": "./dist/builds/node.js",
+  "types": "./dist/builds/node.d.ts",
+  "jsdelivr": "./dist/builds/browser.js",
+  "unpkg": "./dist/builds/browser.js",
   "browser": {
-    "./index.js": "./dist/browser.js"
+    "./index.js": "./dist/builds/browser.js"
   },
   "scripts": {
     "build": "tsc",
diff --git a/clients/algoliasearch-client-javascript/packages/client-abtesting/tsconfig.json b/clients/algoliasearch-client-javascript/packages/client-abtesting/tsconfig.json
index 8c122c680a..89b2007fbb 100644
--- a/clients/algoliasearch-client-javascript/packages/client-abtesting/tsconfig.json
+++ b/clients/algoliasearch-client-javascript/packages/client-abtesting/tsconfig.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "outDir": "dist",
   },
-  "include": ["src", "model", "node.ts", "browser.ts"],
+  "include": ["src", "model", "builds/node.ts", "builds/browser.ts"],
   "exclude": ["dist", "node_modules"]
 }
diff --git a/clients/algoliasearch-client-javascript/packages/client-analytics/browser.ts b/clients/algoliasearch-client-javascript/packages/client-analytics/builds/browser.ts
similarity index 81%
rename from clients/algoliasearch-client-javascript/packages/client-analytics/browser.ts
rename to clients/algoliasearch-client-javascript/packages/client-analytics/builds/browser.ts
index f1b0c3ea51..a3461d8184 100644
--- a/clients/algoliasearch-client-javascript/packages/client-analytics/browser.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-analytics/builds/browser.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { XhrRequester } from '@algolia/requester-browser-xhr';
 
-import { createAnalyticsApi } from './src/analyticsApi';
-import type { AnalyticsApi, Region } from './src/analyticsApi';
+import { createAnalyticsApi } from '../src/analyticsApi';
+import type { AnalyticsApi, Region } from '../src/analyticsApi';
 
-export * from './src/analyticsApi';
+export * from '../src/analyticsApi';
 
 export function analyticsApi(
   appId: string,
diff --git a/clients/algoliasearch-client-javascript/packages/client-analytics/node.ts b/clients/algoliasearch-client-javascript/packages/client-analytics/builds/node.ts
similarity index 81%
rename from clients/algoliasearch-client-javascript/packages/client-analytics/node.ts
rename to clients/algoliasearch-client-javascript/packages/client-analytics/builds/node.ts
index 1570bf9fd0..2c9f9353d3 100644
--- a/clients/algoliasearch-client-javascript/packages/client-analytics/node.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-analytics/builds/node.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { HttpRequester } from '@algolia/requester-node-http';
 
-import { createAnalyticsApi } from './src/analyticsApi';
-import type { AnalyticsApi, Region } from './src/analyticsApi';
+import { createAnalyticsApi } from '../src/analyticsApi';
+import type { AnalyticsApi, Region } from '../src/analyticsApi';
 
-export * from './src/analyticsApi';
+export * from '../src/analyticsApi';
 
 export function analyticsApi(
   appId: string,
diff --git a/clients/algoliasearch-client-javascript/packages/client-analytics/package.json b/clients/algoliasearch-client-javascript/packages/client-analytics/package.json
index e1557be979..0d4031d60c 100644
--- a/clients/algoliasearch-client-javascript/packages/client-analytics/package.json
+++ b/clients/algoliasearch-client-javascript/packages/client-analytics/package.json
@@ -6,12 +6,12 @@
   "author": "Algolia",
   "private": true,
   "license": "MIT",
-  "main": "./dist/node.js",
-  "types": "./dist/node.d.ts",
-  "jsdelivr": "./dist/browser.js",
-  "unpkg": "./dist/browser.js",
+  "main": "./dist/builds/node.js",
+  "types": "./dist/builds/node.d.ts",
+  "jsdelivr": "./dist/builds/browser.js",
+  "unpkg": "./dist/builds/browser.js",
   "browser": {
-    "./index.js": "./dist/browser.js"
+    "./index.js": "./dist/builds/browser.js"
   },
   "scripts": {
     "build": "tsc",
diff --git a/clients/algoliasearch-client-javascript/packages/client-analytics/tsconfig.json b/clients/algoliasearch-client-javascript/packages/client-analytics/tsconfig.json
index 8c122c680a..89b2007fbb 100644
--- a/clients/algoliasearch-client-javascript/packages/client-analytics/tsconfig.json
+++ b/clients/algoliasearch-client-javascript/packages/client-analytics/tsconfig.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "outDir": "dist",
   },
-  "include": ["src", "model", "node.ts", "browser.ts"],
+  "include": ["src", "model", "builds/node.ts", "builds/browser.ts"],
   "exclude": ["dist", "node_modules"]
 }
diff --git a/clients/algoliasearch-client-javascript/packages/client-common/package.json b/clients/algoliasearch-client-javascript/packages/client-common/package.json
index df841ee432..f60693f3fc 100644
--- a/clients/algoliasearch-client-javascript/packages/client-common/package.json
+++ b/clients/algoliasearch-client-javascript/packages/client-common/package.json
@@ -13,8 +13,7 @@
     "clean": "rm -rf dist/"
   },
   "engines": {
-    "node": "^14.0.0",
-    "yarn": "^3.0.0"
+    "node": "^14.0.0"
   },
   "devDependencies": {
     "@types/node": "16.11.11",
diff --git a/clients/algoliasearch-client-javascript/packages/client-insights/browser.ts b/clients/algoliasearch-client-javascript/packages/client-insights/builds/browser.ts
similarity index 82%
rename from clients/algoliasearch-client-javascript/packages/client-insights/browser.ts
rename to clients/algoliasearch-client-javascript/packages/client-insights/builds/browser.ts
index c69471e113..b3181b2c0e 100644
--- a/clients/algoliasearch-client-javascript/packages/client-insights/browser.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-insights/builds/browser.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { XhrRequester } from '@algolia/requester-browser-xhr';
 
-import { createInsightsApi } from './src/insightsApi';
-import type { InsightsApi, Region } from './src/insightsApi';
+import { createInsightsApi } from '../src/insightsApi';
+import type { InsightsApi, Region } from '../src/insightsApi';
 
-export * from './src/insightsApi';
+export * from '../src/insightsApi';
 
 export function insightsApi(
   appId: string,
diff --git a/clients/algoliasearch-client-javascript/packages/client-insights/node.ts b/clients/algoliasearch-client-javascript/packages/client-insights/builds/node.ts
similarity index 82%
rename from clients/algoliasearch-client-javascript/packages/client-insights/node.ts
rename to clients/algoliasearch-client-javascript/packages/client-insights/builds/node.ts
index d6e34a763f..5c11731747 100644
--- a/clients/algoliasearch-client-javascript/packages/client-insights/node.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-insights/builds/node.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { HttpRequester } from '@algolia/requester-node-http';
 
-import { createInsightsApi } from './src/insightsApi';
-import type { InsightsApi, Region } from './src/insightsApi';
+import { createInsightsApi } from '../src/insightsApi';
+import type { InsightsApi, Region } from '../src/insightsApi';
 
-export * from './src/insightsApi';
+export * from '../src/insightsApi';
 
 export function insightsApi(
   appId: string,
diff --git a/clients/algoliasearch-client-javascript/packages/client-insights/package.json b/clients/algoliasearch-client-javascript/packages/client-insights/package.json
index 1c71a3091c..96d25190a2 100644
--- a/clients/algoliasearch-client-javascript/packages/client-insights/package.json
+++ b/clients/algoliasearch-client-javascript/packages/client-insights/package.json
@@ -6,12 +6,12 @@
   "author": "Algolia",
   "private": true,
   "license": "MIT",
-  "main": "./dist/node.js",
-  "types": "./dist/node.d.ts",
-  "jsdelivr": "./dist/browser.js",
-  "unpkg": "./dist/browser.js",
+  "main": "./dist/builds/node.js",
+  "types": "./dist/builds/node.d.ts",
+  "jsdelivr": "./dist/builds/browser.js",
+  "unpkg": "./dist/builds/browser.js",
   "browser": {
-    "./index.js": "./dist/browser.js"
+    "./index.js": "./dist/builds/browser.js"
   },
   "scripts": {
     "build": "tsc",
diff --git a/clients/algoliasearch-client-javascript/packages/client-insights/tsconfig.json b/clients/algoliasearch-client-javascript/packages/client-insights/tsconfig.json
index 8c122c680a..89b2007fbb 100644
--- a/clients/algoliasearch-client-javascript/packages/client-insights/tsconfig.json
+++ b/clients/algoliasearch-client-javascript/packages/client-insights/tsconfig.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "outDir": "dist",
   },
-  "include": ["src", "model", "node.ts", "browser.ts"],
+  "include": ["src", "model", "builds/node.ts", "builds/browser.ts"],
   "exclude": ["dist", "node_modules"]
 }
diff --git a/clients/algoliasearch-client-javascript/packages/client-personalization/browser.ts b/clients/algoliasearch-client-javascript/packages/client-personalization/builds/browser.ts
similarity index 80%
rename from clients/algoliasearch-client-javascript/packages/client-personalization/browser.ts
rename to clients/algoliasearch-client-javascript/packages/client-personalization/builds/browser.ts
index f63a1ab08a..89be08d2db 100644
--- a/clients/algoliasearch-client-javascript/packages/client-personalization/browser.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-personalization/builds/browser.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { XhrRequester } from '@algolia/requester-browser-xhr';
 
-import { createPersonalizationApi } from './src/personalizationApi';
-import type { PersonalizationApi, Region } from './src/personalizationApi';
+import { createPersonalizationApi } from '../src/personalizationApi';
+import type { PersonalizationApi, Region } from '../src/personalizationApi';
 
-export * from './src/personalizationApi';
+export * from '../src/personalizationApi';
 
 export function personalizationApi(
   appId: string,
diff --git a/clients/algoliasearch-client-javascript/packages/client-personalization/node.ts b/clients/algoliasearch-client-javascript/packages/client-personalization/builds/node.ts
similarity index 80%
rename from clients/algoliasearch-client-javascript/packages/client-personalization/node.ts
rename to clients/algoliasearch-client-javascript/packages/client-personalization/builds/node.ts
index 0a4d9ca12f..0d5e4b0694 100644
--- a/clients/algoliasearch-client-javascript/packages/client-personalization/node.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-personalization/builds/node.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { HttpRequester } from '@algolia/requester-node-http';
 
-import { createPersonalizationApi } from './src/personalizationApi';
-import type { PersonalizationApi, Region } from './src/personalizationApi';
+import { createPersonalizationApi } from '../src/personalizationApi';
+import type { PersonalizationApi, Region } from '../src/personalizationApi';
 
-export * from './src/personalizationApi';
+export * from '../src/personalizationApi';
 
 export function personalizationApi(
   appId: string,
diff --git a/clients/algoliasearch-client-javascript/packages/client-personalization/package.json b/clients/algoliasearch-client-javascript/packages/client-personalization/package.json
index bfb43084b7..c652a42c81 100644
--- a/clients/algoliasearch-client-javascript/packages/client-personalization/package.json
+++ b/clients/algoliasearch-client-javascript/packages/client-personalization/package.json
@@ -6,12 +6,12 @@
   "author": "Algolia",
   "private": true,
   "license": "MIT",
-  "main": "./dist/node.js",
-  "types": "./dist/node.d.ts",
-  "jsdelivr": "./dist/browser.js",
-  "unpkg": "./dist/browser.js",
+  "main": "./dist/builds/node.js",
+  "types": "./dist/builds/node.d.ts",
+  "jsdelivr": "./dist/builds/browser.js",
+  "unpkg": "./dist/builds/browser.js",
   "browser": {
-    "./index.js": "./dist/browser.js"
+    "./index.js": "./dist/builds/browser.js"
   },
   "scripts": {
     "build": "tsc",
diff --git a/clients/algoliasearch-client-javascript/packages/client-personalization/tsconfig.json b/clients/algoliasearch-client-javascript/packages/client-personalization/tsconfig.json
index 8c122c680a..89b2007fbb 100644
--- a/clients/algoliasearch-client-javascript/packages/client-personalization/tsconfig.json
+++ b/clients/algoliasearch-client-javascript/packages/client-personalization/tsconfig.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "outDir": "dist",
   },
-  "include": ["src", "model", "node.ts", "browser.ts"],
+  "include": ["src", "model", "builds/node.ts", "builds/browser.ts"],
   "exclude": ["dist", "node_modules"]
 }
diff --git a/clients/algoliasearch-client-javascript/packages/client-predict/browser.ts b/clients/algoliasearch-client-javascript/packages/client-predict/builds/browser.ts
similarity index 82%
rename from clients/algoliasearch-client-javascript/packages/client-predict/browser.ts
rename to clients/algoliasearch-client-javascript/packages/client-predict/builds/browser.ts
index 5f8a95e25c..1baeab85d4 100644
--- a/clients/algoliasearch-client-javascript/packages/client-predict/browser.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-predict/builds/browser.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { XhrRequester } from '@algolia/requester-browser-xhr';
 
-import { createPredictApi } from './src/predictApi';
-import type { PredictApi } from './src/predictApi';
+import { createPredictApi } from '../src/predictApi';
+import type { PredictApi } from '../src/predictApi';
 
-export * from './src/predictApi';
+export * from '../src/predictApi';
 
 export function predictApi(
   appId: string,
@@ -22,7 +22,6 @@ export function predictApi(
   return createPredictApi({
     appId,
     apiKey,
-
     timeouts: {
       connect: 1,
       read: 2,
diff --git a/clients/algoliasearch-client-javascript/packages/client-predict/node.ts b/clients/algoliasearch-client-javascript/packages/client-predict/builds/node.ts
similarity index 82%
rename from clients/algoliasearch-client-javascript/packages/client-predict/node.ts
rename to clients/algoliasearch-client-javascript/packages/client-predict/builds/node.ts
index a2cad9ce98..2b04f48f16 100644
--- a/clients/algoliasearch-client-javascript/packages/client-predict/node.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-predict/builds/node.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { HttpRequester } from '@algolia/requester-node-http';
 
-import { createPredictApi } from './src/predictApi';
-import type { PredictApi } from './src/predictApi';
+import { createPredictApi } from '../src/predictApi';
+import type { PredictApi } from '../src/predictApi';
 
-export * from './src/predictApi';
+export * from '../src/predictApi';
 
 export function predictApi(
   appId: string,
@@ -22,7 +22,6 @@ export function predictApi(
   return createPredictApi({
     appId,
     apiKey,
-
     timeouts: {
       connect: 2,
       read: 5,
diff --git a/clients/algoliasearch-client-javascript/packages/client-predict/package.json b/clients/algoliasearch-client-javascript/packages/client-predict/package.json
index 05adb7aea9..53b7299690 100644
--- a/clients/algoliasearch-client-javascript/packages/client-predict/package.json
+++ b/clients/algoliasearch-client-javascript/packages/client-predict/package.json
@@ -6,12 +6,12 @@
   "author": "Algolia",
   "private": true,
   "license": "MIT",
-  "main": "./dist/node.js",
-  "types": "./dist/node.d.ts",
-  "jsdelivr": "./dist/browser.js",
-  "unpkg": "./dist/browser.js",
+  "main": "./dist/builds/node.js",
+  "types": "./dist/builds/node.d.ts",
+  "jsdelivr": "./dist/builds/browser.js",
+  "unpkg": "./dist/builds/browser.js",
   "browser": {
-    "./index.js": "./dist/browser.js"
+    "./index.js": "./dist/builds/browser.js"
   },
   "scripts": {
     "build": "tsc",
diff --git a/clients/algoliasearch-client-javascript/packages/client-predict/tsconfig.json b/clients/algoliasearch-client-javascript/packages/client-predict/tsconfig.json
index 8c122c680a..89b2007fbb 100644
--- a/clients/algoliasearch-client-javascript/packages/client-predict/tsconfig.json
+++ b/clients/algoliasearch-client-javascript/packages/client-predict/tsconfig.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "outDir": "dist",
   },
-  "include": ["src", "model", "node.ts", "browser.ts"],
+  "include": ["src", "model", "builds/node.ts", "builds/browser.ts"],
   "exclude": ["dist", "node_modules"]
 }
diff --git a/clients/algoliasearch-client-javascript/packages/client-query-suggestions/browser.ts b/clients/algoliasearch-client-javascript/packages/client-query-suggestions/builds/browser.ts
similarity index 80%
rename from clients/algoliasearch-client-javascript/packages/client-query-suggestions/browser.ts
rename to clients/algoliasearch-client-javascript/packages/client-query-suggestions/builds/browser.ts
index 904242ca69..14bd543b05 100644
--- a/clients/algoliasearch-client-javascript/packages/client-query-suggestions/browser.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-query-suggestions/builds/browser.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { XhrRequester } from '@algolia/requester-browser-xhr';
 
-import { createQuerySuggestionsApi } from './src/querySuggestionsApi';
-import type { QuerySuggestionsApi, Region } from './src/querySuggestionsApi';
+import { createQuerySuggestionsApi } from '../src/querySuggestionsApi';
+import type { QuerySuggestionsApi, Region } from '../src/querySuggestionsApi';
 
-export * from './src/querySuggestionsApi';
+export * from '../src/querySuggestionsApi';
 
 export function querySuggestionsApi(
   appId: string,
diff --git a/clients/algoliasearch-client-javascript/packages/client-query-suggestions/node.ts b/clients/algoliasearch-client-javascript/packages/client-query-suggestions/builds/node.ts
similarity index 80%
rename from clients/algoliasearch-client-javascript/packages/client-query-suggestions/node.ts
rename to clients/algoliasearch-client-javascript/packages/client-query-suggestions/builds/node.ts
index 2183073e33..6f3ea55902 100644
--- a/clients/algoliasearch-client-javascript/packages/client-query-suggestions/node.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-query-suggestions/builds/node.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { HttpRequester } from '@algolia/requester-node-http';
 
-import { createQuerySuggestionsApi } from './src/querySuggestionsApi';
-import type { QuerySuggestionsApi, Region } from './src/querySuggestionsApi';
+import { createQuerySuggestionsApi } from '../src/querySuggestionsApi';
+import type { QuerySuggestionsApi, Region } from '../src/querySuggestionsApi';
 
-export * from './src/querySuggestionsApi';
+export * from '../src/querySuggestionsApi';
 
 export function querySuggestionsApi(
   appId: string,
diff --git a/clients/algoliasearch-client-javascript/packages/client-query-suggestions/package.json b/clients/algoliasearch-client-javascript/packages/client-query-suggestions/package.json
index 907bbf4898..adcc372549 100644
--- a/clients/algoliasearch-client-javascript/packages/client-query-suggestions/package.json
+++ b/clients/algoliasearch-client-javascript/packages/client-query-suggestions/package.json
@@ -6,12 +6,12 @@
   "author": "Algolia",
   "private": true,
   "license": "MIT",
-  "main": "./dist/node.js",
-  "types": "./dist/node.d.ts",
-  "jsdelivr": "./dist/browser.js",
-  "unpkg": "./dist/browser.js",
+  "main": "./dist/builds/node.js",
+  "types": "./dist/builds/node.d.ts",
+  "jsdelivr": "./dist/builds/browser.js",
+  "unpkg": "./dist/builds/browser.js",
   "browser": {
-    "./index.js": "./dist/browser.js"
+    "./index.js": "./dist/builds/browser.js"
   },
   "scripts": {
     "build": "tsc",
diff --git a/clients/algoliasearch-client-javascript/packages/client-query-suggestions/tsconfig.json b/clients/algoliasearch-client-javascript/packages/client-query-suggestions/tsconfig.json
index 8c122c680a..89b2007fbb 100644
--- a/clients/algoliasearch-client-javascript/packages/client-query-suggestions/tsconfig.json
+++ b/clients/algoliasearch-client-javascript/packages/client-query-suggestions/tsconfig.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "outDir": "dist",
   },
-  "include": ["src", "model", "node.ts", "browser.ts"],
+  "include": ["src", "model", "builds/node.ts", "builds/browser.ts"],
   "exclude": ["dist", "node_modules"]
 }
diff --git a/clients/algoliasearch-client-javascript/packages/client-search/browser.ts b/clients/algoliasearch-client-javascript/packages/client-search/builds/browser.ts
similarity index 83%
rename from clients/algoliasearch-client-javascript/packages/client-search/browser.ts
rename to clients/algoliasearch-client-javascript/packages/client-search/builds/browser.ts
index 9836ae8067..3580501c66 100644
--- a/clients/algoliasearch-client-javascript/packages/client-search/browser.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-search/builds/browser.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { XhrRequester } from '@algolia/requester-browser-xhr';
 
-import { createSearchApi } from './src/searchApi';
-import type { SearchApi } from './src/searchApi';
+import { createSearchApi } from '../src/searchApi';
+import type { SearchApi } from '../src/searchApi';
 
-export * from './src/searchApi';
+export * from '../src/searchApi';
 
 export function searchApi(
   appId: string,
@@ -22,7 +22,6 @@ export function searchApi(
   return createSearchApi({
     appId,
     apiKey,
-
     timeouts: {
       connect: 1,
       read: 2,
diff --git a/clients/algoliasearch-client-javascript/packages/client-search/node.ts b/clients/algoliasearch-client-javascript/packages/client-search/builds/node.ts
similarity index 83%
rename from clients/algoliasearch-client-javascript/packages/client-search/node.ts
rename to clients/algoliasearch-client-javascript/packages/client-search/builds/node.ts
index a6307dcbcf..3f80488550 100644
--- a/clients/algoliasearch-client-javascript/packages/client-search/node.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-search/builds/node.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { HttpRequester } from '@algolia/requester-node-http';
 
-import { createSearchApi } from './src/searchApi';
-import type { SearchApi } from './src/searchApi';
+import { createSearchApi } from '../src/searchApi';
+import type { SearchApi } from '../src/searchApi';
 
-export * from './src/searchApi';
+export * from '../src/searchApi';
 
 export function searchApi(
   appId: string,
@@ -22,7 +22,6 @@ export function searchApi(
   return createSearchApi({
     appId,
     apiKey,
-
     timeouts: {
       connect: 2,
       read: 5,
diff --git a/clients/algoliasearch-client-javascript/packages/client-search/package.json b/clients/algoliasearch-client-javascript/packages/client-search/package.json
index 953689ac1d..29018bad22 100644
--- a/clients/algoliasearch-client-javascript/packages/client-search/package.json
+++ b/clients/algoliasearch-client-javascript/packages/client-search/package.json
@@ -6,12 +6,12 @@
   "author": "Algolia",
   "private": true,
   "license": "MIT",
-  "main": "./dist/node.js",
-  "types": "./dist/node.d.ts",
-  "jsdelivr": "./dist/browser.js",
-  "unpkg": "./dist/browser.js",
+  "main": "./dist/builds/node.js",
+  "types": "./dist/builds/node.d.ts",
+  "jsdelivr": "./dist/builds/browser.js",
+  "unpkg": "./dist/builds/browser.js",
   "browser": {
-    "./index.js": "./dist/browser.js"
+    "./index.js": "./dist/builds/browser.js"
   },
   "scripts": {
     "build": "tsc",
diff --git a/clients/algoliasearch-client-javascript/packages/client-search/tsconfig.json b/clients/algoliasearch-client-javascript/packages/client-search/tsconfig.json
index 8c122c680a..89b2007fbb 100644
--- a/clients/algoliasearch-client-javascript/packages/client-search/tsconfig.json
+++ b/clients/algoliasearch-client-javascript/packages/client-search/tsconfig.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "outDir": "dist",
   },
-  "include": ["src", "model", "node.ts", "browser.ts"],
+  "include": ["src", "model", "builds/node.ts", "builds/browser.ts"],
   "exclude": ["dist", "node_modules"]
 }
diff --git a/clients/algoliasearch-client-javascript/packages/client-sources/browser.ts b/clients/algoliasearch-client-javascript/packages/client-sources/builds/browser.ts
similarity index 83%
rename from clients/algoliasearch-client-javascript/packages/client-sources/browser.ts
rename to clients/algoliasearch-client-javascript/packages/client-sources/builds/browser.ts
index c0b8416e45..b92e7c7d99 100644
--- a/clients/algoliasearch-client-javascript/packages/client-sources/browser.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-sources/builds/browser.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { XhrRequester } from '@algolia/requester-browser-xhr';
 
-import { createSourcesApi } from './src/sourcesApi';
-import type { SourcesApi, Region } from './src/sourcesApi';
+import { createSourcesApi } from '../src/sourcesApi';
+import type { SourcesApi, Region } from '../src/sourcesApi';
 
-export * from './src/sourcesApi';
+export * from '../src/sourcesApi';
 
 export function sourcesApi(
   appId: string,
diff --git a/clients/algoliasearch-client-javascript/packages/client-sources/node.ts b/clients/algoliasearch-client-javascript/packages/client-sources/builds/node.ts
similarity index 83%
rename from clients/algoliasearch-client-javascript/packages/client-sources/node.ts
rename to clients/algoliasearch-client-javascript/packages/client-sources/builds/node.ts
index 0b06b570ab..637376e61a 100644
--- a/clients/algoliasearch-client-javascript/packages/client-sources/node.ts
+++ b/clients/algoliasearch-client-javascript/packages/client-sources/builds/node.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { HttpRequester } from '@algolia/requester-node-http';
 
-import { createSourcesApi } from './src/sourcesApi';
-import type { SourcesApi, Region } from './src/sourcesApi';
+import { createSourcesApi } from '../src/sourcesApi';
+import type { SourcesApi, Region } from '../src/sourcesApi';
 
-export * from './src/sourcesApi';
+export * from '../src/sourcesApi';
 
 export function sourcesApi(
   appId: string,
diff --git a/clients/algoliasearch-client-javascript/packages/client-sources/package.json b/clients/algoliasearch-client-javascript/packages/client-sources/package.json
index a31aac7389..5673c223ed 100644
--- a/clients/algoliasearch-client-javascript/packages/client-sources/package.json
+++ b/clients/algoliasearch-client-javascript/packages/client-sources/package.json
@@ -6,12 +6,12 @@
   "author": "Algolia",
   "private": true,
   "license": "MIT",
-  "main": "./dist/node.js",
-  "types": "./dist/node.d.ts",
-  "jsdelivr": "./dist/browser.js",
-  "unpkg": "./dist/browser.js",
+  "main": "./dist/builds/node.js",
+  "types": "./dist/builds/node.d.ts",
+  "jsdelivr": "./dist/builds/browser.js",
+  "unpkg": "./dist/builds/browser.js",
   "browser": {
-    "./index.js": "./dist/browser.js"
+    "./index.js": "./dist/builds/browser.js"
   },
   "scripts": {
     "build": "tsc",
diff --git a/clients/algoliasearch-client-javascript/packages/client-sources/tsconfig.json b/clients/algoliasearch-client-javascript/packages/client-sources/tsconfig.json
index 8c122c680a..89b2007fbb 100644
--- a/clients/algoliasearch-client-javascript/packages/client-sources/tsconfig.json
+++ b/clients/algoliasearch-client-javascript/packages/client-sources/tsconfig.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "outDir": "dist",
   },
-  "include": ["src", "model", "node.ts", "browser.ts"],
+  "include": ["src", "model", "builds/node.ts", "builds/browser.ts"],
   "exclude": ["dist", "node_modules"]
 }
diff --git a/clients/algoliasearch-client-javascript/packages/recommend/browser.ts b/clients/algoliasearch-client-javascript/packages/recommend/builds/browser.ts
similarity index 81%
rename from clients/algoliasearch-client-javascript/packages/recommend/browser.ts
rename to clients/algoliasearch-client-javascript/packages/recommend/builds/browser.ts
index 997026ff51..d42c18b315 100644
--- a/clients/algoliasearch-client-javascript/packages/recommend/browser.ts
+++ b/clients/algoliasearch-client-javascript/packages/recommend/builds/browser.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { XhrRequester } from '@algolia/requester-browser-xhr';
 
-import { createRecommendApi } from './src/recommendApi';
-import type { RecommendApi } from './src/recommendApi';
+import { createRecommendApi } from '../src/recommendApi';
+import type { RecommendApi } from '../src/recommendApi';
 
-export * from './src/recommendApi';
+export * from '../src/recommendApi';
 
 export function recommendApi(
   appId: string,
@@ -22,7 +22,6 @@ export function recommendApi(
   return createRecommendApi({
     appId,
     apiKey,
-
     timeouts: {
       connect: 1,
       read: 2,
diff --git a/clients/algoliasearch-client-javascript/packages/recommend/node.ts b/clients/algoliasearch-client-javascript/packages/recommend/builds/node.ts
similarity index 81%
rename from clients/algoliasearch-client-javascript/packages/recommend/node.ts
rename to clients/algoliasearch-client-javascript/packages/recommend/builds/node.ts
index 000a71a8fe..4ffef76ee6 100644
--- a/clients/algoliasearch-client-javascript/packages/recommend/node.ts
+++ b/clients/algoliasearch-client-javascript/packages/recommend/builds/node.ts
@@ -1,10 +1,10 @@
 import type { Host, Requester } from '@algolia/client-common';
 import { HttpRequester } from '@algolia/requester-node-http';
 
-import { createRecommendApi } from './src/recommendApi';
-import type { RecommendApi } from './src/recommendApi';
+import { createRecommendApi } from '../src/recommendApi';
+import type { RecommendApi } from '../src/recommendApi';
 
-export * from './src/recommendApi';
+export * from '../src/recommendApi';
 
 export function recommendApi(
   appId: string,
@@ -22,7 +22,6 @@ export function recommendApi(
   return createRecommendApi({
     appId,
     apiKey,
-
     timeouts: {
       connect: 2,
       read: 5,
diff --git a/clients/algoliasearch-client-javascript/packages/recommend/package.json b/clients/algoliasearch-client-javascript/packages/recommend/package.json
index 6c5f79b9e0..2609b3db65 100644
--- a/clients/algoliasearch-client-javascript/packages/recommend/package.json
+++ b/clients/algoliasearch-client-javascript/packages/recommend/package.json
@@ -6,12 +6,12 @@
   "author": "Algolia",
   "private": true,
   "license": "MIT",
-  "main": "./dist/node.js",
-  "types": "./dist/node.d.ts",
-  "jsdelivr": "./dist/browser.js",
-  "unpkg": "./dist/browser.js",
+  "main": "./dist/builds/node.js",
+  "types": "./dist/builds/node.d.ts",
+  "jsdelivr": "./dist/builds/browser.js",
+  "unpkg": "./dist/builds/browser.js",
   "browser": {
-    "./index.js": "./dist/browser.js"
+    "./index.js": "./dist/builds/browser.js"
   },
   "scripts": {
     "build": "tsc",
diff --git a/clients/algoliasearch-client-javascript/packages/recommend/tsconfig.json b/clients/algoliasearch-client-javascript/packages/recommend/tsconfig.json
index 8c122c680a..89b2007fbb 100644
--- a/clients/algoliasearch-client-javascript/packages/recommend/tsconfig.json
+++ b/clients/algoliasearch-client-javascript/packages/recommend/tsconfig.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "outDir": "dist",
   },
-  "include": ["src", "model", "node.ts", "browser.ts"],
+  "include": ["src", "model", "builds/node.ts", "builds/browser.ts"],
   "exclude": ["dist", "node_modules"]
 }
diff --git a/clients/algoliasearch-client-javascript/packages/requester-browser-xhr/package.json b/clients/algoliasearch-client-javascript/packages/requester-browser-xhr/package.json
index d6dbcacb71..e6274ce0e9 100644
--- a/clients/algoliasearch-client-javascript/packages/requester-browser-xhr/package.json
+++ b/clients/algoliasearch-client-javascript/packages/requester-browser-xhr/package.json
@@ -13,8 +13,7 @@
     "clean": "rm -rf dist/"
   },
   "engines": {
-    "node": "^14.0.0",
-    "yarn": "^3.0.0"
+    "node": "^14.0.0"
   },
   "dependencies": {
     "@algolia/client-common": "5.0.0"
diff --git a/clients/algoliasearch-client-javascript/packages/requester-node-http/package.json b/clients/algoliasearch-client-javascript/packages/requester-node-http/package.json
index 4147deb5c9..17383688e1 100644
--- a/clients/algoliasearch-client-javascript/packages/requester-node-http/package.json
+++ b/clients/algoliasearch-client-javascript/packages/requester-node-http/package.json
@@ -13,8 +13,7 @@
     "clean": "rm -rf dist/"
   },
   "engines": {
-    "node": "^14.0.0",
-    "yarn": "^3.0.0"
+    "node": "^14.0.0"
   },
   "dependencies": {
     "@algolia/client-common": "5.0.0"
diff --git a/openapitools.json b/openapitools.json
index 9be45ddae4..30f7b71e82 100644
--- a/openapitools.json
+++ b/openapitools.json
@@ -198,7 +198,7 @@
         "config": "#{cwd}/openapitools.json",
         "apiPackage": "src",
         "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-predict",
-        "glob": "specs/dist/predict.yml",
+        "glob": "specs/bundled/predict.yml",
         "gitHost": "algolia",
         "gitUserId": "algolia",
         "gitRepoId": "algoliasearch-client-javascript",
diff --git a/scripts/post-gen/javascript.sh b/scripts/post-gen/javascript.sh
index 92f7e66dad..3535f9202e 100755
--- a/scripts/post-gen/javascript.sh
+++ b/scripts/post-gen/javascript.sh
@@ -7,6 +7,9 @@ FOLDER=$1
 
 # Generator does not allow new files, so we use existing ones to generate
 # our `node` and `browser` build files.
+destination=$FOLDER/builds
 
-mv $FOLDER/api.ts $FOLDER/node.ts
-mv $FOLDER/src/apis.ts $FOLDER/browser.ts
+mkdir -p $destination
+
+mv $FOLDER/api.ts $destination/node.ts
+mv $FOLDER/src/apis.ts $destination/browser.ts
diff --git a/templates/javascript/api-all.mustache b/templates/javascript/api-all.mustache
index 6a07a4f8f0..ac57d214ab 100644
--- a/templates/javascript/api-all.mustache
+++ b/templates/javascript/api-all.mustache
@@ -1,16 +1,16 @@
-{{! This file will be renamed to `browser.ts` after generating the client }}
+{{! This file will be renamed and moved to `builds/browser.ts` after generating the client }}
 
 import type { Host, Requester } from '@algolia/client-common';
 import { XhrRequester } from '@algolia/requester-browser-xhr';
 
-import { create{{capitalizedApiName}}Api } from './src/{{apiName}}Api';
-import type { {{capitalizedApiName}}Api } from './src/{{apiName}}Api';
+import { create{{capitalizedApiName}}Api } from '../src/{{apiName}}Api';
+import type { {{capitalizedApiName}}Api } from '../src/{{apiName}}Api';
 
 {{#hasRegionalHost}}
-import type { Region } from './src/{{apiName}}Api';
+import type { Region } from '../src/{{apiName}}Api';
 {{/hasRegionalHost}}
 
-export * from './src/{{apiName}}Api';
+export * from '../src/{{apiName}}Api';
 
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 export function {{apiName}}Api(
@@ -36,8 +36,7 @@ export function {{apiName}}Api(
 
   return create{{capitalizedApiName}}Api({
     appId,
-    apiKey,
-    {{#hasRegionalHost}}region,{{/hasRegionalHost}}
+    apiKey,{{#hasRegionalHost}}region,{{/hasRegionalHost}}
     timeouts: {
       connect: 1,
       read: 2,
diff --git a/templates/javascript/api.mustache b/templates/javascript/api.mustache
index efde104b44..0fc6980d82 100644
--- a/templates/javascript/api.mustache
+++ b/templates/javascript/api.mustache
@@ -1,16 +1,16 @@
-{{! This file will be renamed to `node.ts` after generating the client }}
+{{! This file will be renamed and moved to `builds/node.ts` after generating the client }}
 
 import type { Host, Requester } from '@algolia/client-common';
 import { HttpRequester } from '@algolia/requester-node-http';
 
-import { create{{capitalizedApiName}}Api } from './src/{{apiName}}Api';
-import type { {{capitalizedApiName}}Api } from './src/{{apiName}}Api';
+import { create{{capitalizedApiName}}Api } from '../src/{{apiName}}Api';
+import type { {{capitalizedApiName}}Api } from '../src/{{apiName}}Api';
 
 {{#hasRegionalHost}}
-import type { Region } from './src/{{apiName}}Api';
+import type { Region } from '../src/{{apiName}}Api';
 {{/hasRegionalHost}}
 
-export * from './src/{{apiName}}Api';
+export * from '../src/{{apiName}}Api';
 
 export function {{apiName}}Api(
   appId: string,
@@ -35,8 +35,7 @@ export function {{apiName}}Api(
 
   return create{{capitalizedApiName}}Api({
     appId,
-    apiKey,
-    {{#hasRegionalHost}}region,{{/hasRegionalHost}}
+    apiKey,{{#hasRegionalHost}}region,{{/hasRegionalHost}}
     timeouts: {
       connect: 2,
       read: 5,
diff --git a/templates/javascript/package.mustache b/templates/javascript/package.mustache
index 05ede65c2c..039197d300 100644
--- a/templates/javascript/package.mustache
+++ b/templates/javascript/package.mustache
@@ -6,12 +6,12 @@
   "author": "Algolia",
   "private": true,
   "license": "MIT",
-  "main": "./dist/node.js",
-  "types": "./dist/node.d.ts",
-  "jsdelivr": "./dist/browser.js",
-  "unpkg": "./dist/browser.js",
+  "main": "./dist/builds/node.js",
+  "types": "./dist/builds/node.d.ts",
+  "jsdelivr": "./dist/builds/browser.js",
+  "unpkg": "./dist/builds/browser.js",
   "browser": {
-    "./index.js": "./dist/browser.js"
+    "./index.js": "./dist/builds/browser.js"
   },
   "scripts": {
     "build": "tsc",
diff --git a/templates/javascript/tsconfig.mustache b/templates/javascript/tsconfig.mustache
index 8ef728ad3f..81f7c29c46 100644
--- a/templates/javascript/tsconfig.mustache
+++ b/templates/javascript/tsconfig.mustache
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "outDir": "dist",
   },
-  "include": ["{{apiPackage}}", "model", "node.ts", "browser.ts"],
+  "include": ["{{apiPackage}}", "model", "builds/node.ts", "builds/browser.ts"],
   "exclude": ["dist", "node_modules"]
 }