diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9df49f23c..ada893335 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@
 
 ### Others
 
-- utils: v4.10.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/main/utils/utils/CHANGELOG.md))
+- utils: v5.0.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/main/utils/utils/CHANGELOG.md))
 
 <a name="5.2.0"></a>
 
diff --git a/package-lock.json b/package-lock.json
index cd7f5ef2c..12069fc91 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11856,7 +11856,7 @@
     },
     "utils/utils": {
       "name": "@deckdeckgo/utils",
-      "version": "4.0.0",
+      "version": "5.0.0",
       "license": "MIT",
       "devDependencies": {
         "@types/node": "^16.9.0"
@@ -11987,7 +11987,7 @@
     },
     "webcomponents/markdown": {
       "name": "@deckdeckgo/markdown",
-      "version": "2.1.0",
+      "version": "2.1.1",
       "license": "MIT",
       "dependencies": {
         "marked": "^4.0.10"
diff --git a/providers/ic/src/canisters/manager/manager.did b/providers/ic/src/canisters/manager/manager.did
index b23ead711..487187b2d 100644
--- a/providers/ic/src/canisters/manager/manager.did
+++ b/providers/ic/src/canisters/manager/manager.did
@@ -1,4 +1,3 @@
-type UserId__1 = principal;
 type UserId = principal;
 type BucketId = principal;
 type Bucket = 
@@ -13,6 +12,6 @@ service : {
   getStorage: () -> (opt Bucket) query;
   initData: () -> (Bucket);
   initStorage: () -> (Bucket);
-  installCode: (principal, UserId__1, blob) -> ();
+  installCode: (principal, blob, blob) -> ();
   list: (text) -> (vec Bucket) query;
 }
diff --git a/providers/ic/src/canisters/manager/manager.did.d.ts b/providers/ic/src/canisters/manager/manager.did.d.ts
index 8f7da73c3..c60762f5e 100644
--- a/providers/ic/src/canisters/manager/manager.did.d.ts
+++ b/providers/ic/src/canisters/manager/manager.did.d.ts
@@ -5,7 +5,6 @@ export interface Bucket {
 }
 export type BucketId = Principal;
 export type UserId = Principal;
-export type UserId__1 = Principal;
 export interface _SERVICE {
   delData: () => Promise<boolean>;
   delStorage: () => Promise<boolean>;
@@ -13,6 +12,6 @@ export interface _SERVICE {
   getStorage: () => Promise<[] | [Bucket]>;
   initData: () => Promise<Bucket>;
   initStorage: () => Promise<Bucket>;
-  installCode: (arg_0: Principal, arg_1: UserId__1, arg_2: Array<number>) => Promise<undefined>;
+  installCode: (arg_0: Principal, arg_1: Array<number>, arg_2: Array<number>) => Promise<undefined>;
   list: (arg_0: string) => Promise<Array<Bucket>>;
 }
diff --git a/providers/ic/src/canisters/manager/manager.utils.did.js b/providers/ic/src/canisters/manager/manager.utils.did.js
index 18b14d1be..411b88496 100644
--- a/providers/ic/src/canisters/manager/manager.utils.did.js
+++ b/providers/ic/src/canisters/manager/manager.utils.did.js
@@ -5,7 +5,6 @@ export const idlFactory = ({IDL}) => {
     owner: UserId,
     bucketId: IDL.Opt(BucketId)
   });
-  const UserId__1 = IDL.Principal;
   return IDL.Service({
     delData: IDL.Func([], [IDL.Bool], []),
     delStorage: IDL.Func([], [IDL.Bool], []),
@@ -13,7 +12,7 @@ export const idlFactory = ({IDL}) => {
     getStorage: IDL.Func([], [IDL.Opt(Bucket)], ['query']),
     initData: IDL.Func([], [Bucket], []),
     initStorage: IDL.Func([], [Bucket], []),
-    installCode: IDL.Func([IDL.Principal, UserId__1, IDL.Vec(IDL.Nat8)], [], []),
+    installCode: IDL.Func([IDL.Principal, IDL.Vec(IDL.Nat8), IDL.Vec(IDL.Nat8)], [], []),
     list: IDL.Func([IDL.Text], [IDL.Vec(Bucket)], ['query'])
   });
 };
diff --git a/utils/utils/CHANGELOG.md b/utils/utils/CHANGELOG.md
index a2f40ae8c..b4835f1ac 100644
--- a/utils/utils/CHANGELOG.md
+++ b/utils/utils/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 5.0.0 (2022-01-08)
+
+### Build
+
+- output esm chunks
+- re-organize bundle structure in separate folders
+
 # 4.0.0 (2022-01-08)
 
 ### Build
diff --git a/utils/utils/esbuild.js b/utils/utils/esbuild.js
index be42f6848..aa32e9625 100644
--- a/utils/utils/esbuild.js
+++ b/utils/utils/esbuild.js
@@ -1,9 +1,19 @@
 const esbuild = require('esbuild');
+const {readdirSync, existsSync, mkdirSync, writeFileSync} = require('fs');
+const {join} = require('path');
+
+const lib = join(process.cwd(), 'lib');
+
+if (!existsSync(lib)) {
+  mkdirSync(lib);
+}
+
+const entryPoints = readdirSync(join(process.cwd(), 'src')).map((file) => `src/${file}`);
 
 esbuild
   .build({
-    entryPoints: ['src/index.ts'],
-    outdir: 'lib',
+    entryPoints,
+    outdir: 'lib/esm',
     bundle: true,
     sourcemap: true,
     minify: true,
@@ -16,7 +26,7 @@ esbuild
 esbuild
   .build({
     entryPoints: ['src/index.ts'],
-    outfile: 'lib/index.cjs.js',
+    outfile: 'lib/cjs/index.cjs.js',
     bundle: true,
     sourcemap: true,
     minify: true,
@@ -24,3 +34,7 @@ esbuild
     target: ['node16']
   })
   .catch(() => process.exit(1));
+
+writeFileSync(join(lib, 'index.js'), "export * from './esm/index.js';");
+
+writeFileSync(join(lib, 'index.cjs.js'), "module.exports = require('./cjs/index.cjs.js');");
diff --git a/utils/utils/package.json b/utils/utils/package.json
index f4613b50e..bc81c3390 100644
--- a/utils/utils/package.json
+++ b/utils/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@deckdeckgo/utils",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "author": "David Dal Busco",
   "description": "A collection of utils methods and functions developed for DeckDeckGo",
   "license": "MIT",
@@ -13,11 +13,11 @@
   "devDependencies": {
     "@types/node": "^16.9.0"
   },
-  "main": "lib/index.cjs.js",
-  "module": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "main": "lib/cjs/index.cjs.js",
+  "module": "lib/esm/index.js",
+  "types": "lib/types/index.d.ts",
   "scripts": {
-    "ts-declaration": " tsc --emitDeclarationOnly --outDir lib",
+    "ts-declaration": " tsc --emitDeclarationOnly --outDir lib/types",
     "build": "rimraf lib && node ./esbuild.js && npm run ts-declaration"
   },
   "files": [
diff --git a/utils/utils/src/utils/color.utils.ts b/utils/utils/src/color.utils.ts
similarity index 100%
rename from utils/utils/src/utils/color.utils.ts
rename to utils/utils/src/color.utils.ts
diff --git a/utils/utils/src/utils/editable.utils.ts b/utils/utils/src/editable.utils.ts
similarity index 100%
rename from utils/utils/src/utils/editable.utils.ts
rename to utils/utils/src/editable.utils.ts
diff --git a/utils/utils/src/utils/image.utils.ts b/utils/utils/src/image.utils.ts
similarity index 100%
rename from utils/utils/src/utils/image.utils.ts
rename to utils/utils/src/image.utils.ts
diff --git a/utils/utils/src/index.ts b/utils/utils/src/index.ts
index dd960ee53..894410398 100644
--- a/utils/utils/src/index.ts
+++ b/utils/utils/src/index.ts
@@ -1,6 +1,6 @@
-export * from './utils/utils';
-export * from './utils/image.utils';
-export * from './utils/inject.utils';
-export * from './utils/color.utils';
-export * from './utils/selection.utils';
-export * from './utils/editable.utils';
+export * from './utils';
+export * from './image.utils';
+export * from './inject.utils';
+export * from './color.utils';
+export * from './selection.utils';
+export * from './editable.utils';
diff --git a/utils/utils/src/utils/inject.utils.ts b/utils/utils/src/inject.utils.ts
similarity index 100%
rename from utils/utils/src/utils/inject.utils.ts
rename to utils/utils/src/inject.utils.ts
diff --git a/utils/utils/src/utils/selection.utils.ts b/utils/utils/src/selection.utils.ts
similarity index 100%
rename from utils/utils/src/utils/selection.utils.ts
rename to utils/utils/src/selection.utils.ts
diff --git a/utils/utils/src/utils/utils.ts b/utils/utils/src/utils.ts
similarity index 100%
rename from utils/utils/src/utils/utils.ts
rename to utils/utils/src/utils.ts