diff --git a/Gruntfile.js b/Gruntfile.js
index 652d4d0f24..605966f08f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -48,16 +48,9 @@ module.exports = grunt => {
     let bundleFileMap = {
         'client/lib/espo-libs.min.js': buildUtils.getPreparedBundleLibList(libs),
         'client/lib/espo-templates.min.js': 'client/lib/original/espo-templates.js',
-        'client/lib/espo-layout-templates.min.js': 'client/lib/original/espo-layout-templates.js',
+        'client/lib/espo.min.js': originalLibDir + `/espo.js`,
     };
 
-    for (let i = 0; i < bundleConfig.chunkNumber; i++) {
-        let bundleFile = originalLibDir + `/espo-${i}.js`;
-        let minFile = `client/lib/espo-${i}.min.js`;
-
-        bundleFileMap[minFile] = [bundleFile];
-    }
-
     let copyJsFileList = buildUtils.getCopyLibDataList(libs);
 
     let minifyLibFileList = copyJsFileList
@@ -268,27 +261,15 @@ module.exports = grunt => {
             files: bundleConfig.files,
             patterns: bundleConfig.patterns,
             allPatterns: ['client/src/**/*.js'],
-            chunkNumber: bundleConfig.chunkNumber,
             libs: libs,
         });
 
-        if (!fs.existsSync(originalLibDir)) {
-            fs.mkdirSync(originalLibDir);
-        }
+        let contents = chunks[0] + '\n' +
+            (new LayoutTypeBundler()).bundle();
 
-        chunks.forEach((chunk, i) => {
-            let file = originalLibDir + `/espo-${i}.js`;
+        let file = originalLibDir + `/espo.js`;
 
-            fs.writeFileSync(file, chunk, 'utf8');
-        });
-    });
-
-    grunt.registerTask('bundle-layout-templates', () => {
-        let content = (new LayoutTypeBundler()).bundle();
-
-        let file = originalLibDir + `/espo-layout-templates.js`;
-
-        fs.writeFileSync(file, content, 'utf8');
+        fs.writeFileSync(file, contents, 'utf8');
     });
 
     grunt.registerTask('template-precompile', () => {
@@ -489,7 +470,6 @@ module.exports = grunt => {
         'less',
         'cssmin',
         'bundle-espo',
-        'bundle-layout-templates',
         'template-precompile',
         'prepare-lib-original',
         'uglify:bundle',
diff --git a/application/Espo/Resources/metadata/app/client.json b/application/Espo/Resources/metadata/app/client.json
index e40c4e8402..68c3e1b2e9 100644
--- a/application/Espo/Resources/metadata/app/client.json
+++ b/application/Espo/Resources/metadata/app/client.json
@@ -1,10 +1,7 @@
 {
     "scriptList": [
         "client/lib/espo-libs.min.js",
-        "client/lib/espo-0.min.js",
-        "client/lib/espo-1.min.js",
-        "client/lib/espo-2.min.js",
-        "client/lib/espo-layout-templates.min.js",
+        "client/lib/espo.min.js",
         "client/lib/espo-templates.min.js"
     ],
     "developerModeScriptList": [
diff --git a/frontend/bundle-config.json b/frontend/bundle-config.json
index 619086c069..408825403d 100644
--- a/frontend/bundle-config.json
+++ b/frontend/bundle-config.json
@@ -55,6 +55,5 @@
         "client/res/templates/fields/user-with-avatar/*.tpl",
         "client/res/templates/fields/varchar/*.tpl",
         "client/res/templates/fields/wysiwyg/*.tpl"
-    ],
-    "chunkNumber": 3
+    ]
 }
diff --git a/frontend/test/jasmine-browser.json b/frontend/test/jasmine-browser.json
index 115261e70c..c5314f84ca 100644
--- a/frontend/test/jasmine-browser.json
+++ b/frontend/test/jasmine-browser.json
@@ -2,10 +2,7 @@
     "srcDir": ".",
     "srcFiles": [
         "client/lib/espo-libs.min.js",
-        "client/lib/espo-0.min.js",
-        "client/lib/espo-1.min.js",
-        "client/lib/espo-2.min.js",
-        "client/src/collection.js"
+        "client/lib/espo.min.js"
     ],
     "specDir": "frontend/test/spec",
     "specFiles": [
diff --git a/js/bundler.js b/js/bundler.js
index 04a3ea9e30..836972eb01 100644
--- a/js/bundler.js
+++ b/js/bundler.js
@@ -51,7 +51,7 @@ class Bundler {
      *   files: string[],
      *   patterns: string[],
      *   allPatterns: string[],
-     *   chunkNumber: number,
+     *   chunkNumber?: number,
      *   libs: {
      *     src?: string,
      *     bundle?: boolean,
@@ -61,6 +61,8 @@ class Bundler {
      * @return {string[]}
      */
     bundle(params) {
+        let chunkNumber = params.chunkNumber || 1;
+
         let files = []
             .concat(params.files)
             .concat(this.#obtainFiles(params.patterns, params.files));
@@ -74,10 +76,10 @@ class Bundler {
         let sortedFiles = this.#sortFiles(files, allFiles, ignoreLibs);
 
         let portions = [];
-        let portionSize = Math.floor(sortedFiles.length / params.chunkNumber);
+        let portionSize = Math.floor(sortedFiles.length / chunkNumber);
 
-        for (let i = 0; i < params.chunkNumber; i++) {
-            let end = i === params.chunkNumber - 1 ?
+        for (let i = 0; i < chunkNumber; i++) {
+            let end = i === chunkNumber - 1 ?
                 sortedFiles.length :
                 (i + 1) * portionSize;
 
diff --git a/js/diff.js b/js/diff.js
index ae7b9eeaa3..31d0222f72 100644
--- a/js/diff.js
+++ b/js/diff.js
@@ -34,8 +34,6 @@ const buildUtils = require('./build-utils');
 
 const exec = cp.exec;
 
-const bundleConfig = require('./../frontend/bundle-config.json');
-
 /**
  * Builds upgrade packages.
  */
@@ -283,15 +281,8 @@ class Diff
 
             fileList.push('client/lib/espo-libs.min.js');
             fileList.push('client/lib/espo-libs.min.js.map');
-
-            for (let i = 0; i < bundleConfig.chunkNumber; i++) {
-                fileList.push(`client/lib/espo-${i}.min.js`);
-                fileList.push(`client/lib/espo-${i}.min.js.map`);
-            }
-
-            fileList.push('client/lib/espo-layout-templates.min.js');
-            fileList.push('client/lib/espo-layout-templates.min.js.map');
-
+            fileList.push(`client/lib/espo.min.js`);
+            fileList.push(`client/lib/espo.min.js.map`);
             fileList.push('client/lib/espo-templates.min.js');
             fileList.push('client/lib/espo-templates.min.js.map');
 
diff --git a/js/scripts/prepare-lib-original.js b/js/scripts/prepare-lib-original.js
index 49bab38679..303da92743 100644
--- a/js/scripts/prepare-lib-original.js
+++ b/js/scripts/prepare-lib-original.js
@@ -30,7 +30,6 @@ const fs = require('fs');
 const buildUtils = require('../build-utils');
 
 const libs = require('./../../frontend/libs.json');
-const bundleConfig = require('./../../frontend/bundle-config.json');
 
 const libDir = './client/lib';
 const originalLibDir = './client/lib/original';
@@ -43,13 +42,9 @@ const originalLibCrmDir = './client/modules/crm/lib/original';
 
 let bundleFiles = [
     'espo-templates.js',
-    'espo-layout-templates.js',
+    'espo.js',
 ];
 
-for (let i = 0; i < bundleConfig.chunkNumber; i++) {
-    bundleFiles.push(`espo-${i}.js`)
-}
-
 fs.readdirSync(originalLibDir)
     .filter(file => !bundleFiles.includes(file))
     .forEach(file => fs.unlinkSync(originalLibDir + '/' + file));
diff --git a/upgrades/7.6/data.json b/upgrades/7.6/data.json
index e302b05a80..ba084e8c67 100644
--- a/upgrades/7.6/data.json
+++ b/upgrades/7.6/data.json
@@ -2,8 +2,6 @@
     "manifest": {
         "delete": [
             "client/lib/original/espo.js",
-            "client/lib/espo.min.js",
-            "client/lib/espo.min.js.map",
             "client/lib/original/espo.js",
             "client/cfg/pre-load.json"
         ]