diff --git a/.config/vitest.config.ts b/.config/vitest.config.ts
index 8ecdc7f32..37abf8271 100644
--- a/.config/vitest.config.ts
+++ b/.config/vitest.config.ts
@@ -31,6 +31,7 @@ export default defineConfig({
   },
   resolve: {
     alias: {
+      '~': path.resolve(process.cwd(), './src'),
       '@': path.resolve(process.cwd(), './src'),
       'src': path.resolve(process.cwd(), './src'),
       'assets': path.resolve(process.cwd(), './src/assets'),
diff --git a/docs/es-modules/adaptive-streaming.html b/docs/es-modules/adaptive-streaming.html
index ace1a0428..0f7640dc0 100644
--- a/docs/es-modules/adaptive-streaming.html
+++ b/docs/es-modules/adaptive-streaming.html
@@ -107,8 +107,6 @@ <h4>HLS with highQuality</h4>
 
     <script type="module">
       import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/dash';
-      import 'cloudinary-video-player/adaptive-streaming';
       import 'cloudinary-video-player/cld-video-player.min.css';
 
       const cldConfig = { 
@@ -118,12 +116,12 @@ <h4>HLS with highQuality</h4>
       };
 
       const uap = new UAParser(navigator.userAgent);
-      const playerHls = cloudinary.videoPlayer('example-player-hls', cldConfig);
-      const playerHlsH265 = cloudinary.videoPlayer('example-player-hls-h265', cldConfig);
-      const playerDash = cloudinary.videoPlayer('example-player-dash', cldConfig);
-      const playerDashVp9 = cloudinary.videoPlayer('example-player-dash-vp9', cldConfig);
-      const playerFastStart = cloudinary.videoPlayer('example-player-fast-start', cldConfig);
-      const playerHighQuality = cloudinary.videoPlayer('example-player-high-quality', cldConfig);
+      const playerHls = videoPlayer('example-player-hls', cldConfig);
+      const playerHlsH265 = videoPlayer('example-player-hls-h265', cldConfig);
+      const playerDash = videoPlayer('example-player-dash', cldConfig);
+      const playerDashVp9 = videoPlayer('example-player-dash-vp9', cldConfig);
+      const playerFastStart = videoPlayer('example-player-fast-start', cldConfig);
+      const playerHighQuality = videoPlayer('example-player-high-quality', cldConfig);
       
       playerHls.source(
         'sea_turtle',
diff --git a/docs/es-modules/api.html b/docs/es-modules/api.html
index f6a9a711d..407cc25f7 100644
--- a/docs/es-modules/api.html
+++ b/docs/es-modules/api.html
@@ -69,7 +69,7 @@ <h3 class="mb-4">API and Events</h3>
 
     <script type="module">
       import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/playlist';
+
 
       import 'cloudinary-video-player/cld-video-player.min.css';
 
diff --git a/docs/es-modules/chapters.html b/docs/es-modules/chapters.html
index 06c01731e..13b97e29d 100644
--- a/docs/es-modules/chapters.html
+++ b/docs/es-modules/chapters.html
@@ -65,8 +65,6 @@ <h4 class="mb-4">From an automatically taken VTT file</h4>
 
     <script type="module">
       import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/chapters';
-
       import 'cloudinary-video-player/cld-video-player.min.css';
 
       const playerVTT = videoPlayer('player-vtt', {
diff --git a/docs/es-modules/colors.html b/docs/es-modules/colors.html
index dd5f68d2a..6b5ca450d 100644
--- a/docs/es-modules/colors.html
+++ b/docs/es-modules/colors.html
@@ -64,7 +64,7 @@ <h3 class="text-primary">Player 3</h3>
 
     <script type="module">
       import { videoPlayers } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/colors';
+
       import 'cloudinary-video-player/cld-video-player.min.css';
 
       const players = videoPlayers('.cld-video-player', {
diff --git a/docs/es-modules/components.html b/docs/es-modules/components.html
index 75eff2a2a..10c531237 100644
--- a/docs/es-modules/components.html
+++ b/docs/es-modules/components.html
@@ -57,14 +57,11 @@ <h2>Custom Components</h2>
     </div>
 
     <script type="module">
-      import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/playlist';
-
+      import { videoPlayer, videojs } from 'cloudinary-video-player';
       import 'cloudinary-video-player/cld-video-player.min.css';
 
       // Get the ClickableComponent base class from Video.js
-      let vjs = window.videojs.default || window.videojs;
-      const ClickableComponent = vjs.getComponent('ClickableComponent');
+      const ClickableComponent = videojs.getComponent('ClickableComponent');
 
       // Create a common class for playlist buttons
       class PlaylistButton extends ClickableComponent {
@@ -83,7 +80,7 @@ <h2>Custom Components</h2>
 
           const typeCssClass = 'vjs-playlist-' + type + '-control';
 
-          return vjs.createEl('button', {
+          return videojs.createEl('button', {
             // Prefixing classes of elements within a player with "vjs-"
             // is a convention used in Video.js.
             className: 'vjs-control vjs-playlist-control vjs-button ' + typeCssClass
@@ -119,8 +116,8 @@ <h2>Custom Components</h2>
       }
 
       // Register the component with Video.js, so it can be used in players.
-      vjs.registerComponent('NextButton', NextButton);
-      vjs.registerComponent('PreviousButton', PreviousButton);
+      videojs.registerComponent('NextButton', NextButton);
+      videojs.registerComponent('PreviousButton', PreviousButton);
 
       // Cloudinary Video Player related code
       // ====================================
diff --git a/docs/es-modules/debug.html b/docs/es-modules/debug.html
index 9313f83f7..bc40548f8 100644
--- a/docs/es-modules/debug.html
+++ b/docs/es-modules/debug.html
@@ -39,7 +39,7 @@ <h3 class="mb-4">Debug mode</h3>
 
     <script type="module">
       import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/debug';
+
       import 'cloudinary-video-player/cld-video-player.min.css';
 
       const player = cloudinary.videoPlayer('player', {
diff --git a/docs/es-modules/interaction-area.html b/docs/es-modules/interaction-area.html
index b33674b81..0b27a3818 100644
--- a/docs/es-modules/interaction-area.html
+++ b/docs/es-modules/interaction-area.html
@@ -86,7 +86,7 @@ <h3>Auto-zoom video cropping</h3>
 
     <script type="module">
       import cloudinary from 'cloudinary-video-player/all';
-      import 'cloudinary-video-player/interaction-areas';
+
 
       import 'cloudinary-video-player/cld-video-player.min.css';
 
diff --git a/docs/es-modules/package.json b/docs/es-modules/package.json
index e4b21064f..498fa587c 100644
--- a/docs/es-modules/package.json
+++ b/docs/es-modules/package.json
@@ -3,8 +3,8 @@
   "private": true,
   "version": "0.0.1",
   "scripts": {
-    "prepare-player": "cd ../../ && npm i && npm run build-all",
-    "install-player": "npm i ../../ --no-save",
+    "prepare-player": "cd ../.. && npm i && npm run build-es",
+    "install-player": "npm i ../.. --no-save",
     "prepare": "npm run prepare-player && npm run install-player",
     "update-edge": "npm i",
     "start": "vite",
diff --git a/docs/es-modules/playlist-by-tag.html b/docs/es-modules/playlist-by-tag.html
index 35a919ce7..318a9d240 100644
--- a/docs/es-modules/playlist-by-tag.html
+++ b/docs/es-modules/playlist-by-tag.html
@@ -41,7 +41,7 @@ <h3 class="mb-4">Playlist by tag (with captions)</h3>
 
     <script type="module">
       import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/playlist';
+
 
       import 'cloudinary-video-player/cld-video-player.min.css';
 
diff --git a/docs/es-modules/playlist.html b/docs/es-modules/playlist.html
index f635ec03d..31f8c2c3e 100644
--- a/docs/es-modules/playlist.html
+++ b/docs/es-modules/playlist.html
@@ -51,7 +51,7 @@ <h3 class="mb-4">Playlist</h3>
 
     <script type="module">
       import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/playlist';
+
       import 'cloudinary-video-player/cld-video-player.min.css';
 
       const source1 = {
diff --git a/docs/es-modules/pnpm-lock.yaml b/docs/es-modules/pnpm-lock.yaml
deleted file mode 100644
index 308a624fc..000000000
--- a/docs/es-modules/pnpm-lock.yaml
+++ /dev/null
@@ -1,494 +0,0 @@
-lockfileVersion: '9.0'
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
-importers:
-
-  .:
-    devDependencies:
-      vite:
-        specifier: ^6.0.2
-        version: 6.3.5
-
-packages:
-
-  '@esbuild/aix-ppc64@0.25.4':
-    resolution: {integrity: sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==}
-    engines: {node: '>=18'}
-
-  '@esbuild/android-arm64@0.25.4':
-    resolution: {integrity: sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==}
-    engines: {node: '>=18'}
-
-  '@esbuild/android-arm@0.25.4':
-    resolution: {integrity: sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==}
-    engines: {node: '>=18'}
-
-  '@esbuild/android-x64@0.25.4':
-    resolution: {integrity: sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==}
-    engines: {node: '>=18'}
-
-  '@esbuild/darwin-arm64@0.25.4':
-    resolution: {integrity: sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==}
-    engines: {node: '>=18'}
-
-  '@esbuild/darwin-x64@0.25.4':
-    resolution: {integrity: sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==}
-    engines: {node: '>=18'}
-
-  '@esbuild/freebsd-arm64@0.25.4':
-    resolution: {integrity: sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==}
-    engines: {node: '>=18'}
-
-  '@esbuild/freebsd-x64@0.25.4':
-    resolution: {integrity: sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==}
-    engines: {node: '>=18'}
-
-  '@esbuild/linux-arm64@0.25.4':
-    resolution: {integrity: sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==}
-    engines: {node: '>=18'}
-
-  '@esbuild/linux-arm@0.25.4':
-    resolution: {integrity: sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==}
-    engines: {node: '>=18'}
-
-  '@esbuild/linux-ia32@0.25.4':
-    resolution: {integrity: sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==}
-    engines: {node: '>=18'}
-
-  '@esbuild/linux-loong64@0.25.4':
-    resolution: {integrity: sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==}
-    engines: {node: '>=18'}
-
-  '@esbuild/linux-mips64el@0.25.4':
-    resolution: {integrity: sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==}
-    engines: {node: '>=18'}
-
-  '@esbuild/linux-ppc64@0.25.4':
-    resolution: {integrity: sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==}
-    engines: {node: '>=18'}
-
-  '@esbuild/linux-riscv64@0.25.4':
-    resolution: {integrity: sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==}
-    engines: {node: '>=18'}
-
-  '@esbuild/linux-s390x@0.25.4':
-    resolution: {integrity: sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==}
-    engines: {node: '>=18'}
-
-  '@esbuild/linux-x64@0.25.4':
-    resolution: {integrity: sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==}
-    engines: {node: '>=18'}
-
-  '@esbuild/netbsd-arm64@0.25.4':
-    resolution: {integrity: sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==}
-    engines: {node: '>=18'}
-
-  '@esbuild/netbsd-x64@0.25.4':
-    resolution: {integrity: sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==}
-    engines: {node: '>=18'}
-
-  '@esbuild/openbsd-arm64@0.25.4':
-    resolution: {integrity: sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==}
-    engines: {node: '>=18'}
-
-  '@esbuild/openbsd-x64@0.25.4':
-    resolution: {integrity: sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==}
-    engines: {node: '>=18'}
-
-  '@esbuild/sunos-x64@0.25.4':
-    resolution: {integrity: sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==}
-    engines: {node: '>=18'}
-
-  '@esbuild/win32-arm64@0.25.4':
-    resolution: {integrity: sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==}
-    engines: {node: '>=18'}
-
-  '@esbuild/win32-ia32@0.25.4':
-    resolution: {integrity: sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==}
-    engines: {node: '>=18'}
-
-  '@esbuild/win32-x64@0.25.4':
-    resolution: {integrity: sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==}
-    engines: {node: '>=18'}
-
-  '@rollup/rollup-android-arm-eabi@4.40.2':
-    resolution: {integrity: sha512-JkdNEq+DFxZfUwxvB58tHMHBHVgX23ew41g1OQinthJ+ryhdRk67O31S7sYw8u2lTjHUPFxwar07BBt1KHp/hg==}
-
-  '@rollup/rollup-android-arm64@4.40.2':
-    resolution: {integrity: sha512-13unNoZ8NzUmnndhPTkWPWbX3vtHodYmy+I9kuLxN+F+l+x3LdVF7UCu8TWVMt1POHLh6oDHhnOA04n8oJZhBw==}
-
-  '@rollup/rollup-darwin-arm64@4.40.2':
-    resolution: {integrity: sha512-Gzf1Hn2Aoe8VZzevHostPX23U7N5+4D36WJNHK88NZHCJr7aVMG4fadqkIf72eqVPGjGc0HJHNuUaUcxiR+N/w==}
-
-  '@rollup/rollup-darwin-x64@4.40.2':
-    resolution: {integrity: sha512-47N4hxa01a4x6XnJoskMKTS8XZ0CZMd8YTbINbi+w03A2w4j1RTlnGHOz/P0+Bg1LaVL6ufZyNprSg+fW5nYQQ==}
-
-  '@rollup/rollup-freebsd-arm64@4.40.2':
-    resolution: {integrity: sha512-8t6aL4MD+rXSHHZUR1z19+9OFJ2rl1wGKvckN47XFRVO+QL/dUSpKA2SLRo4vMg7ELA8pzGpC+W9OEd1Z/ZqoQ==}
-
-  '@rollup/rollup-freebsd-x64@4.40.2':
-    resolution: {integrity: sha512-C+AyHBzfpsOEYRFjztcYUFsH4S7UsE9cDtHCtma5BK8+ydOZYgMmWg1d/4KBytQspJCld8ZIujFMAdKG1xyr4Q==}
-
-  '@rollup/rollup-linux-arm-gnueabihf@4.40.2':
-    resolution: {integrity: sha512-de6TFZYIvJwRNjmW3+gaXiZ2DaWL5D5yGmSYzkdzjBDS3W+B9JQ48oZEsmMvemqjtAFzE16DIBLqd6IQQRuG9Q==}
-
-  '@rollup/rollup-linux-arm-musleabihf@4.40.2':
-    resolution: {integrity: sha512-urjaEZubdIkacKc930hUDOfQPysezKla/O9qV+O89enqsqUmQm8Xj8O/vh0gHg4LYfv7Y7UsE3QjzLQzDYN1qg==}
-
-  '@rollup/rollup-linux-arm64-gnu@4.40.2':
-    resolution: {integrity: sha512-KlE8IC0HFOC33taNt1zR8qNlBYHj31qGT1UqWqtvR/+NuCVhfufAq9fxO8BMFC22Wu0rxOwGVWxtCMvZVLmhQg==}
-
-  '@rollup/rollup-linux-arm64-musl@4.40.2':
-    resolution: {integrity: sha512-j8CgxvfM0kbnhu4XgjnCWJQyyBOeBI1Zq91Z850aUddUmPeQvuAy6OiMdPS46gNFgy8gN1xkYyLgwLYZG3rBOg==}
-
-  '@rollup/rollup-linux-loongarch64-gnu@4.40.2':
-    resolution: {integrity: sha512-Ybc/1qUampKuRF4tQXc7G7QY9YRyeVSykfK36Y5Qc5dmrIxwFhrOzqaVTNoZygqZ1ZieSWTibfFhQ5qK8jpWxw==}
-
-  '@rollup/rollup-linux-powerpc64le-gnu@4.40.2':
-    resolution: {integrity: sha512-3FCIrnrt03CCsZqSYAOW/k9n625pjpuMzVfeI+ZBUSDT3MVIFDSPfSUgIl9FqUftxcUXInvFah79hE1c9abD+Q==}
-
-  '@rollup/rollup-linux-riscv64-gnu@4.40.2':
-    resolution: {integrity: sha512-QNU7BFHEvHMp2ESSY3SozIkBPaPBDTsfVNGx3Xhv+TdvWXFGOSH2NJvhD1zKAT6AyuuErJgbdvaJhYVhVqrWTg==}
-
-  '@rollup/rollup-linux-riscv64-musl@4.40.2':
-    resolution: {integrity: sha512-5W6vNYkhgfh7URiXTO1E9a0cy4fSgfE4+Hl5agb/U1sa0kjOLMLC1wObxwKxecE17j0URxuTrYZZME4/VH57Hg==}
-
-  '@rollup/rollup-linux-s390x-gnu@4.40.2':
-    resolution: {integrity: sha512-B7LKIz+0+p348JoAL4X/YxGx9zOx3sR+o6Hj15Y3aaApNfAshK8+mWZEf759DXfRLeL2vg5LYJBB7DdcleYCoQ==}
-
-  '@rollup/rollup-linux-x64-gnu@4.40.2':
-    resolution: {integrity: sha512-lG7Xa+BmBNwpjmVUbmyKxdQJ3Q6whHjMjzQplOs5Z+Gj7mxPtWakGHqzMqNER68G67kmCX9qX57aRsW5V0VOng==}
-
-  '@rollup/rollup-linux-x64-musl@4.40.2':
-    resolution: {integrity: sha512-tD46wKHd+KJvsmije4bUskNuvWKFcTOIM9tZ/RrmIvcXnbi0YK/cKS9FzFtAm7Oxi2EhV5N2OpfFB348vSQRXA==}
-
-  '@rollup/rollup-win32-arm64-msvc@4.40.2':
-    resolution: {integrity: sha512-Bjv/HG8RRWLNkXwQQemdsWw4Mg+IJ29LK+bJPW2SCzPKOUaMmPEppQlu/Fqk1d7+DX3V7JbFdbkh/NMmurT6Pg==}
-
-  '@rollup/rollup-win32-ia32-msvc@4.40.2':
-    resolution: {integrity: sha512-dt1llVSGEsGKvzeIO76HToiYPNPYPkmjhMHhP00T9S4rDern8P2ZWvWAQUEJ+R1UdMWJ/42i/QqJ2WV765GZcA==}
-
-  '@rollup/rollup-win32-x64-msvc@4.40.2':
-    resolution: {integrity: sha512-bwspbWB04XJpeElvsp+DCylKfF4trJDa2Y9Go8O6A7YLX2LIKGcNK/CYImJN6ZP4DcuOHB4Utl3iCbnR62DudA==}
-
-  '@types/estree@1.0.7':
-    resolution: {integrity: sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==}
-
-  esbuild@0.25.4:
-    resolution: {integrity: sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==}
-    engines: {node: '>=18'}
-    hasBin: true
-
-  fdir@6.4.4:
-    resolution: {integrity: sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==}
-    peerDependencies:
-      picomatch: ^3 || ^4
-    peerDependenciesMeta:
-      picomatch:
-        optional: true
-
-  fsevents@2.3.3:
-    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-
-  nanoid@3.3.11:
-    resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-
-  picocolors@1.1.1:
-    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
-
-  picomatch@4.0.2:
-    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
-    engines: {node: '>=12'}
-
-  postcss@8.5.3:
-    resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
-    engines: {node: ^10 || ^12 || >=14}
-
-  rollup@4.40.2:
-    resolution: {integrity: sha512-tfUOg6DTP4rhQ3VjOO6B4wyrJnGOX85requAXvqYTHsOgb2TFJdZ3aWpT8W2kPoypSGP7dZUyzxJ9ee4buM5Fg==}
-    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
-    hasBin: true
-
-  source-map-js@1.2.1:
-    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
-    engines: {node: '>=0.10.0'}
-
-  tinyglobby@0.2.13:
-    resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==}
-    engines: {node: '>=12.0.0'}
-
-  vite@6.3.5:
-    resolution: {integrity: sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
-      jiti: '>=1.21.0'
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      sass-embedded: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.16.0
-      tsx: ^4.8.1
-      yaml: ^2.4.2
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      jiti:
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-      tsx:
-        optional: true
-      yaml:
-        optional: true
-
-snapshots:
-
-  '@esbuild/aix-ppc64@0.25.4':
-    optional: true
-
-  '@esbuild/android-arm64@0.25.4':
-    optional: true
-
-  '@esbuild/android-arm@0.25.4':
-    optional: true
-
-  '@esbuild/android-x64@0.25.4':
-    optional: true
-
-  '@esbuild/darwin-arm64@0.25.4':
-    optional: true
-
-  '@esbuild/darwin-x64@0.25.4':
-    optional: true
-
-  '@esbuild/freebsd-arm64@0.25.4':
-    optional: true
-
-  '@esbuild/freebsd-x64@0.25.4':
-    optional: true
-
-  '@esbuild/linux-arm64@0.25.4':
-    optional: true
-
-  '@esbuild/linux-arm@0.25.4':
-    optional: true
-
-  '@esbuild/linux-ia32@0.25.4':
-    optional: true
-
-  '@esbuild/linux-loong64@0.25.4':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.25.4':
-    optional: true
-
-  '@esbuild/linux-ppc64@0.25.4':
-    optional: true
-
-  '@esbuild/linux-riscv64@0.25.4':
-    optional: true
-
-  '@esbuild/linux-s390x@0.25.4':
-    optional: true
-
-  '@esbuild/linux-x64@0.25.4':
-    optional: true
-
-  '@esbuild/netbsd-arm64@0.25.4':
-    optional: true
-
-  '@esbuild/netbsd-x64@0.25.4':
-    optional: true
-
-  '@esbuild/openbsd-arm64@0.25.4':
-    optional: true
-
-  '@esbuild/openbsd-x64@0.25.4':
-    optional: true
-
-  '@esbuild/sunos-x64@0.25.4':
-    optional: true
-
-  '@esbuild/win32-arm64@0.25.4':
-    optional: true
-
-  '@esbuild/win32-ia32@0.25.4':
-    optional: true
-
-  '@esbuild/win32-x64@0.25.4':
-    optional: true
-
-  '@rollup/rollup-android-arm-eabi@4.40.2':
-    optional: true
-
-  '@rollup/rollup-android-arm64@4.40.2':
-    optional: true
-
-  '@rollup/rollup-darwin-arm64@4.40.2':
-    optional: true
-
-  '@rollup/rollup-darwin-x64@4.40.2':
-    optional: true
-
-  '@rollup/rollup-freebsd-arm64@4.40.2':
-    optional: true
-
-  '@rollup/rollup-freebsd-x64@4.40.2':
-    optional: true
-
-  '@rollup/rollup-linux-arm-gnueabihf@4.40.2':
-    optional: true
-
-  '@rollup/rollup-linux-arm-musleabihf@4.40.2':
-    optional: true
-
-  '@rollup/rollup-linux-arm64-gnu@4.40.2':
-    optional: true
-
-  '@rollup/rollup-linux-arm64-musl@4.40.2':
-    optional: true
-
-  '@rollup/rollup-linux-loongarch64-gnu@4.40.2':
-    optional: true
-
-  '@rollup/rollup-linux-powerpc64le-gnu@4.40.2':
-    optional: true
-
-  '@rollup/rollup-linux-riscv64-gnu@4.40.2':
-    optional: true
-
-  '@rollup/rollup-linux-riscv64-musl@4.40.2':
-    optional: true
-
-  '@rollup/rollup-linux-s390x-gnu@4.40.2':
-    optional: true
-
-  '@rollup/rollup-linux-x64-gnu@4.40.2':
-    optional: true
-
-  '@rollup/rollup-linux-x64-musl@4.40.2':
-    optional: true
-
-  '@rollup/rollup-win32-arm64-msvc@4.40.2':
-    optional: true
-
-  '@rollup/rollup-win32-ia32-msvc@4.40.2':
-    optional: true
-
-  '@rollup/rollup-win32-x64-msvc@4.40.2':
-    optional: true
-
-  '@types/estree@1.0.7': {}
-
-  esbuild@0.25.4:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.25.4
-      '@esbuild/android-arm': 0.25.4
-      '@esbuild/android-arm64': 0.25.4
-      '@esbuild/android-x64': 0.25.4
-      '@esbuild/darwin-arm64': 0.25.4
-      '@esbuild/darwin-x64': 0.25.4
-      '@esbuild/freebsd-arm64': 0.25.4
-      '@esbuild/freebsd-x64': 0.25.4
-      '@esbuild/linux-arm': 0.25.4
-      '@esbuild/linux-arm64': 0.25.4
-      '@esbuild/linux-ia32': 0.25.4
-      '@esbuild/linux-loong64': 0.25.4
-      '@esbuild/linux-mips64el': 0.25.4
-      '@esbuild/linux-ppc64': 0.25.4
-      '@esbuild/linux-riscv64': 0.25.4
-      '@esbuild/linux-s390x': 0.25.4
-      '@esbuild/linux-x64': 0.25.4
-      '@esbuild/netbsd-arm64': 0.25.4
-      '@esbuild/netbsd-x64': 0.25.4
-      '@esbuild/openbsd-arm64': 0.25.4
-      '@esbuild/openbsd-x64': 0.25.4
-      '@esbuild/sunos-x64': 0.25.4
-      '@esbuild/win32-arm64': 0.25.4
-      '@esbuild/win32-ia32': 0.25.4
-      '@esbuild/win32-x64': 0.25.4
-
-  fdir@6.4.4(picomatch@4.0.2):
-    optionalDependencies:
-      picomatch: 4.0.2
-
-  fsevents@2.3.3:
-    optional: true
-
-  nanoid@3.3.11: {}
-
-  picocolors@1.1.1: {}
-
-  picomatch@4.0.2: {}
-
-  postcss@8.5.3:
-    dependencies:
-      nanoid: 3.3.11
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
-
-  rollup@4.40.2:
-    dependencies:
-      '@types/estree': 1.0.7
-    optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.40.2
-      '@rollup/rollup-android-arm64': 4.40.2
-      '@rollup/rollup-darwin-arm64': 4.40.2
-      '@rollup/rollup-darwin-x64': 4.40.2
-      '@rollup/rollup-freebsd-arm64': 4.40.2
-      '@rollup/rollup-freebsd-x64': 4.40.2
-      '@rollup/rollup-linux-arm-gnueabihf': 4.40.2
-      '@rollup/rollup-linux-arm-musleabihf': 4.40.2
-      '@rollup/rollup-linux-arm64-gnu': 4.40.2
-      '@rollup/rollup-linux-arm64-musl': 4.40.2
-      '@rollup/rollup-linux-loongarch64-gnu': 4.40.2
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.40.2
-      '@rollup/rollup-linux-riscv64-gnu': 4.40.2
-      '@rollup/rollup-linux-riscv64-musl': 4.40.2
-      '@rollup/rollup-linux-s390x-gnu': 4.40.2
-      '@rollup/rollup-linux-x64-gnu': 4.40.2
-      '@rollup/rollup-linux-x64-musl': 4.40.2
-      '@rollup/rollup-win32-arm64-msvc': 4.40.2
-      '@rollup/rollup-win32-ia32-msvc': 4.40.2
-      '@rollup/rollup-win32-x64-msvc': 4.40.2
-      fsevents: 2.3.3
-
-  source-map-js@1.2.1: {}
-
-  tinyglobby@0.2.13:
-    dependencies:
-      fdir: 6.4.4(picomatch@4.0.2)
-      picomatch: 4.0.2
-
-  vite@6.3.5:
-    dependencies:
-      esbuild: 0.25.4
-      fdir: 6.4.4(picomatch@4.0.2)
-      picomatch: 4.0.2
-      postcss: 8.5.3
-      rollup: 4.40.2
-      tinyglobby: 0.2.13
-    optionalDependencies:
-      fsevents: 2.3.3
diff --git a/docs/es-modules/profiles.html b/docs/es-modules/profiles.html
index b3b0dcbdc..bb7177e30 100644
--- a/docs/es-modules/profiles.html
+++ b/docs/es-modules/profiles.html
@@ -89,7 +89,7 @@ <h4 class="mt-4 mb-2">No profile - fetches asset-specific config from publicId/c
 
     <script type="module">
       import { player } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/colors';
+
       import 'cloudinary-video-player/cld-video-player.min.css';
 
       (async () => {
diff --git a/docs/es-modules/recommendations.html b/docs/es-modules/recommendations.html
index d4dc92d0d..7f41e9579 100644
--- a/docs/es-modules/recommendations.html
+++ b/docs/es-modules/recommendations.html
@@ -38,7 +38,7 @@ <h3 class="mb-4">Recommendations</h3>
 
     <script type="module">
       import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/recommendations-overlay';
+
 
       import 'cloudinary-video-player/cld-video-player.min.css';
 
diff --git a/docs/es-modules/share-plugin.html b/docs/es-modules/share-plugin.html
index 8841e8761..4a9514e21 100644
--- a/docs/es-modules/share-plugin.html
+++ b/docs/es-modules/share-plugin.html
@@ -54,7 +54,7 @@ <h3 class="mb-4">Share and Download</h3>
       import { videoPlayer } from 'cloudinary-video-player';
       import 'cloudinary-video-player/cld-video-player.min.css';
       import 'cloudinary-video-player/adaptive-streaming';
-      import 'cloudinary-video-player/share';
+
 
       // Player with download enabled for all sources
       const player1 = videoPlayer('player1', {
diff --git a/docs/es-modules/shoppable.html b/docs/es-modules/shoppable.html
index 312050f9b..33a8af6fc 100644
--- a/docs/es-modules/shoppable.html
+++ b/docs/es-modules/shoppable.html
@@ -37,7 +37,7 @@ <h3 class="mb-4">Shoppable Videos</h3>
 
     <script type="module">
       import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/shoppable';
+
 
       import 'cloudinary-video-player/cld-video-player.min.css';
 
diff --git a/docs/es-modules/subtitles-and-captions.html b/docs/es-modules/subtitles-and-captions.html
index 4b2f482c6..f01b2d587 100644
--- a/docs/es-modules/subtitles-and-captions.html
+++ b/docs/es-modules/subtitles-and-captions.html
@@ -123,7 +123,7 @@ <h4 class="mt-4 mb-2">Translated Transcript</h4>
 
     <script type="module">
       import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/playlist';
+
 
       import 'cloudinary-video-player/cld-video-player.min.css';
 
diff --git a/docs/es-modules/vast-vpaid.html b/docs/es-modules/vast-vpaid.html
index 38292dc3d..0226bd889 100644
--- a/docs/es-modules/vast-vpaid.html
+++ b/docs/es-modules/vast-vpaid.html
@@ -52,9 +52,6 @@ <h4>Playlist with Ads</h4>
 
     <script type="module">
       import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/playlist';
-      import 'cloudinary-video-player/ima';
-
       import 'cloudinary-video-player/cld-video-player.min.css';
 
       const adTagUrl =
diff --git a/docs/es-modules/visual-search.html b/docs/es-modules/visual-search.html
index 73971698a..d52efd6fd 100644
--- a/docs/es-modules/visual-search.html
+++ b/docs/es-modules/visual-search.html
@@ -37,8 +37,6 @@ <h3 class="mb-4">Visual Search</h3>
 
     <script type="module">
       import { videoPlayer } from 'cloudinary-video-player';
-      import 'cloudinary-video-player/visual-search';
-
       import 'cloudinary-video-player/cld-video-player.min.css';
 
       const player = videoPlayer('player', {
diff --git a/docs/index.html b/docs/index.html
index cfc06b79f..242a58e4c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -17,12 +17,12 @@
     <script src="https://cdn.jsdelivr.net/npm/cloudinary-video-player/dist/cld-video-player.min.js"></script>
   -->
 
-  <script type="text/javascript" src="scripts.js"></script>
+  <script type="text/javascript" src="scripts.js?lazy"></script>
 
   <script type="text/javascript">
-    window.addEventListener('load', function(){
+    window.addEventListener('load', () => {
 
-      player = cloudinary.videoPlayer('player', { cloudName: 'demo' });
+      cloudinary.player('player', { cloudName: 'demo' });
 
     }, false);
   </script>
diff --git a/docs/playlist.html b/docs/playlist.html
index 9d07381c7..b4b954dc7 100644
--- a/docs/playlist.html
+++ b/docs/playlist.html
@@ -21,10 +21,10 @@
     <script src="https://cdn.jsdelivr.net/npm/cloudinary-video-player/dist/cld-video-player.min.js"></script>
   -->
 
-  <script type="text/javascript" src="./scripts.js"></script>
+  <script type="text/javascript" src="./scripts.js?lazy"></script>
 
   <script type="text/javascript">
-    window.addEventListener('load', function(){
+    window.addEventListener('load', async function(){
 
       var source1 = { publicId: 'snow_horses', info: { title: 'Snow Horses', subtitle: 'A movie about snow horses' } };
       var source2 = { publicId: 'dirt_bike', info: { title: 'Dirt Bike', subtitle: 'A short video of dirt bikes' } };
@@ -37,8 +37,8 @@
           presentUpcoming: 8
       };
 
-      var playerHorizontal = cloudinary.videoPlayer('player-horizontal',{
-        cloud_name: 'demo',
+      var playerHorizontal = await cloudinary.player('player-horizontal',{
+        cloudName: 'demo',
         playlistWidget: {
           direction: "horizontal",
           total: 4
@@ -48,8 +48,8 @@
       // Auto advance to next video after 0 seconds, repeat the playlist when final video ends, and present upcoming video 8 seconds before the current video ends.
       playerHorizontal.playlist(playlistSources, playlistOptions);
 
-      var playerVertical = cloudinary.videoPlayer('player-vertical',{
-        cloud_name: 'demo',
+      var playerVertical = await cloudinary.player('player-vertical',{
+        cloudName: 'demo',
         playlistWidget: {
           direction: "vertical",
           total: 4
diff --git a/docs/profiles.html b/docs/profiles.html
index ce6a695e4..1c05e0631 100644
--- a/docs/profiles.html
+++ b/docs/profiles.html
@@ -20,7 +20,7 @@
     <script src="https://cdn.jsdelivr.net/npm/cloudinary-video-player/dist/cld-video-player.min.js"></script>
   -->
 
-  <script type="text/javascript" src="./scripts.js"></script>
+  <script type="text/javascript" src="./scripts.js?lazy"></script>
 
   <script type="text/javascript">
     window.addEventListener('load', async () => {
diff --git a/docs/schedule.html b/docs/schedule.html
index cfa4749a1..313218dab 100644
--- a/docs/schedule.html
+++ b/docs/schedule.html
@@ -9,7 +9,7 @@
   <!-- Bootstrap -->
   <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
 
-  <script type="text/javascript" src="./scripts.js"></script>
+  <script type="text/javascript" src="./scripts.js?lazy"></script>
 
   <script type="text/javascript">
     (function () {
@@ -34,7 +34,7 @@
         return [{ day: DAY_NAMES[today], start: '00:00', duration: 24 }];
       }
 
-      function loadPlayerWithMode(showPlayer) {
+      async function loadPlayerWithMode(showPlayer) {
         if (currentPlayer && typeof currentPlayer.dispose === 'function') {
           currentPlayer.dispose();
         }
@@ -53,10 +53,7 @@
           schedule: { weekly: schedule }
         };
 
-        currentPlayer = cloudinary.videoPlayer('player', options);
-        if (currentPlayer && typeof currentPlayer.then === 'function') {
-          currentPlayer.then(function (player) { currentPlayer = player; });
-        }
+        currentPlayer = await cloudinary.player('player', options);
       }
 
       window.addEventListener('load', function () {
diff --git a/docs/scripts.js b/docs/scripts.js
index a6abbcb59..39c8d6dcd 100644
--- a/docs/scripts.js
+++ b/docs/scripts.js
@@ -118,8 +118,11 @@ var loadStyle = function (source, ver) {
   }
 
   function initPlayerExamples() {
+    var scriptUrl = new URL(document.currentScript.src, window.location);
+    var lazy = scriptUrl.searchParams.has('lazy');
+    var bundleName = lazy ? '/cld-video-player-lazy' : '/cld-video-player';
     loadStyle('/cld-video-player' + (min ? '.min' : '') + '.css', ver);
-    loadScript('/cld-video-player' + (min ? '.min' : '') + '.js', ver);
+    loadScript(bundleName + (min ? '.min' : '') + '.js', ver);
 
     window.addEventListener('load', function () {
 
diff --git a/package-lock.json b/package-lock.json
index 70e0c3b4f..fe69a4f50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,6 +35,10 @@
         "@commitlint/cli": "^19.6.0",
         "@commitlint/config-conventional": "^19.6.0",
         "@playwright/test": "1.57.0",
+        "@rollup/plugin-babel": "^6.0.4",
+        "@rollup/plugin-commonjs": "^28.0.1",
+        "@rollup/plugin-node-resolve": "^16.0.0",
+        "@rollup/plugin-replace": "^6.0.0",
         "@types/node": "22.10.1",
         "@typescript-eslint/eslint-plugin": "^8.48.0",
         "@typescript-eslint/parser": "^8.48.0",
@@ -65,6 +69,7 @@
         "mini-css-extract-plugin": "^2.9.4",
         "puppeteer": "^22.15.0",
         "puppeteer-request-spy": "^1.4.0",
+        "rollup": "^4.28.1",
         "sass": "^1.94.2",
         "sass-loader": "^16.0.6",
         "semver": "^7.7.3",
@@ -4756,6 +4761,188 @@
         "node": ">=18"
       }
     },
+    "node_modules/@rollup/plugin-babel": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-6.1.0.tgz",
+      "integrity": "sha512-dFZNuFD2YRcoomP4oYf+DvQNSUA9ih+A3vUqopQx5EdtPGo3WBnQcI/S8pwpz91UsGfL0HsMSOlaMld8HrbubA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.18.6",
+        "@rollup/pluginutils": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "@types/babel__core": "^7.1.9",
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/babel__core": {
+          "optional": true
+        },
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs": {
+      "version": "28.0.9",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.9.tgz",
+      "integrity": "sha512-PIR4/OHZ79romx0BVVll/PkwWpJ7e5lsqFa3gFfcrFPWwLXLV39JVUzQV9RKjWerE7B845Hqjj9VYlQeieZ2dA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "commondir": "^1.0.1",
+        "estree-walker": "^2.0.2",
+        "fdir": "^6.2.0",
+        "is-reference": "1.2.1",
+        "magic-string": "^0.30.3",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=16.0.0 || 14 >= 14.17"
+      },
+      "peerDependencies": {
+        "rollup": "^2.68.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs/node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@rollup/plugin-commonjs/node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-commonjs/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@rollup/plugin-node-resolve": {
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.3.tgz",
+      "integrity": "sha512-lUYM3UBGuM93CnMPG1YocWu7X802BrNF3jW2zny5gQyLQgRFJhV1Sq0Zi74+dh/6NBx1DxFC4b4GXg9wUCG5Qg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "@types/resolve": "1.20.2",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.78.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-replace": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-6.0.3.tgz",
+      "integrity": "sha512-J4RZarRvQAm5IF0/LwUUg+obsm+xZhYnbMXmXROyoSE1ATJe3oXSb9L5MMppdxP2ylNSjv6zFBwKYjcKMucVfA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "magic-string": "^0.30.3"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
+      "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/pluginutils/node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@rollup/pluginutils/node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/@rollup/rollup-android-arm-eabi": {
       "version": "4.57.0",
       "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.0.tgz",
@@ -5487,6 +5674,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/resolve": {
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
+      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/retry": {
       "version": "0.12.2",
       "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
@@ -7683,6 +7877,13 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/compare-func": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz",
@@ -10818,6 +11019,25 @@
         }
       }
     },
+    "node_modules/git-semver-tags/node_modules/conventional-commits-parser": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-6.3.0.tgz",
+      "integrity": "sha512-RfOq/Cqy9xV9bOA8N+ZH6DlrDR+5S3Mi0B5kACEjESpE+AviIpAptx9a9cFpWCCvgRtWT+0BbUw+e1BZfts9jg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@simple-libs/stream-utils": "^1.2.0",
+        "meow": "^13.0.0"
+      },
+      "bin": {
+        "conventional-commits-parser": "dist/cli/index.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -11978,6 +12198,13 @@
       "integrity": "sha512-mlcHZA84t1qLSuWkt2v0I2l61PYdyQDt4aG1mLIXF5FDMm4+haBCxCPYSr/uwqQNRk1MiTizn0ypEuRAOLRAew==",
       "license": "MIT"
     },
+    "node_modules/is-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/is-network-error": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.3.0.tgz",
@@ -12044,6 +12271,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/is-reference": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
+      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*"
+      }
+    },
     "node_modules/is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
diff --git a/package.json b/package.json
index d16992712..877a83427 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/cloudinary/cloudinary-video-player.git"
   },
-  "module": "./lib/cld-video-player.js",
+  "module": "./lib/index.js",
   "main": "./dist/cld-video-player.min.js",
   "style": "./dist/cld-video-player.min.css",
   "types": "./types/cld-video-player.d.ts",
@@ -22,9 +22,28 @@
   "exports": {
     ".": {
       "types": "./types/cld-video-player.d.ts",
-      "import": "./lib/cld-video-player.js",
+      "import": "./lib/index.js",
       "require": "./dist/cld-video-player.min.js"
     },
+    "./videoPlayer": {
+      "import": "./lib/videoPlayer.js",
+      "require": "./dist/cld-video-player.min.js"
+    },
+    "./player": {
+      "import": "./lib/player.js",
+      "require": "./dist/cld-video-player.min.js"
+    },
+    "./all": {
+      "import": "./lib/all.js",
+      "require": "./dist/cld-video-player.min.js"
+    },
+    "./lazy": {
+      "import": "./lib/lazy.js",
+      "require": "./dist/cld-video-player-lazy.min.js"
+    },
+    "./cld-video-player.min.css": "./lib/cld-video-player.min.css",
+    "./shoppable": "./lib/shoppable-widget.js",
+    "./interaction-areas": "./lib/interaction-areas.service.js",
     "./*": "./lib/*",
     "./light/*": "./lib/*"
   },
@@ -34,7 +53,7 @@
     "start": "webpack serve --config webpack/dev.config.js",
     "build": "WEBPACK_BUILD_MIN=1 webpack --config webpack/build.config.js --progress --color",
     "build-dev": "webpack --config webpack/build.config.js  --progress --color --mode=development",
-    "build-es": "WEBPACK_BUILD_MIN=1 webpack --config webpack/es6.config.js --progress --color",
+    "build-es": "rollup -c rollup.esm.config.js",
     "build-light": "node webpack/copy-light-bundle.js",
     "build-all": "npm run clean && npm run build && npm run build-dev && npm run build-es && npm run build-light",
     "analyze": "webpack --config webpack/analyzer.config.js",
@@ -62,19 +81,11 @@
     "files": [
       {
         "path": "./dist/cld-video-player.min.js",
-        "maxSize": "137kb"
-      },
-      {
-        "path": "./lib/cld-video-player.js",
-        "maxSize": "137kb"
-      },
-      {
-        "path": "./lib/videoPlayer.js",
-        "maxSize": "137kb"
+        "maxSize": "140kb"
       },
       {
-        "path": "./lib/all.js",
-        "maxSize": "330kb"
+        "path": "./dist/cld-video-player-lazy.min.js",
+        "maxSize": "10kb"
       }
     ]
   },
@@ -96,6 +107,10 @@
     "webfontloader": "^1.6.28"
   },
   "devDependencies": {
+    "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-commonjs": "^28.0.1",
+    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-replace": "^6.0.0",
     "@actions/core": "^1.11.1",
     "@actions/github": "^6.0.1",
     "@babel/core": "^7.28.5",
@@ -116,6 +131,7 @@
     "conventional-changelog-angular": "^8.1.0",
     "conventional-changelog-cli": "^5.0.0",
     "conventional-recommended-bump": "^11.2.0",
+    "rollup": "^4.28.1",
     "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.2",
diff --git a/rollup.esm.config.js b/rollup.esm.config.js
new file mode 100644
index 000000000..82fa2c7bc
--- /dev/null
+++ b/rollup.esm.config.js
@@ -0,0 +1,130 @@
+const path = require('path');
+const { babel } = require('@rollup/plugin-babel');
+const nodeResolve = require('@rollup/plugin-node-resolve');
+const commonjs = require('@rollup/plugin-commonjs');
+const replace = require('@rollup/plugin-replace');
+const { copyFileSync, mkdirSync, existsSync, statSync } = require('fs');
+
+const pkg = require('./package.json');
+
+const srcDir = path.resolve(__dirname, 'src');
+const outDir = path.resolve(__dirname, 'lib');
+
+const STUB_MODULE_ID = '\0stub-scss';
+
+/**
+ * Resolve ~/ imports to src paths (e.g. ~/utils/slicing -> src/utils/slicing.js).
+ */
+function srcPathAlias() {
+  return {
+    name: 'src-path-alias',
+    resolveId(id) {
+      if (!id.startsWith('~/')) return null;
+      if (id.endsWith('.scss') || id.endsWith('.css')) return null;
+      const resolved = path.join(srcDir, id.slice(2));
+      if (resolved.endsWith('.js') || resolved.endsWith('.json')) return resolved;
+      if (existsSync(resolved) && statSync(resolved).isDirectory()) return path.join(resolved, 'index.js');
+      return `${resolved}.js`;
+    }
+  };
+}
+
+/**
+ * Alias video.js to the core build and expose as window.videojs
+ * (mirrors webpack expose-loader config).
+ */
+function videoJsAlias() {
+  const PROXY_ID = '\0videojs-proxy';
+  const corePath = path.resolve(__dirname, 'node_modules/video.js/dist/alt/video.core.js').replace(/\\/g, '/');
+
+  return {
+    name: 'video-js-alias',
+    resolveId(id) {
+      if (id === 'video.js') {
+        return PROXY_ID;
+      }
+      return null;
+    },
+    load(id) {
+      if (id === PROXY_ID) {
+        return [
+          `import _vjs from '${corePath}';`,
+          `if (typeof window !== 'undefined') window.videojs = _vjs;`,
+          `export default _vjs;`
+        ].join('\n');
+      }
+      return null;
+    }
+  };
+}
+
+/**
+ * Stub .scss and .css imports - ESM consumers import CSS separately.
+ */
+function stubScss() {
+  return {
+    name: 'stub-scss',
+    resolveId(id) {
+      if (id.endsWith('.scss') || id.endsWith('.css')) {
+        return STUB_MODULE_ID;
+      }
+      return null;
+    },
+    load(id) {
+      if (id === STUB_MODULE_ID) return 'export default {}';
+      return null;
+    }
+  };
+}
+
+module.exports = {
+  input: {
+    index: path.join(srcDir, 'index.js'),
+    videoPlayer: path.join(srcDir, 'index.videoPlayer.js'),
+    player: path.join(srcDir, 'index.player.js'),
+    all: path.join(srcDir, 'index.all.js'),
+    lazy: path.join(srcDir, 'index.lazy.js'),
+    dash: path.join(srcDir, 'dash.js'),
+    debug: path.join(srcDir, 'debug.js')
+  },
+  output: {
+    dir: outDir,
+    format: 'esm',
+    entryFileNames: '[name].js',
+    chunkFileNames: '[name].js'
+  },
+  plugins: [
+    replace({
+      include: path.join(srcDir, '**'),
+      VERSION: JSON.stringify(pkg.version),
+      preventAssignment: true
+    }),
+    videoJsAlias(),
+    srcPathAlias(),
+    stubScss(),
+    nodeResolve({ preferBuiltins: false }),
+    commonjs(),
+    babel({
+      babelHelpers: 'bundled',
+      configFile: path.join(__dirname, 'babel.config.js'),
+      exclude: 'node_modules/**'
+    }),
+    {
+      name: 'copy-assets',
+      writeBundle() {
+        const schemaSrc = path.join(__dirname, 'src/config/configSchema.json');
+        const schemaDest = path.join(outDir, 'config/configSchema.json');
+        if (existsSync(schemaSrc)) {
+          mkdirSync(path.dirname(schemaDest), { recursive: true });
+          copyFileSync(schemaSrc, schemaDest);
+        }
+        const cssSrc = path.join(__dirname, 'dist/cld-video-player.min.css');
+        const cssDest = path.join(__dirname, 'lib/cld-video-player.min.css');
+        if (existsSync(cssSrc)) {
+          mkdirSync(path.dirname(cssDest), { recursive: true });
+          copyFileSync(cssSrc, cssDest);
+        }
+      }
+    }
+  ]
+};
diff --git a/src/components/error-display/error-display.js b/src/components/error-display/error-display.js
index c78160f3e..27d70db0e 100644
--- a/src/components/error-display/error-display.js
+++ b/src/components/error-display/error-display.js
@@ -1,5 +1,5 @@
 import videojs from 'video.js';
-import { PLAYER_EVENT } from 'utils/consts';
+import { PLAYER_EVENT } from '~/utils/consts';
 
 const ErrorDisplay = videojs.getComponent('ErrorDisplay');
 
diff --git a/src/components/recommendations-overlay/recommendations-overlay-primary-item.js b/src/components/recommendations-overlay/recommendations-overlay-primary-item.js
index 0baf883f7..4406724ea 100644
--- a/src/components/recommendations-overlay/recommendations-overlay-primary-item.js
+++ b/src/components/recommendations-overlay/recommendations-overlay-primary-item.js
@@ -1,6 +1,6 @@
 import videojs from 'video.js';
 import RecommendationsOverlayItem from './recommendations-overlay-item';
-import componentUtils from 'components/component-utils';
+import componentUtils from '../component-utils';
 
 // support VJS5 & VJS6 at the same time
 const dom = videojs.dom || videojs;
diff --git a/src/components/shoppable-bar/layout/shoppable-products-overlay.js b/src/components/shoppable-bar/layout/shoppable-products-overlay.js
index 3f43d9165..6016ed9d0 100644
--- a/src/components/shoppable-bar/layout/shoppable-products-overlay.js
+++ b/src/components/shoppable-bar/layout/shoppable-products-overlay.js
@@ -1,7 +1,7 @@
 import videojs from 'video.js';
 const dom = videojs.dom || videojs;
-import { parseTime } from 'utils/time';
-import { find } from 'utils/find';
+import { parseTime } from '~/utils/time';
+import { find } from '~/utils/find';
 import {
   SHOPPABLE_PANEL_HIDDEN_CLASS,
   SHOPPABLE_PANEL_VISIBLE_CLASS,
diff --git a/src/components/shoppable-bar/panel/shoppable-panel.js b/src/components/shoppable-bar/panel/shoppable-panel.js
index 1e08eaa8f..53484676a 100644
--- a/src/components/shoppable-bar/panel/shoppable-panel.js
+++ b/src/components/shoppable-bar/panel/shoppable-panel.js
@@ -1,6 +1,6 @@
 import videojs from 'video.js';
 import throttle from 'lodash/throttle';
-import { parseTime } from 'utils/time';
+import { parseTime } from '~/utils/time';
 import ShoppablePanelItem from './shoppable-panel-item';
 import ImageSource from '../../../plugins/cloudinary/models/image-source';
 import {
diff --git a/src/components/title-bar/title-bar.js b/src/components/title-bar/title-bar.js
index 71358d9d7..521fe00b7 100644
--- a/src/components/title-bar/title-bar.js
+++ b/src/components/title-bar/title-bar.js
@@ -1,8 +1,8 @@
 import videojs from 'video.js';
-import 'assets/styles/components/title-bar.scss';
+import '~/assets/styles/components/title-bar.scss';
 import componentUtils from '../component-utils';
 import { utf8ToBase64 } from '../../utils/utf8Base64';
-import { getCloudinaryUrlPrefix } from 'plugins/cloudinary/common';
+import { getCloudinaryUrlPrefix } from '~/plugins/cloudinary/common';
 import { appendQueryParams } from '../../utils/querystring';
 
 // support VJS5 & VJS6 at the same time
diff --git a/src/dash.js b/src/dash.js
new file mode 100644
index 000000000..d1cace838
--- /dev/null
+++ b/src/dash.js
@@ -0,0 +1,5 @@
+/**
+ * Side-effect import to register videojs-contrib-dash with Video.js.
+ * Used for ESM consumers who import 'cloudinary-video-player/dash'.
+ */
+import 'videojs-contrib-dash';
diff --git a/src/debug.js b/src/debug.js
new file mode 100644
index 000000000..a4bf0db7d
--- /dev/null
+++ b/src/debug.js
@@ -0,0 +1,5 @@
+/**
+ * Side-effect import to preload validators for config validation.
+ * Used for ESM consumers who import 'cloudinary-video-player/debug'.
+ */
+import './validators/validators';
diff --git a/src/index.js b/src/index.js
index 8dc21673f..2e6706511 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,69 +1,20 @@
-import 'assets/styles/main.scss';
-import { scheduleBootstrap, shouldUseScheduleBootstrap, getElementForSchedule } from './utils/schedule';
+import '~/assets/styles/main.scss';
+import videojs from 'video.js';
+import { createVideoPlayer, createPlayerWithConfig } from './video-player.js';
+import { createAsyncPlayer, createMultiplePlayers, createMultipleSync, setupCloudinaryGlobal } from './utils/player-api';
 
-export const videoPlayer = (id, playerOptions = {}, ready) => {
-  if (shouldUseScheduleBootstrap(playerOptions)) {
-    return scheduleBootstrap(id, playerOptions);
-  }
+export { videojs };
 
-  return import(/* webpackChunkName: "cld-video-player-core" */ './video-player.js').then(
-    ({ createVideoPlayer }) => createVideoPlayer(id, playerOptions, ready)
-  );
-};
+export const videoPlayer = (id, playerOptions = {}, ready) =>
+  createVideoPlayer(id, playerOptions, ready);
 
-export const videoPlayers = (selector, playerOptions, ready) => {
-  const nodeList = document.querySelectorAll(selector);
-  return [...nodeList].map((node) => videoPlayer(node, playerOptions, ready));
-};
+export const videoPlayers = (selector, playerOptions, ready) =>
+  createMultipleSync(selector, playerOptions, ready, videoPlayer);
 
-export const player = async (id, playerOptions, ready) => {
-  const { fetchAndMergeConfig } = await import(/* webpackChunkName: "cld-video-player-core" */ './utils/fetch-config');
-  const mergedOptions = Object.assign({}, playerOptions);
-  const videoElement = getElementForSchedule(id);
+export const player = (id, playerOptions = {}, ready) =>
+  createAsyncPlayer(id, playerOptions, ready, createPlayerWithConfig);
 
-  const opts = await (async () => {
-    try {
-      const fetched = await fetchAndMergeConfig(mergedOptions);
-      return Object.assign({}, fetched, mergedOptions);
-    } catch {
-      return mergedOptions;
-    }
-  })();
+export const players = (selector, playerOptions, ready) =>
+  createMultiplePlayers(selector, playerOptions, ready, player);
 
-  if (shouldUseScheduleBootstrap(opts)) {
-    return scheduleBootstrap(id, opts);
-  }
-
-  const { createPlayerWithConfig } = await import(/* webpackChunkName: "cld-video-player-core" */ './video-player.js');
-  return createPlayerWithConfig(videoElement, opts, ready);
-};
-
-export const players = async (selector, playerOptions, ready) => {
-  const nodeList = document.querySelectorAll(selector);
-  return Promise.all([...nodeList].map((node) => player(node, playerOptions, ready)));
-};
-
-const cloudinaryVideoPlayerLegacyConfig = () => {
-  console.warn(
-    'Cloudinary.new() is deprecated and will be removed. Please use cloudinary.videoPlayer() instead.'
-  );
-  return {
-    videoPlayer,
-    videoPlayers
-  };
-};
-
-const cloudinary = {
-  ...(window.cloudinary || {}),
-  videoPlayer,
-  videoPlayers,
-  player,
-  players,
-  Cloudinary: {
-    new: cloudinaryVideoPlayerLegacyConfig
-  }
-};
-
-window.cloudinary = cloudinary;
-
-export default cloudinary;
+export default setupCloudinaryGlobal({ videoPlayer, videoPlayers, player, players });
diff --git a/src/index.lazy.js b/src/index.lazy.js
new file mode 100644
index 000000000..6ba14e523
--- /dev/null
+++ b/src/index.lazy.js
@@ -0,0 +1,18 @@
+/**
+ * Lazy entry: tiny initial bundle, player core loads on demand.
+ * Only player()/players() are available. For sync videoPlayer(), use the full bundle.
+ */
+import { createAsyncPlayer, createMultiplePlayers, setupCloudinaryGlobal } from './utils/player-api';
+
+export const player = (id, playerOptions, ready) =>
+  createAsyncPlayer(id, playerOptions, ready, async (videoElement, opts, r) => {
+    const { videoPlayer } = await import(
+      /* webpackChunkName: "cld-player-core" */ './index.js'
+    );
+    return videoPlayer(videoElement, opts, r);
+  });
+
+export const players = (selector, playerOptions, ready) =>
+  createMultiplePlayers(selector, playerOptions, ready, player);
+
+export default setupCloudinaryGlobal({ player, players });
diff --git a/src/index.umd.js b/src/index.umd.js
new file mode 100644
index 000000000..be940d9a2
--- /dev/null
+++ b/src/index.umd.js
@@ -0,0 +1,39 @@
+/**
+ * UMD entry: full player bundle for backwards-compatible sync videoPlayer().
+ * player() is async with profile and schedule support.
+ */
+import '~/assets/styles/main.scss';
+import { createVideoPlayer, createPlayerWithConfig } from './video-player';
+import { createAsyncPlayer, createMultiplePlayers, createMultipleSync, setupCloudinaryGlobal } from './utils/player-api';
+
+export const videoPlayer = (id, playerOptions = {}, ready) =>
+  createVideoPlayer(id, playerOptions, ready);
+
+export const videoPlayers = (selector, playerOptions, ready) =>
+  createMultipleSync(selector, playerOptions, ready, videoPlayer);
+
+export const player = (id, playerOptions = {}, ready) =>
+  createAsyncPlayer(id, playerOptions, ready, createPlayerWithConfig);
+
+export const players = (selector, playerOptions, ready) =>
+  createMultiplePlayers(selector, playerOptions, ready, player);
+
+const cloudinaryVideoPlayerLegacyConfig = () => {
+  console.warn(
+    'Cloudinary.new() is deprecated and will be removed. Please use cloudinary.videoPlayer() instead.'
+  );
+  return {
+    videoPlayer,
+    videoPlayers
+  };
+};
+
+export default setupCloudinaryGlobal({
+  videoPlayer,
+  videoPlayers,
+  player,
+  players,
+  Cloudinary: {
+    new: cloudinaryVideoPlayerLegacyConfig
+  }
+});
diff --git a/src/plugins/analytics/index.js b/src/plugins/analytics/index.js
index 00c53b7e4..d2e73faeb 100644
--- a/src/plugins/analytics/index.js
+++ b/src/plugins/analytics/index.js
@@ -1,5 +1,5 @@
 import videojs from 'video.js';
-import { normalizeEventsParam } from 'extended-events';
+import { normalizeEventsParam } from '../../extended-events';
 import { PLAYER_EVENT } from '../../utils/consts';
 
 const DEFAULT_EVENTS = [
diff --git a/src/plugins/autoplay-on-scroll/index.js b/src/plugins/autoplay-on-scroll/index.js
index 52687241e..5e332b00c 100644
--- a/src/plugins/autoplay-on-scroll/index.js
+++ b/src/plugins/autoplay-on-scroll/index.js
@@ -1,5 +1,5 @@
-import { isElementInViewport } from 'utils/positioning';
-import { sliceProperties } from 'utils/slicing';
+import { isElementInViewport } from '~/utils/positioning';
+import { sliceProperties } from '~/utils/slicing';
 
 const defaults = {
   fraction: 0.5,
diff --git a/src/plugins/cloudinary/common.js b/src/plugins/cloudinary/common.js
index 2e23a69fa..d37ebfd50 100644
--- a/src/plugins/cloudinary/common.js
+++ b/src/plugins/cloudinary/common.js
@@ -1,12 +1,11 @@
 import videojs from 'video.js';
 import omit from 'lodash/omit';
-import { sliceAndUnsetProperties } from 'utils/slicing';
+import { sliceAndUnsetProperties } from '~/utils/slicing';
 import isObject from 'lodash/isObject';
 import isString from 'lodash/isString';
-import { URL_PATTERN } from './models/video-source/video-source.const';
 import { createCloudinaryLegacyURL } from '@cloudinary/url-gen/backwards/createCloudinaryLegacyURL';
 import Transformation from '@cloudinary/url-gen/backwards/transformation';
-import { unsigned_url_prefix } from '@cloudinary/url-gen/backwards/utils/unsigned_url_prefix';
+export { isRawUrl, getCloudinaryUrlPrefix } from './url-helpers';
 
 const normalizeOptions = (publicId, options, { tolerateMissingId = false } = {}) => {
   if (isObject(publicId)) {
@@ -26,8 +25,6 @@ const normalizeOptions = (publicId, options, { tolerateMissingId = false } = {})
   return { publicId, options };
 };
 
-export const isRawUrl = publicId => URL_PATTERN.test(publicId);
-
 const isSrcEqual = (source1, source2) => {
   let src1 = source1;
   let src2 = source2;
@@ -56,19 +53,6 @@ export const extendCloudinaryConfig = (currentConfig, newConfig) =>
 export const getCloudinaryUrl = (publicId, transformation) =>
   createCloudinaryLegacyURL(publicId, omit(transformation, ['chainTarget']));
 
-export const getCloudinaryUrlPrefix = (cloudinaryConfig) => {
-  return unsigned_url_prefix(
-    null,
-    cloudinaryConfig.cloud_name,
-    cloudinaryConfig.private_cdn,
-    cloudinaryConfig.cdn_subdomain,
-    cloudinaryConfig.secure_cdn_subdomain,
-    cloudinaryConfig.cname,
-    cloudinaryConfig.secure ?? true,
-    cloudinaryConfig.secure_distribution,
-  );
-};
-
 const isTransformationInstance = transformation =>
   transformation.constructor.name === 'Transformation' && transformation.toOptions;
 
diff --git a/src/plugins/cloudinary/index.js b/src/plugins/cloudinary/index.js
index 4ba965148..1582f7527 100644
--- a/src/plugins/cloudinary/index.js
+++ b/src/plugins/cloudinary/index.js
@@ -1,8 +1,8 @@
 import isFunction from 'lodash/isFunction';
 import isEmpty from 'lodash/isEmpty';
-import { applyWithProps } from 'utils/apply-with-props';
-import { sliceAndUnsetProperties } from 'utils/slicing';
-import { isKeyInTransformation } from 'utils/cloudinary';
+import { applyWithProps } from '~/utils/apply-with-props';
+import { sliceAndUnsetProperties } from '~/utils/slicing';
+import { isKeyInTransformation } from '~/utils/cloudinary';
 import {
   normalizeOptions,
   mergeTransformations,
@@ -11,13 +11,13 @@ import {
   setupCloudinaryMiddleware,
   isRawUrl
 } from './common';
-import { CROP_MODE } from 'video-player.const';
+import { CROP_MODE } from '~/video-player.const';
 import VideoSource from './models/video-source/video-source';
 import EventHandlerRegistry from './event-handler-registry';
 import AudioSource from './models/audio-source/audio-source';
 import { DEFAULT_DPR, RENDITIONS } from './models/video-source/video-source.const';
 
-import recommendationsOverlay from 'components/recommendations-overlay';
+import recommendationsOverlay from '~/components/recommendations-overlay';
 
 export const getEffectiveDpr = (maxDpr) => {
   const deviceDpr = typeof window !== 'undefined' && window.devicePixelRatio != null
diff --git a/src/plugins/cloudinary/models/audio-source/audio-source.js b/src/plugins/cloudinary/models/audio-source/audio-source.js
index 5a4e03f9a..c107a3744 100644
--- a/src/plugins/cloudinary/models/audio-source/audio-source.js
+++ b/src/plugins/cloudinary/models/audio-source/audio-source.js
@@ -1,8 +1,8 @@
 import VideoSource from '../video-source/video-source';
 import ImageSource from '../image-source';
 import { normalizeOptions } from '../../common';
-import { sliceAndUnsetProperties } from 'utils/slicing';
-import { appendQueryParams } from 'utils/querystring';
+import { sliceAndUnsetProperties } from '~/utils/slicing';
+import { appendQueryParams } from '~/utils/querystring';
 import { AUDIO_SUFFIX_REMOVAL_PATTERN, DEFAULT_AUDIO_PARAMS, DEFAULT_POSTER_PARAMS } from './audio-source.const';
 import { SOURCE_TYPE } from '../../../../utils/consts';
 
diff --git a/src/plugins/cloudinary/models/base-source.js b/src/plugins/cloudinary/models/base-source.js
index 82bed7142..4f31ce943 100644
--- a/src/plugins/cloudinary/models/base-source.js
+++ b/src/plugins/cloudinary/models/base-source.js
@@ -1,6 +1,6 @@
 import { getCloudinaryUrl, isRawUrl, mergeTransformations, normalizeOptions } from '../common';
-import { sliceAndUnsetProperties } from 'utils/slicing';
-import { appendQueryParams } from 'utils/querystring';
+import { sliceAndUnsetProperties } from '~/utils/slicing';
+import { appendQueryParams } from '~/utils/querystring';
 
 
 class BaseSource {
diff --git a/src/plugins/cloudinary/models/video-source/video-source.js b/src/plugins/cloudinary/models/video-source/video-source.js
index 0436ab5da..47dc51c05 100644
--- a/src/plugins/cloudinary/models/video-source/video-source.js
+++ b/src/plugins/cloudinary/models/video-source/video-source.js
@@ -1,7 +1,7 @@
-import { appendQueryParams } from 'utils/querystring';
+import { appendQueryParams } from '~/utils/querystring';
 import castArray from 'lodash/castArray';
-import { SOURCE_TYPE } from 'utils/consts';
-import { SOURCE_PARAMS } from 'video-player.const';
+import { SOURCE_TYPE } from '~/utils/consts';
+import { SOURCE_PARAMS } from '../../../../video-player.const';
 import {
   CONTAINER_MIME_TYPES,
   ADAPTIVE_SOURCETYPES,
@@ -15,7 +15,7 @@ import {
   normalizeFormat
 } from './video-source.utils';
 import { normalizeOptions, isSrcEqual, isRawUrl, mergeTransformations, getCloudinaryUrlPrefix } from '../../common';
-import { utf8ToBase64 } from 'utils/utf8Base64';
+import { utf8ToBase64 } from '~/utils/utf8Base64';
 import Transformation from '@cloudinary/url-gen/backwards/transformation';
 import BaseSource from '../base-source';
 import ImageSource from '../image-source';
diff --git a/src/plugins/cloudinary/models/video-source/video-source.utils.js b/src/plugins/cloudinary/models/video-source/video-source.utils.js
index f1aca04be..ab8abd87f 100644
--- a/src/plugins/cloudinary/models/video-source/video-source.utils.js
+++ b/src/plugins/cloudinary/models/video-source/video-source.utils.js
@@ -1,7 +1,7 @@
 import { CONTAINER_MIME_TYPES, FORMAT_MAPPINGS } from './video-source.const';
 import { VIDEO_CODEC } from '../../common';
 import isString from 'lodash/isString';
-import { isKeyInTransformation } from 'utils/cloudinary';
+import { isKeyInTransformation } from '~/utils/cloudinary';
 
 export function formatToMimeTypeAndTransformation(format) {
   const [container, codec] = format.toLowerCase().split('/');
diff --git a/src/plugins/cloudinary/url-helpers.js b/src/plugins/cloudinary/url-helpers.js
new file mode 100644
index 000000000..c88bab322
--- /dev/null
+++ b/src/plugins/cloudinary/url-helpers.js
@@ -0,0 +1,5 @@
+import { URL_PATTERN } from './models/video-source/video-source.const';
+
+export { getCloudinaryUrlPrefix } from '../../utils/cloudinary-url-prefix';
+
+export const isRawUrl = publicId => URL_PATTERN.test(publicId);
diff --git a/src/plugins/context-menu/components/context-menu-item.js b/src/plugins/context-menu/components/context-menu-item.js
index b4b48e906..5050a6895 100644
--- a/src/plugins/context-menu/components/context-menu-item.js
+++ b/src/plugins/context-menu/components/context-menu-item.js
@@ -1,5 +1,5 @@
 import videojs from 'video.js';
-import { createElement } from 'utils/dom';
+import { createElement } from '~/utils/dom';
 
 const MenuItem = videojs.getComponent('MenuItem');
 
diff --git a/src/plugins/context-menu/components/context-menu.js b/src/plugins/context-menu/components/context-menu.js
index d1ebea375..9fb76e13d 100644
--- a/src/plugins/context-menu/components/context-menu.js
+++ b/src/plugins/context-menu/components/context-menu.js
@@ -1,7 +1,7 @@
 import videojs from 'video.js';
 import isFunction from 'lodash/isFunction';
 import ContextMenuItem from './context-menu-item';
-import { setPosition } from 'utils/positioning';
+import { setPosition } from '~/utils/positioning';
 
 const Menu = videojs.getComponent('Menu');
 
diff --git a/src/plugins/context-menu/index.js b/src/plugins/context-menu/index.js
index e8dd07570..fab541d73 100644
--- a/src/plugins/context-menu/index.js
+++ b/src/plugins/context-menu/index.js
@@ -1,8 +1,8 @@
 import videojs from 'video.js';
 import isFunction from 'lodash/isFunction';
 import ContextMenu from './components/context-menu';
-import { getPointerPosition } from 'utils/positioning';
-import { sliceProperties } from 'utils/slicing';
+import { getPointerPosition } from '~/utils/positioning';
+import { sliceProperties } from '~/utils/slicing';
 import './videojs-contextmenu';
 import './context-menu.scss';
 
diff --git a/src/plugins/floating-player/index.js b/src/plugins/floating-player/index.js
index 7c0e9e41f..6664e535c 100644
--- a/src/plugins/floating-player/index.js
+++ b/src/plugins/floating-player/index.js
@@ -1,5 +1,5 @@
-import { isElementInViewport } from 'utils/positioning';
-import { sliceProperties } from 'utils/slicing';
+import { isElementInViewport } from '~/utils/positioning';
+import { sliceProperties } from '~/utils/slicing';
 import './floating-player.scss';
 import { FLOATING_TO } from '../../video-player.const';
 
diff --git a/src/plugins/ima/index.js b/src/plugins/ima/index.js
index 71b241284..d412ec600 100644
--- a/src/plugins/ima/index.js
+++ b/src/plugins/ima/index.js
@@ -1,6 +1,6 @@
 /* global google */
 import isFunction from 'lodash/isFunction';
-import { PLAYER_EVENT } from 'utils/consts';
+import { PLAYER_EVENT } from '~/utils/consts';
 
 export default async function imaPlugin(player, playerOptions) {
   await import(/* webpackChunkName: "ima" */ './ima');
diff --git a/src/plugins/playlist/playlist.js b/src/plugins/playlist/playlist.js
index 5b79a7703..c64a262c7 100644
--- a/src/plugins/playlist/playlist.js
+++ b/src/plugins/playlist/playlist.js
@@ -1,6 +1,6 @@
-import { sliceProperties } from 'utils/slicing';
-import { PLAYER_EVENT } from 'utils/consts';
-import { getCloudinaryUrl } from 'plugins/cloudinary/common';
+import { sliceProperties } from '~/utils/slicing';
+import { PLAYER_EVENT } from '~/utils/consts';
+import { getCloudinaryUrl } from '~/plugins/cloudinary/common';
 import { normalizeJsonResponse } from './utils/api';
 
 import Playlist from './ui/playlist';
diff --git a/src/plugins/playlist/ui/components/upcoming-video-overlay.js b/src/plugins/playlist/ui/components/upcoming-video-overlay.js
index 841aff8c1..69b997b6f 100644
--- a/src/plugins/playlist/ui/components/upcoming-video-overlay.js
+++ b/src/plugins/playlist/ui/components/upcoming-video-overlay.js
@@ -1,6 +1,6 @@
 import videojs from 'video.js';
 import './upcoming-video-overlay.scss';
-import { PLAYER_EVENT } from 'utils/consts';
+import { PLAYER_EVENT } from '~/utils/consts';
 
 // support VJS5 & VJS6 at the same time
 const dom = videojs.dom || videojs;
diff --git a/src/plugins/playlist/ui/layout/playlist-layout.js b/src/plugins/playlist/ui/layout/playlist-layout.js
index 57d94f403..4192ca0f5 100644
--- a/src/plugins/playlist/ui/layout/playlist-layout.js
+++ b/src/plugins/playlist/ui/layout/playlist-layout.js
@@ -1,10 +1,10 @@
 import videojs from 'video.js';
-import { PLAYER_EVENT } from 'utils/consts';
+import { PLAYER_EVENT } from '~/utils/consts';
 import { wrap } from '../../utils/dom';
 import {
   skinClassPrefix,
   playerClassPrefix
-} from 'utils/css-prefix';
+} from '~/utils/css-prefix';
 
 const dom = videojs.dom || videojs;
 const Component = videojs.getComponent('Component');
diff --git a/src/plugins/playlist/ui/panel/playlist-panel.js b/src/plugins/playlist/ui/panel/playlist-panel.js
index 3bc474983..c4c5a95bf 100644
--- a/src/plugins/playlist/ui/panel/playlist-panel.js
+++ b/src/plugins/playlist/ui/panel/playlist-panel.js
@@ -1,6 +1,6 @@
 import videojs from 'video.js';
 import PlaylistPanelItem from './playlist-panel-item';
-import { PLAYER_EVENT } from 'utils/consts';
+import { PLAYER_EVENT } from '~/utils/consts';
 
 
 const Component = videojs.getComponent('Component');
diff --git a/src/plugins/playlist/ui/playlist-widget.js b/src/plugins/playlist/ui/playlist-widget.js
index 8c3a4ff24..02a2a109c 100644
--- a/src/plugins/playlist/ui/playlist-widget.js
+++ b/src/plugins/playlist/ui/playlist-widget.js
@@ -1,5 +1,5 @@
 import videojs from 'video.js';
-import { PLAYER_EVENT } from 'utils/consts';
+import { PLAYER_EVENT } from '~/utils/consts';
 import PlaylistLayoutHorizontal from './layout/playlist-layout-horizontal';
 import PlaylistLayoutVertical from './layout/playlist-layout-vertical';
 import PlaylistLayoutCustom from './layout/playlist-layout-custom';
diff --git a/src/plugins/playlist/ui/playlist.js b/src/plugins/playlist/ui/playlist.js
index d48aa6b84..bf87f8682 100644
--- a/src/plugins/playlist/ui/playlist.js
+++ b/src/plugins/playlist/ui/playlist.js
@@ -1,4 +1,4 @@
-import VideoSource from 'plugins/cloudinary/models/video-source/video-source';
+import VideoSource from '~/plugins/cloudinary/models/video-source/video-source';
 import isInteger from 'lodash/isInteger';
 
 import './components/upcoming-video-overlay';
diff --git a/src/plugins/share/share.js b/src/plugins/share/share.js
index 35483f6fd..1f1c0d1dc 100644
--- a/src/plugins/share/share.js
+++ b/src/plugins/share/share.js
@@ -1,6 +1,6 @@
 import './components/download-button';
 import './share.scss';
-import { getCloudinaryUrl } from 'plugins/cloudinary/common';
+import { getCloudinaryUrl } from '~/plugins/cloudinary/common';
 import omit from 'lodash/omit';
 
 const SharePlugin = function (options = {}, playerInstance) {
diff --git a/src/plugins/styled-text-tracks/styled-text-tracks.js b/src/plugins/styled-text-tracks/styled-text-tracks.js
index f016b7a3a..c168221fb 100644
--- a/src/plugins/styled-text-tracks/styled-text-tracks.js
+++ b/src/plugins/styled-text-tracks/styled-text-tracks.js
@@ -1,5 +1,5 @@
-import { fontFace } from 'utils/fontFace';
-import { playerClassPrefix } from 'utils/css-prefix';
+import { fontFace } from '~/utils/fontFace';
+import { playerClassPrefix } from '~/utils/css-prefix';
 
 import './styled-text-tracks.scss';
 
diff --git a/src/utils/cloudinary-url-prefix.js b/src/utils/cloudinary-url-prefix.js
new file mode 100644
index 000000000..c052422f5
--- /dev/null
+++ b/src/utils/cloudinary-url-prefix.js
@@ -0,0 +1,14 @@
+import { unsigned_url_prefix } from '@cloudinary/url-gen/backwards/utils/unsigned_url_prefix';
+
+export const getCloudinaryUrlPrefix = (cloudinaryConfig) => {
+  return unsigned_url_prefix(
+    null,
+    cloudinaryConfig.cloud_name,
+    cloudinaryConfig.private_cdn,
+    cloudinaryConfig.cdn_subdomain,
+    cloudinaryConfig.secure_cdn_subdomain,
+    cloudinaryConfig.cname,
+    cloudinaryConfig.secure ?? true,
+    cloudinaryConfig.secure_distribution,
+  );
+};
diff --git a/src/utils/cloudinary.js b/src/utils/cloudinary.js
index 3cf6dfd5a..a40db1f04 100644
--- a/src/utils/cloudinary.js
+++ b/src/utils/cloudinary.js
@@ -1,5 +1,5 @@
 import { cloudinaryErrorsConverter, ERROR_CODE } from '../plugins/cloudinary/common';
-import { find } from 'utils/find';
+import { find } from '~/utils/find';
 
 export const GET_ERROR_DEFAULT_REQUEST = { method: 'head' };
 const ERROR_WITH_GET_REQUEST = { method: 'get', credentials: 'include', headers: { 'Content-Range': 'bytes=0-0' } };
diff --git a/src/utils/fetch-config.js b/src/utils/fetch-config.js
index eb8769763..e34fef38b 100644
--- a/src/utils/fetch-config.js
+++ b/src/utils/fetch-config.js
@@ -1,5 +1,5 @@
 import { defaultProfiles } from 'cloudinary-video-player-profiles';
-import { isRawUrl, getCloudinaryUrlPrefix } from '../plugins/cloudinary/common';
+import { isRawUrl, getCloudinaryUrlPrefix } from '../plugins/cloudinary/url-helpers';
 import { utf8ToBase64 } from '../utils/utf8Base64';
 import { appendQueryParams } from './querystring';
 
diff --git a/src/utils/get-analytics-player-options.js b/src/utils/get-analytics-player-options.js
index d65c3f169..d180ebabd 100644
--- a/src/utils/get-analytics-player-options.js
+++ b/src/utils/get-analytics-player-options.js
@@ -1,4 +1,4 @@
-import defaults from 'config/defaults';
+import defaults from '~/config/defaults';
 import isEmpty from 'lodash/isEmpty';
 
 const hasConfig = (obj) => isEmpty(obj) ? null : true;
diff --git a/src/utils/player-api.js b/src/utils/player-api.js
new file mode 100644
index 000000000..6113aa991
--- /dev/null
+++ b/src/utils/player-api.js
@@ -0,0 +1,41 @@
+import { scheduleBootstrap, shouldUseScheduleBootstrap, getElementForSchedule } from './schedule';
+
+export const createAsyncPlayer = async (id, playerOptions, ready, createFn) => {
+  const mergedOptions = Object.assign({}, playerOptions);
+  const videoElement = getElementForSchedule(id);
+
+  const opts = await (async () => {
+    try {
+      const { fetchAndMergeConfig } = await import('./fetch-config');
+      const fetched = await fetchAndMergeConfig(mergedOptions);
+      return Object.assign({}, fetched, mergedOptions);
+    } catch {
+      return mergedOptions;
+    }
+  })();
+
+  if (shouldUseScheduleBootstrap(opts)) {
+    return scheduleBootstrap(id, opts);
+  }
+
+  return createFn(videoElement, opts, ready);
+};
+
+export const createMultiplePlayers = async (selector, playerOptions, ready, playerFn) => {
+  const nodeList = document.querySelectorAll(selector);
+  return Promise.all([...nodeList].map((node) => playerFn(node, playerOptions, ready)));
+};
+
+export const createMultipleSync = (selector, playerOptions, ready, playerFn) => {
+  const nodeList = document.querySelectorAll(selector);
+  return [...nodeList].map((node) => playerFn(node, playerOptions, ready));
+};
+
+export const setupCloudinaryGlobal = (methods) => {
+  const cloudinary = {
+    ...(window.cloudinary || {}),
+    ...methods,
+  };
+  window.cloudinary = cloudinary;
+  return cloudinary;
+};
diff --git a/src/utils/poster-url.js b/src/utils/poster-url.js
index 32f8e4085..765c3e546 100644
--- a/src/utils/poster-url.js
+++ b/src/utils/poster-url.js
@@ -2,7 +2,7 @@
  * Minimal Cloudinary poster URL builder for video first frame.
  * Used by schedule bootstrap when outside schedule (no full player loaded).
  */
-import { unsigned_url_prefix } from '@cloudinary/url-gen/backwards/utils/unsigned_url_prefix';
+import { getCloudinaryUrlPrefix } from './cloudinary-url-prefix';
 
 const POSTER_TRANSFORMATION = 'so_0,f_auto,q_auto';
 
@@ -16,24 +16,10 @@ const POSTER_TRANSFORMATION = 'so_0,f_auto,q_auto';
 export const buildPosterUrl = (cloudName, publicId, cloudinaryConfig = {}) => {
   const config = {
     cloud_name: cloudName || cloudinaryConfig.cloud_name,
-    private_cdn: cloudinaryConfig.private_cdn,
-    cdn_subdomain: cloudinaryConfig.cdn_subdomain,
-    secure_cdn_subdomain: cloudinaryConfig.secure_cdn_subdomain,
-    cname: cloudinaryConfig.cname,
-    secure: cloudinaryConfig.secure ?? true,
-    secure_distribution: cloudinaryConfig.secure_distribution
+    ...cloudinaryConfig,
+    secure: cloudinaryConfig.secure ?? true
   };
 
-  const prefix = unsigned_url_prefix(
-    null,
-    config.cloud_name,
-    config.private_cdn,
-    config.cdn_subdomain,
-    config.secure_cdn_subdomain,
-    config.cname,
-    config.secure,
-    config.secure_distribution
-  );
-
+  const prefix = getCloudinaryUrlPrefix(config);
   return `${prefix}/video/upload/${POSTER_TRANSFORMATION}/${publicId}`;
 };
diff --git a/src/utils/schedule.js b/src/utils/schedule.js
index 8635cb709..69184ee4d 100644
--- a/src/utils/schedule.js
+++ b/src/utils/schedule.js
@@ -68,14 +68,13 @@ export const scheduleBootstrap = (elem, options) => {
 
   const stub = {
     source: () => stub,
-    loadPlayer: () =>
-      import(/* webpackChunkName: "cld-video-player-core" */ '../video-player.js').then(({ createVideoPlayer }) => {
-        if (container && container.parentNode) {
-          container.parentNode.removeChild(container);
-        }
-        vEl.style.display = '';
-        return createVideoPlayer(vEl, options);
-      }),
+    loadPlayer: () => {
+      if (container && container.parentNode) {
+        container.parentNode.removeChild(container);
+      }
+      vEl.style.display = '';
+      return import('../video-player.js').then((m) => m.createVideoPlayer(vEl, options));
+    }
   };
 
   return stub;
diff --git a/src/validators/validators.js b/src/validators/validators.js
index 1ad64c351..2ed10b946 100644
--- a/src/validators/validators.js
+++ b/src/validators/validators.js
@@ -74,7 +74,7 @@ export const playerValidators = {
       weekly: validator.isArrayOfObjects({
         day: validator.isString,
         start: validator.isString,
-        end: validator.isString
+        duration: validator.isNumber
       })
     },
     cloudinary: {
diff --git a/src/video-player.js b/src/video-player.js
index ec46c7171..ef6527747 100644
--- a/src/video-player.js
+++ b/src/video-player.js
@@ -19,7 +19,6 @@ import {
   getResolveVideoElement,
   extractOptions
 } from './video-player.utils';
-import { fetchAndMergeConfig } from './utils/fetch-config';
 import { FLOATING_TO, FLUID_CLASS_NAME } from './video-player.const';
 import { isValidPlayerConfig, isValidSourceConfig } from './validators/validators-functions';
 import { PLAYER_EVENT, SOURCE_TYPE } from './utils/consts';
@@ -910,18 +909,6 @@ export const createVideoPlayer = (elem, playerOptions = {}, ready) => {
   return new VideoPlayer(videoElement, mergeDefaults(options), ready);
 };
 
-export const createPlayer = async (elem, playerOptions, ready) => {
-  const { videoElement, options } = getConfig(elem, playerOptions);
-  try {
-    const videoConfig = await fetchAndMergeConfig(options);
-    return new VideoPlayer(videoElement, mergeDefaults(videoConfig), ready);
-  } catch (e) {
-    const vp = new VideoPlayer(videoElement, mergeDefaults(options));
-    vp.videojs.error('Invalid profile');
-    throw e;
-  }
-};
-
 /**
  * Create player with pre-merged config (skips fetch).
  * Used by player() when config was already fetched for schedule check.
diff --git a/test/unit/schedule.test.js b/test/unit/schedule.test.js
index 0a6f33170..474e247c2 100644
--- a/test/unit/schedule.test.js
+++ b/test/unit/schedule.test.js
@@ -79,5 +79,31 @@ describe('schedule utils', () => {
       };
       expect(isWithinSchedule(schedule, wednesday2pm)).toBe(true);
     });
+
+    it('handles slot that crosses midnight into the next day', () => {
+      const schedule = {
+        weekly: [{ day: 'monday', start: '22:00', duration: 8 }]
+      };
+      // Monday 23:00 - within slot on start day
+      const monday11pm = new Date(2025, 2, 10, 23, 0);
+      expect(isWithinSchedule(schedule, monday11pm)).toBe(true);
+
+      // Tuesday 03:00 - within slot on next day
+      const tuesday3am = new Date(2025, 2, 11, 3, 0);
+      expect(isWithinSchedule(schedule, tuesday3am)).toBe(true);
+
+      // Tuesday 07:00 - outside slot (ends at 06:00)
+      const tuesday7am = new Date(2025, 2, 11, 7, 0);
+      expect(isWithinSchedule(schedule, tuesday7am)).toBe(false);
+    });
+
+    it('handles cross-midnight slot wrapping Saturday to Sunday', () => {
+      const schedule = {
+        weekly: [{ day: 'saturday', start: '23:00', duration: 4 }]
+      };
+      // Sunday 02:00 - within slot
+      const sunday2am = new Date(2025, 2, 9, 2, 0);
+      expect(isWithinSchedule(schedule, sunday2am)).toBe(true);
+    });
   });
 });
diff --git a/webpack/common.config.js b/webpack/common.config.js
index 8d220ecd3..f91759439 100644
--- a/webpack/common.config.js
+++ b/webpack/common.config.js
@@ -12,7 +12,14 @@ const webpackConfig = {
   context: path.resolve(__dirname, '../src'),
 
   entry: {
-    'cld-video-player': './index.js'
+    'cld-video-player': {
+      import: './index.umd.js',
+      library: { name: 'cloudinary-video-player', type: 'umd' }
+    },
+    'cld-video-player-lazy': {
+      import: './index.lazy.js',
+      library: { name: 'cloudinary-video-player', type: 'umd' }
+    }
   },
 
   output: {
@@ -20,10 +27,6 @@ const webpackConfig = {
     chunkFilename: `[name]${minFilenamePart}.js`,
     path: path.resolve(__dirname, '../dist'),
     publicPath: 'auto',
-    library: {
-      name: 'cloudinary-video-player',
-      type: 'umd'
-    },
     chunkLoadingGlobal: 'cloudinaryVideoPlayerChunkLoading'
   },
 
@@ -43,8 +46,9 @@ const webpackConfig = {
 
   resolve: {
     extensions: ['.js', '.scss'],
-    modules: [path.resolve(__dirname, '../src'), 'node_modules'],
+    modules: ['node_modules'],
     alias: {
+      '~': path.resolve(__dirname, '../src'),
       'video.js': path.resolve(__dirname, '../node_modules/video.js/dist/alt/video.core.js'),
       'video.root.js': path.resolve(__dirname, '../node_modules/video.js')
     }
diff --git a/webpack/es6.config.js b/webpack/es6.config.js
deleted file mode 100644
index e84e1c74b..000000000
--- a/webpack/es6.config.js
+++ /dev/null
@@ -1,43 +0,0 @@
-const { merge } = require('webpack-merge');
-const webpackCommon = require('./common.config');
-const path = require('path');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-
-delete webpackCommon.output; // overwrite
-
-const outputPath = path.resolve(__dirname, '../lib');
-
-module.exports = merge(webpackCommon, {
-  mode: 'production',
-
-  entry: {
-    'cld-video-player': './index.js', // default
-    'videoPlayer': './index.videoPlayer.js',
-    'player': './index.player.js',
-    'all': './index.all.js'
-  },
-
-  output: {
-    filename: '[name].js',
-    path: outputPath,
-    chunkFilename: '[name].js',
-    publicPath: '',
-    library: {
-      type: 'module'
-    },
-    chunkLoadingGlobal: 'cloudinaryVideoPlayerChunkLoading'
-  },
-
-  plugins: [
-    new CopyWebpackPlugin({
-      patterns: [{
-        from: path.resolve(__dirname, '../src/config/configSchema.json'),
-        to: `${outputPath}/schema.json`
-      }]
-    })
-  ],
-
-  experiments: {
-    outputModule: true
-  }
-});