diff --git a/packages/core/package.json b/packages/core/package.json
index 791efe916b..3c4d57fce9 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -61,5 +61,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "sideEffects": false
 }
diff --git a/packages/format-icu/package.json b/packages/format-icu/package.json
index 7b9a93eccb..8680eb1d3a 100644
--- a/packages/format-icu/package.json
+++ b/packages/format-icu/package.json
@@ -62,5 +62,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "sideEffects": false
 }
diff --git a/packages/i18next/src/__integration/withTolgee.test.ts b/packages/i18next/src/__integration/withTolgee.test.ts
index 6cf578674e..6ec991de76 100644
--- a/packages/i18next/src/__integration/withTolgee.test.ts
+++ b/packages/i18next/src/__integration/withTolgee.test.ts
@@ -3,7 +3,8 @@ jest.autoMockOff();
 import '@testing-library/jest-dom';
 import { mockCoreFetch } from '@tolgee/testing/fetchMock';
 import i18n from 'i18next';
-import { DevTools, Tolgee } from '@tolgee/web';
+import { Tolgee } from '@tolgee/web';
+import { InContextTools } from '@tolgee/web/tools';
 import { withTolgee, I18nextPlugin } from '..';
 
 const API_URL = 'http://localhost';
@@ -15,7 +16,7 @@ describe('withTolgee', () => {
   let i18next: typeof i18n;
   beforeEach(async () => {
     fetch.enableMocks();
-    const tolgee = Tolgee().use(DevTools()).use(I18nextPlugin()).init({
+    const tolgee = Tolgee().use(InContextTools()).use(I18nextPlugin()).init({
       apiKey: API_KEY,
       apiUrl: API_URL,
     });
diff --git a/packages/react/package.json b/packages/react/package.json
index 1e4f4e035a..7f1726a0ed 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -74,5 +74,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "sideEffects": false
 }
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 72e6932f6a..f384e79375 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -52,5 +52,6 @@
   "publishConfig": {
     "directory": "./package",
     "access": "public"
-  }
+  },
+  "sideEffects": false
 }
diff --git a/packages/web/package.json b/packages/web/package.json
index b084cebcda..cb39b66341 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -2,11 +2,35 @@
   "name": "@tolgee/web",
   "version": "5.0.1",
   "description": "Tolgee for web",
-  "main": "./dist/tolgee-web.main.cjs.js",
-  "module": "./dist/tolgee-web.main.esm.js",
-  "types": "./types/index.d.ts",
-  "svelte": "./dist/tolgee-web.main.esm.js",
   "declaration": true,
+  "main": "./dist/tolgee-web.universal.cjs.js",
+  "module": "./dist/tolgee-web.universal.esm.js",
+  "types": "./types/index.d.ts",
+  "exports": {
+    ".": {
+      "production": {
+        "require": "./dist/tolgee-web.production.cjs.js",
+        "import": "./dist/tolgee-web.production.esm.js",
+        "svelte": "./dist/tolgee-web.production.esm.js"
+      },
+      "development": {
+        "require": "./dist/tolgee-web.development.cjs.js",
+        "import": "./dist/tolgee-web.development.esm.js",
+        "svelte": "./dist/tolgee-web.development.esm.js"
+      },
+      "require": "./dist/tolgee-web.universal.cjs.js",
+      "import": "./dist/tolgee-web.universal.esm.js",
+      "svelte": "./dist/tolgee-web.universal.esm.js",
+      "types": "./types/index.d.ts"
+    },
+    "./tools": {
+      "require": "./dist/tolgee-in-context-tools.cjs.js",
+      "import": "./dist/tolgee-in-context-tools.esm.js",
+      "svelte": "./dist/tolgee-in-context-tools.esm.js",
+      "types": "./types/index.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
   "directories": {
     "lib": "lib",
     "test": "test"
@@ -25,6 +49,7 @@
     "lib/**/*",
     "dist/**/*",
     "src/**/*",
+    "tools/**/*",
     "index.js"
   ],
   "dependencies": {
@@ -71,10 +96,6 @@
     "type": "git",
     "url": "git+https://github.com/tolgee/tolgee-js.git"
   },
-  "exports": {
-    "require": "./dist/tolgee-web.main.cjs.js",
-    "import": "./dist/tolgee-web.main.esm.js"
-  },
   "keywords": [
     "localization",
     "languages",
@@ -89,5 +110,6 @@
   "gitHead": "d4f5dccf1f3b0017942d862f7be7e9efe093ef08",
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "sideEffects": false
 }
diff --git a/packages/web/rollup.common.js b/packages/web/rollup.common.js
index 43d1800da4..fe9e8425cc 100644
--- a/packages/web/rollup.common.js
+++ b/packages/web/rollup.common.js
@@ -8,10 +8,12 @@ import { visualizer } from 'rollup-plugin-visualizer';
 import replace from '@rollup/plugin-replace';
 
 export const commonConfig = {
-  input: 'src/index.ts',
   watch: {
     clearScreen: false,
   },
+  treeshake: {
+    moduleSideEffects: false,
+  },
 };
 
 export const commonPlugins = [
@@ -36,91 +38,74 @@ export const commonPlugins = [
     ),
     preventAssignment: true,
   }),
-];
-
-const replaceEnv = (value, modulesOnly) =>
   replace({
-    'process.env.NODE_ENV': JSON.stringify(value),
-    include: modulesOnly
-      ? ['node_modules/**', '../../node_modules/**']
-      : undefined,
+    'process.env.NODE_ENV': JSON.stringify('productionuction'),
+    include: ['node_modules/**', '../../node_modules/**'],
     preventAssignment: true,
-  });
+  }),
+];
 
-const buildMin = ({ input, name, plugins = [], umdName, esmExt = 'mjs' }) => ({
-  ...commonConfig,
-  input,
-  output: [
-    {
-      file: `dist/tolgee-${name}.cjs.min.js`,
-      format: 'cjs',
-      sourcemap: true,
-    },
+/**
+ *
+ * @param {string} name
+ * @param {string} format
+ * @param {string} ext
+ */
+
+const packageOutput = (name, format, ext) => {
+  return [
     {
-      file: `dist/tolgee-${name}.esm.min.${esmExt}`,
-      format: 'esm',
+      name: `@tolgee/${name}`,
+      file: `dist/tolgee-${name}.${format}.${ext}`,
+      format,
       sourcemap: true,
     },
     {
-      name: `@tolgee/${umdName || name}`,
-      file: `dist/tolgee-${name}.umd.min.js`,
-      format: 'umd',
+      name: `@tolgee/${name}`,
+      file: `dist/tolgee-${name}.${format}.min.${ext}`,
+      format,
       sourcemap: true,
+      plugins: [terser()],
     },
-  ],
-  plugins: [...plugins, terser(), ...commonPlugins],
-});
+  ];
+};
 
-const buildDev = ({ input, name, plugins = [], umdName, esmExt = 'mjs' }) => ({
+const buildPackage = ({ input, name, plugins = [], umdName }) => ({
   ...commonConfig,
   input,
   output: [
-    {
-      file: `dist/tolgee-${name}.cjs.js`,
-      format: 'cjs',
-      sourcemap: true,
-    },
-    {
-      file: `dist/tolgee-${name}.esm.${esmExt}`,
-      format: 'esm',
-      sourcemap: true,
-    },
-    {
-      name: `@tolgee/${umdName || name}`,
-      file: `dist/tolgee-${name}.umd.js`,
-      format: 'umd',
-      sourcemap: true,
-    },
+    ...packageOutput(name, 'cjs', 'js'),
+    ...packageOutput(name, 'esm', 'js'),
+    ...packageOutput(name, 'esm', 'mjs'),
+    ...packageOutput(name, 'umd', 'js'),
   ],
   plugins: [...plugins, ...commonPlugins],
 });
-/**
- * Template for rollup configuration for production minified build
- * @param {string} input Input file name
- * @param {string} name Name of the package
- */
-export const buildVanilla = (input, name) => [
-  buildDev({
-    input,
-    name,
-    plugins: [replaceEnv('production', true), replaceEnv('development')],
-  }),
-  buildMin({ input, name, plugins: [replaceEnv('production')] }),
-];
 
 export const buildMain = () => [
-  buildDev({
-    input: 'src/index.ts',
-    name: 'web.main',
-    plugins: [replaceEnv('production', true)],
+  buildPackage({
+    input: 'src/entrypoints/development.ts',
+    name: 'web.development',
     umdName: 'web',
-    esmExt: 'js',
   }),
-  buildMin({
-    input: 'src/index.ts',
-    name: 'web.main',
-    plugins: [replaceEnv('production', true)],
+
+  buildPackage({
+    input: 'src/entrypoints/production.ts',
+    name: 'web.production',
     umdName: 'web',
-    esmExt: 'js',
+  }),
+
+  buildPackage({
+    input: 'src/entrypoints/universal.ts',
+    name: 'web.universal',
+    umdName: 'web',
+  }),
+
+  // dev tools
+
+  buildPackage({
+    input: 'src/entrypoints/tools.ts',
+    name: 'in-context-tools',
+    umdName: 'tools',
   }),
 ];
diff --git a/packages/web/rollup.config.js b/packages/web/rollup.config.js
index f155b352b4..e9691dcd3c 100644
--- a/packages/web/rollup.config.js
+++ b/packages/web/rollup.config.js
@@ -1,16 +1,3 @@
-import { buildMain, buildVanilla } from './rollup.common';
+import { buildMain } from './rollup.common';
 
-export default [
-  ...buildMain(),
-  // separately built modules intended for vanilla usage
-  ...buildVanilla('src/index.ts', 'web'),
-  ...buildVanilla('src/InContextTools.ts', 'in-context-tools'),
-  ...buildVanilla('src/ObserverPlugin.ts', 'observer-plugin'),
-  ...buildVanilla('src/Tolgee.ts', 'tolgee'),
-  ...buildVanilla('src/LanguageStorage.ts', 'language-storage'),
-  ...buildVanilla('src/LanguageDetector.ts', 'language-detector'),
-  ...buildVanilla('src/BackendFetch.ts', 'backend-fetch'),
-  ...buildVanilla('src/BackendFetch.ts', 'backend-fetch'),
-  ...buildVanilla('src/LanguageDetector.ts', 'language-detector'),
-  ...buildVanilla('src/LanguageStorage.ts', 'language-storage'),
-];
+export default [...buildMain()];
diff --git a/packages/web/src/DevTools.ts b/packages/web/src/DevTools.ts
deleted file mode 100644
index 4d35327c6f..0000000000
--- a/packages/web/src/DevTools.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { InContextTools } from './InContextTools';
-
-let DevTools: typeof InContextTools;
-
-if (process.env.NODE_ENV !== 'production') {
-  DevTools = InContextTools;
-} else {
-  DevTools = () => (tolgee) => tolgee;
-}
-
-export { DevTools };
diff --git a/packages/web/src/__test__/browser.extension.test.ts b/packages/web/src/__test__/browser.extension.test.ts
index 7a25588d31..25cc7c4688 100644
--- a/packages/web/src/__test__/browser.extension.test.ts
+++ b/packages/web/src/__test__/browser.extension.test.ts
@@ -62,7 +62,9 @@ describe('compatibility with browser extension', () => {
     const fileContent = await fs.readFile(
       path.join(__dirname, `../../dist/${IN_CONTEXT_FILE}`)
     );
-    expect(fileContent.toString().includes(IN_CONTEXT_UMD_NAME)).toBeTruthy();
+    expect(
+      fileContent.toString().includes(`"${IN_CONTEXT_UMD_NAME}"`)
+    ).toBeTruthy();
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const module = await import(`../../dist/${IN_CONTEXT_FILE}`);
     expect(typeof module[IN_CONTEXT_EXPORT_NAME]).toEqual('function');
diff --git a/packages/web/src/entrypoints/development.ts b/packages/web/src/entrypoints/development.ts
new file mode 100644
index 0000000000..040fef3a06
--- /dev/null
+++ b/packages/web/src/entrypoints/development.ts
@@ -0,0 +1,5 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+export * from './production';
+import { InContextTools } from '../InContextTools';
+
+export const DevTools = InContextTools;
diff --git a/packages/web/src/entrypoints/production.ts b/packages/web/src/entrypoints/production.ts
new file mode 100644
index 0000000000..f227d62d55
--- /dev/null
+++ b/packages/web/src/entrypoints/production.ts
@@ -0,0 +1,8 @@
+import { TolgeeInstance } from '@tolgee/core';
+
+export const DevTools = () => (tolgee: TolgeeInstance) => tolgee;
+export * from '../typedIndex';
+export {
+  PREFERRED_LANGUAGES_LOCAL_STORAGE_KEY,
+  DEVTOOLS_ID,
+} from '../constants';
diff --git a/packages/web/src/entrypoints/tools.ts b/packages/web/src/entrypoints/tools.ts
new file mode 100644
index 0000000000..e25379732a
--- /dev/null
+++ b/packages/web/src/entrypoints/tools.ts
@@ -0,0 +1,2 @@
+export { InContextTools } from '../InContextTools';
+export { ContextUi } from '../ContextUi';
diff --git a/packages/web/src/entrypoints/universal.ts b/packages/web/src/entrypoints/universal.ts
new file mode 100644
index 0000000000..02b23a581c
--- /dev/null
+++ b/packages/web/src/entrypoints/universal.ts
@@ -0,0 +1,8 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+export * from './production';
+import { TolgeeInstance } from '@tolgee/core';
+
+export const DevTools =
+  process.env.NODE_ENV === 'production'
+    ? () => (tolgee: TolgeeInstance) => tolgee
+    : require('../dist/tolgee-in-context-tools.umd').InContextTools;
diff --git a/packages/web/src/index.ts b/packages/web/src/index.ts
deleted file mode 100644
index dc4a9bd303..0000000000
--- a/packages/web/src/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from './ContextUi';
-export * from './DevTools';
-export * from './InContextTools';
-export * from './typedIndex';
-export {
-  PREFERRED_LANGUAGES_LOCAL_STORAGE_KEY,
-  DEVTOOLS_ID,
-} from './constants';
diff --git a/packages/web/tools/package.json b/packages/web/tools/package.json
new file mode 100644
index 0000000000..58402af0ee
--- /dev/null
+++ b/packages/web/tools/package.json
@@ -0,0 +1,6 @@
+{
+  "internal": true,
+  "main": "../dist/tolgee-in-context-tools.cjs.js",
+  "module": "../dist/tolgee-in-context-tools.cjs.js",
+  "types": "../types/tools.d.ts"
+}
diff --git a/packages/web/tsconfig.prod.json b/packages/web/tsconfig.prod.json
index 9e9fb9592a..bab0a73d7a 100644
--- a/packages/web/tsconfig.prod.json
+++ b/packages/web/tsconfig.prod.json
@@ -1,4 +1,4 @@
 {
   "extends": "./tsconfig",
-  "include": ["src/index.ts"]
+  "exclude": ["src/__test__"]
 }
diff --git a/packages/web/types/index.d.ts b/packages/web/types/index.d.ts
index 42b0a82b09..dd0729fa03 100644
--- a/packages/web/types/index.d.ts
+++ b/packages/web/types/index.d.ts
@@ -1,10 +1,6 @@
-import type { TolgeePlugin, DevCredentials } from '@tolgee/core';
+import type { TolgeePlugin } from '@tolgee/core';
 import type { InContextOptions } from '../lib/types';
 
-export declare const ContextUi: () => TolgeePlugin;
-export declare const InContextTools: (
-  options?: InContextOptions
-) => TolgeePlugin;
-export declare const DevTools: typeof InContextTools;
+export declare const DevTools: (options?: InContextOptions) => TolgeePlugin;
 
 export * from '../lib/typedIndex';
diff --git a/packages/web/types/tools.d.ts b/packages/web/types/tools.d.ts
new file mode 100644
index 0000000000..1532f2f6b4
--- /dev/null
+++ b/packages/web/types/tools.d.ts
@@ -0,0 +1,7 @@
+import type { TolgeePlugin } from '@tolgee/core';
+import type { InContextOptions } from '../lib/types';
+
+export declare const ContextUi: () => TolgeePlugin;
+export declare const InContextTools: (
+  options?: InContextOptions
+) => TolgeePlugin;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 60142c7f13..d655aff463 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -573,7 +573,8 @@ importers:
 
   testapps/next-internal:
     specifiers:
-      '@tolgee/react': 5.1.0
+      '@tolgee/react': 5.0.1
+      '@tolgee/web': 5.0.1
       '@types/react': 17.0.20
       eslint: 7.32.0
       eslint-config-next: 12.0.2
@@ -582,7 +583,8 @@ importers:
       react-dom: 17.0.2
       typescript: 4.7.4
     dependencies:
-      '@tolgee/react': link:../../packages/react
+      '@tolgee/react': 5.0.1_react@17.0.2
+      '@tolgee/web': link:../../packages/web
       next: 12.2.3_sfoxds7t5ydpegc3knd667wn6m
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
@@ -8589,6 +8591,25 @@ packages:
     resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==}
     dev: false
 
+  /@tolgee/core/5.0.0:
+    resolution: {integrity: sha512-TaxeLN1WxY0gQ3mo68ZnQv/NaCXyQKBTW3Bv2cRP5Craz4HHVF1Q6Sc8FoOCm9K/3jvuX7MD72czQk6Jq4/v+Q==}
+    dev: false
+
+  /@tolgee/react/5.0.1_react@17.0.2:
+    resolution: {integrity: sha512-2RHqqinpVyWBx2zSJCutkjbx9evSY04+BTKTl+LS5ld6VjfHDB5NwCVO+4hwOHax0zV9aULD9Q2eRJQXpSmpYQ==}
+    peerDependencies:
+      react: ^16.14.0 || ^17.0.1 || ^18.1.0
+    dependencies:
+      '@tolgee/web': 5.0.1
+      react: 17.0.2
+    dev: false
+
+  /@tolgee/web/5.0.1:
+    resolution: {integrity: sha512-zTjF96T/M8oZ84jsNMyaGI9uI+26Qm8k/HBSp7mx9KI7k6BnRwrsBC6kadfXOAJ66ckrC2pgRPhkzrFqtLpgUA==}
+    dependencies:
+      '@tolgee/core': 5.0.0
+    dev: false
+
   /@tootallnate/once/1.1.2:
     resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
     engines: {node: '>= 6'}
diff --git a/scripts/packages.test.ts b/scripts/packages.test.ts
index a70d1b77bb..5397aa855e 100644
--- a/scripts/packages.test.ts
+++ b/scripts/packages.test.ts
@@ -24,6 +24,20 @@ const assertFileExists = (dir, filePath, message) => {
 
 const checkedPackages = [];
 
+const checkExports = (folder, exports: any, keyPath = ['exports']) => {
+  Object.entries(exports || {}).forEach(([key, target]) => {
+    if (typeof target === 'string') {
+      assertFileExists(
+        folder,
+        target,
+        path.join(keyPath.join('.'), key).replace('/', '.')
+      );
+    } else if (typeof target === 'object') {
+      checkExports(folder, exports[key] || {}, [...keyPath, key]);
+    }
+  });
+};
+
 const checkPackage = (filePath) => {
   const folder = path.dirname(filePath);
   const f = JSON.parse(fs.readFileSync(filePath).toString());
@@ -32,6 +46,8 @@ const checkPackage = (filePath) => {
     return;
   }
 
+  const isInternal = f.internal === true;
+
   if (f.publishConfig?.directory) {
     describe(`${f.name} -> ${f.publishConfig.directory}`, () => {
       assertFileExists(folder, f.publishConfig.directory, 'exists');
@@ -50,10 +66,12 @@ const checkPackage = (filePath) => {
     return;
   }
 
-  describe(f.name, () => {
-    assertExpr(f.name.startsWith('@tolgee/'), 'Has correct name');
-    assertExpr(f.publishConfig?.access, 'Is public');
-    assertExpr(f.main || f.module || f.exports, 'Has entry point');
+  describe(f.name || `${folder}/package.json`, () => {
+    if (!isInternal) {
+      assertExpr(f.name?.startsWith('@tolgee/'), 'Has correct name');
+      assertExpr(f.publishConfig?.access, 'Is public');
+      assertExpr(f.main || f.module || f.exports, 'Has entry point');
+    }
     assertFileExists(folder, f.main, 'main');
     assertFileExists(folder, f.module, 'module');
     if (f.module) {
@@ -61,13 +79,7 @@ const checkPackage = (filePath) => {
       assertExpr(f.module.endsWith('.js'), ' - module ends with .js');
     }
     assertFileExists(folder, f.types, 'types');
-    Object.entries(f.exports || {}).forEach(([key, target]) => {
-      assertFileExists(
-        folder,
-        target,
-        path.join('exports', key).replace('/', '.')
-      );
-    });
+    checkExports(folder, f.exports || {});
 
     assertFileExists(
       folder,
@@ -77,7 +89,9 @@ const checkPackage = (filePath) => {
   });
 };
 
-const files = searchRecursively('./packages', 'package.json', [], 4);
-files.forEach((filePath) => {
-  checkPackage(filePath);
+describe('check package.json files', () => {
+  const files = searchRecursively('./packages', 'package.json', [], 4);
+  files.forEach((filePath) => {
+    checkPackage(filePath);
+  });
 });
diff --git a/scripts/testapps.test.ts b/scripts/testapps.test.ts
new file mode 100644
index 0000000000..4dc245b870
--- /dev/null
+++ b/scripts/testapps.test.ts
@@ -0,0 +1,46 @@
+import fs from 'fs';
+import { join } from 'path';
+import { readdirSync } from 'fs';
+import { expect } from '@jest/globals';
+
+import { CHROME_EXTENSION_LINK } from '../packages/web/src/constants';
+
+function getFiles(dir: string): string[] {
+  const dirents = readdirSync(dir, { withFileTypes: true });
+  const files = dirents.map((dirent) => {
+    const res = join(dir, dirent.name);
+    return dirent.isDirectory() ? getFiles(res) : res;
+  });
+  return Array.prototype.concat(...files);
+}
+
+const checkBuildFile = (filePath: string) => {
+  const file = fs.readFileSync(filePath).toString();
+  it(`DevTools not in ${filePath}`, () => {
+    expect(file.includes(CHROME_EXTENSION_LINK)).toBeFalsy();
+  });
+};
+
+const buildFolders = [
+  './testapps/react/build',
+  './testapps/vue/dist',
+  './testapps/svelte/build',
+  './testapps/ngx/dist',
+  './testapps/react-i18next/build',
+  './testapps/vue-i18next/dist',
+  './testapps/gatsby/public',
+  './testapps/next/.next',
+  // next-internal uses InContextTools so it is there
+  // './testapps/next-internal/.next'
+];
+
+describe('testapps ommit dev tools', () => {
+  buildFolders.forEach((folder) => {
+    describe(`checking ${folder}`, () => {
+      const jsFiles = getFiles(folder).filter((f) => f.endsWith('js'));
+      jsFiles.forEach((filePath) => {
+        checkBuildFile(filePath);
+      });
+    });
+  });
+});
diff --git a/testapps/next-internal/package.json b/testapps/next-internal/package.json
index 74ff0f3a48..a170112223 100644
--- a/testapps/next-internal/package.json
+++ b/testapps/next-internal/package.json
@@ -11,7 +11,8 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@tolgee/react": "5.1.0",
+    "@tolgee/react": "5.0.1",
+    "@tolgee/web": "5.0.1",
     "next": "12.2.3",
     "react": "17.0.2",
     "react-dom": "17.0.2"
diff --git a/testapps/next-internal/pages/index.tsx b/testapps/next-internal/pages/index.tsx
index 168bbc53aa..a1ced7682c 100644
--- a/testapps/next-internal/pages/index.tsx
+++ b/testapps/next-internal/pages/index.tsx
@@ -1,15 +1,14 @@
 import type { NextPage } from 'next';
 import Head from 'next/head';
-import { DevTools, T, Tolgee } from '@tolgee/react';
-import enLocale from '../i18n/en.json';
-import deLocale from '../i18n/de.json';
+import { useState, useEffect } from 'react';
+import { T, Tolgee, TolgeeProvider } from '@tolgee/react';
+import { InContextTools } from '@tolgee/web/tools';
 import { useRouter } from 'next/router';
-import { TolgeeProvider } from '@tolgee/react';
 
+import enLocale from '../i18n/en.json';
+import deLocale from '../i18n/de.json';
 import styles from '../styles/Home.module.css';
 import LocaleSwitcher from '../component/LanguageSwitcher';
-import { useState } from 'react';
-import { useEffect } from 'react';
 
 const Home: NextPage = () => {
   const { locale: activeLocale } = useRouter();
@@ -21,7 +20,7 @@ const Home: NextPage = () => {
 
   const [tolgee] = useState(
     Tolgee()
-      .use(DevTools())
+      .use(InContextTools())
       .init({
         language: activeLocale,
         apiKey: apiKey,
diff --git a/testapps/svelte/vite.config.js.timestamp-1667832086974.mjs b/testapps/svelte/vite.config.js.timestamp-1667832086974.mjs
deleted file mode 100644
index 3c04cc5d1d..0000000000
--- a/testapps/svelte/vite.config.js.timestamp-1667832086974.mjs
+++ /dev/null
@@ -1,10 +0,0 @@
-// vite.config.js
-import { sveltekit } from "@sveltejs/kit/vite";
-var config = {
-  plugins: [sveltekit()]
-};
-var vite_config_default = config;
-export {
-  vite_config_default as default
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcuanMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvVXNlcnMvc3RlcGFuZ3JhbmF0L1Byb2plY3RzL3RvbGdlZS90b2xnZWUtanMvdGVzdGFwcHMvc3ZlbHRlXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCIvVXNlcnMvc3RlcGFuZ3JhbmF0L1Byb2plY3RzL3RvbGdlZS90b2xnZWUtanMvdGVzdGFwcHMvc3ZlbHRlL3ZpdGUuY29uZmlnLmpzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9zdGVwYW5ncmFuYXQvUHJvamVjdHMvdG9sZ2VlL3RvbGdlZS1qcy90ZXN0YXBwcy9zdmVsdGUvdml0ZS5jb25maWcuanNcIjtpbXBvcnQgeyBzdmVsdGVraXQgfSBmcm9tICdAc3ZlbHRlanMva2l0L3ZpdGUnO1xuXG4vKiogQHR5cGUge2ltcG9ydCgndml0ZScpLlVzZXJDb25maWd9ICovXG5jb25zdCBjb25maWcgPSB7XG4gIHBsdWdpbnM6IFtzdmVsdGVraXQoKV0sXG59O1xuXG5leHBvcnQgZGVmYXVsdCBjb25maWc7XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQXlXLFNBQVMsaUJBQWlCO0FBR25ZLElBQU0sU0FBUztBQUFBLEVBQ2IsU0FBUyxDQUFDLFVBQVUsQ0FBQztBQUN2QjtBQUVBLElBQU8sc0JBQVE7IiwKICAibmFtZXMiOiBbXQp9Cg==
diff --git a/testapps/web/apps/base/index.js b/testapps/web/apps/base/index.js
index 86c3984d02..21a760e59a 100644
--- a/testapps/web/apps/base/index.js
+++ b/testapps/web/apps/base/index.js
@@ -1,14 +1,13 @@
-import * as umd from '../../node_modules/@tolgee/web/dist/tolgee-web.main.umd';
-import * as commonjs from '../../node_modules/@tolgee/web/dist/tolgee-web.main.cjs';
-import { BackendFetch, InContextTools } from '@tolgee/web';
+import * as umd from '../../node_modules/@tolgee/web/dist/tolgee-web.development.umd';
+import * as commonjs from '../../node_modules/@tolgee/web/dist/tolgee-web.development.cjs';
 
 [umd, commonjs].forEach((bundle) => {
   const bundleDivElement = document.createElement('div');
 
   const tolgee = bundle
     .Tolgee()
-    .use(InContextTools())
-    .use(BackendFetch({ prefix: 'i18n' }))
+    .use(bundle.DevTools())
+    .use(bundle.BackendFetch({ prefix: 'i18n' }))
     .init({
       defaultLanguage: 'en',
       observerType: 'text',
diff --git a/testapps/web/apps/production/index.js b/testapps/web/apps/production/index.js
index b5906fc5c8..c783e4fee6 100644
--- a/testapps/web/apps/production/index.js
+++ b/testapps/web/apps/production/index.js
@@ -1,4 +1,5 @@
-import { Tolgee, BackendFetch, InContextTools } from '@tolgee/web';
+import { Tolgee, BackendFetch } from '@tolgee/web';
+import { InContextTools } from '@tolgee/web/tools';
 import { FormatIcu } from '@tolgee/format-icu';
 
 document.body = document.createElement('body');