diff --git a/src/bundle-client.ts b/src/bundle-client.ts
new file mode 100644
index 00000000..df16aecb
--- /dev/null
+++ b/src/bundle-client.ts
@@ -0,0 +1,52 @@
+import { addTemplate, logger } from '@nuxt/kit'
+import type { IconifyIcon, IconifyJSON } from '@iconify/types'
+import type { ModuleOptions } from './types'
+
+export function registerClientBundle(options: ModuleOptions) {
+  const iconifyCollectionMap = new Map<string, Promise<IconifyJSON | undefined>>()
+
+  // Client bundle
+  addTemplate({
+    filename: 'nuxt-icon-client-bundle.mjs',
+    write: true,
+    async getContents() {
+      const icons = options.clientBundle?.icons || []
+
+      if (!icons.length)
+        return 'export function init() {}'
+
+      const { getIconData } = await import('@iconify/utils')
+      const { loadCollectionFromFS } = await import('@iconify/utils/lib/loader/fs')
+
+      const lines: string[] = []
+
+      lines.push(
+        'import { addIcon } from "@iconify/vue"',
+        'let _initialized = false',
+        'export function init() {',
+        '  if (_initialized)',
+        '    return',
+        ...await Promise.all(icons.map(async (icon) => {
+          const [prefix, name] = icon.split(':')
+          if (!iconifyCollectionMap.has(prefix))
+            iconifyCollectionMap.set(prefix, loadCollectionFromFS(prefix))
+
+          let data: IconifyIcon | null = null
+          const collection = await iconifyCollectionMap.get(prefix)
+          if (collection)
+            data = getIconData(collection, name)
+
+          if (!data) {
+            logger.error(`Nuxt Icon could not fetch the icon data for \`${icon}\``)
+            return `  /* ${icon} failed to load */`
+          }
+          return `  addIcon('${icon}', ${JSON.stringify(data)})`
+        })),
+        '  _initialized = true',
+        '}',
+      )
+
+      return lines.join('\n')
+    },
+  })
+}
diff --git a/src/bundle-server.ts b/src/bundle-server.ts
new file mode 100644
index 00000000..df4724bc
--- /dev/null
+++ b/src/bundle-server.ts
@@ -0,0 +1,209 @@
+import { basename, join, isAbsolute } from 'node:path'
+import fs from 'node:fs/promises'
+import { addTemplate, logger } from '@nuxt/kit'
+import type { Nuxt } from '@nuxt/schema'
+import fg from 'fast-glob'
+import type { IconifyJSON } from '@iconify/types'
+import { isPackageExists } from 'local-pkg'
+import { parseSVGContent, convertParsedSVG } from '@iconify/utils/lib/svg/parse'
+import collectionNames from './collections'
+import type { ModuleOptions, ResolvedServerBundleOptions, CustomCollection, ServerBundleOptions, NuxtIconRuntimeOptions, RemoteCollection } from './types'
+
+const isFullCollectionExists = isPackageExists('@iconify/json')
+
+async function resolveServerBundle(
+  nuxt: Nuxt,
+  options: ServerBundleOptions | Promise<ServerBundleOptions>,
+  customCollections: CustomCollection[] = [],
+): Promise<ResolvedServerBundleOptions> {
+  const resolved = await options
+
+  if (resolved.disabled && customCollections.length)
+    logger.warn('Nuxt Icon server bundle is disabled, the custom collections will not be bundled.')
+
+  if (resolved.disabled) {
+    return {
+      disabled: true,
+      remote: false,
+      collections: [],
+    }
+  }
+
+  if (!resolved.collections)
+    resolved.collections = resolved.remote
+      ? collectionNames
+      : await discoverLocalCollections()
+
+  return {
+    disabled: false,
+    remote: resolved.remote === true
+      ? 'jsdelivr' // Default remote source
+      : resolved.remote || false,
+
+    collections: await Promise.all(([
+      ...(resolved.collections || []),
+      ...customCollections,
+    ])
+      .map(c => resolveCollection(nuxt, c))),
+  }
+}
+
+async function resolveCollection(
+  nuxt: Nuxt,
+  collection: string | IconifyJSON | CustomCollection | RemoteCollection,
+): Promise<string | IconifyJSON | RemoteCollection> {
+  if (typeof collection === 'string')
+    return collection
+  // Custom collection
+  if ('dir' in collection) {
+    const dir = isAbsolute(collection.dir) ? collection.dir : join(nuxt.options.rootDir, collection.dir)
+    const files = (await fg('*.svg', { cwd: dir, onlyFiles: true }))
+      .sort()
+
+    const parsedIcons = await Promise.all(files.map(async (file) => {
+      const name = basename(file, '.svg')
+      let svg = await fs.readFile(join(dir, file), 'utf-8')
+      const cleanupIdx = svg.indexOf('<svg')
+      if (cleanupIdx > 0)
+        svg = svg.slice(cleanupIdx)
+      const data = convertParsedSVG(parseSVGContent(svg)!)
+      if (!data) {
+        logger.error(`Nuxt Icon could not parse the SVG content for icon \`${name}\``)
+        return [name, {}]
+      }
+      if (data.top === 0)
+        delete data.top
+      if (data.left === 0)
+        delete data.left
+      return [name, data]
+    }))
+
+    const successfulIcons = parsedIcons.filter(([_, data]) => Object.keys(data).length > 0)
+    // @ts-expect-error remove extra properties
+    delete collection.dir
+
+    logger.success(`Nuxt Icon loaded local collection \`${collection.prefix}\` with ${successfulIcons.length} icons`)
+    return {
+      ...collection,
+      icons: Object.fromEntries(successfulIcons),
+    }
+  }
+  return collection
+}
+
+export function registerServerBundle(
+  options: ModuleOptions,
+  nuxt: Nuxt,
+  serverBundle: ModuleOptions['serverBundle'],
+) {
+  // Bundle icons for server
+  const bundle = resolveServerBundle(
+    nuxt,
+    (!serverBundle || options.provider !== 'server')
+      ? { disabled: true }
+      : typeof serverBundle === 'string'
+        ? { remote: serverBundle === 'remote' }
+        : serverBundle,
+    options.customCollections,
+  )
+
+  const templateServer = addTemplate({
+    filename: 'nuxt-icon-server-bundle.mjs',
+    write: true,
+    async getContents() {
+      const {
+        collections, remote,
+      } = await bundle
+
+      nuxt.options.appConfig.icon ||= {}
+      const appIcons = nuxt.options.appConfig.icon as NuxtIconRuntimeOptions
+      appIcons.collections ||= []
+      for (const collection of collections) {
+        const prefix = typeof collection === 'string' ? collection : collection.prefix
+        if (!appIcons.collections.includes(prefix))
+          appIcons.collections.push(prefix)
+      }
+
+      const isBundling = !nuxt.options.dev
+
+      function getRemoteEndpoint(name: string) {
+        if (typeof remote === 'function')
+          return remote(name)
+
+        switch (remote) {
+          case 'jsdelivr':
+            return `https://cdn.jsdelivr.net/npm/@iconify-json/${name}/icons.json`
+          case 'unpkg':
+            return `https://unpkg.com/@iconify-json/${name}/icons.json`
+          case 'github-raw':
+            return `https://raw.githubusercontent.com/iconify/icon-sets/master/json/${name}.json`
+          default:
+            throw new Error(`Unknown remote collection source: ${remote}`)
+        }
+      }
+
+      const collectionsValues = collections.map((collection) => {
+        if (typeof collection === 'string') {
+          if (remote) {
+            return `  '${collection}': createRemoteCollection(${JSON.stringify(getRemoteEndpoint(collection))}),`
+          }
+
+          const path = isFullCollectionExists
+            ? `@iconify/json/json/${collection}.json`
+            : `@iconify-json/${collection}/icons.json`
+
+          // When in dev mode, we avoid bundling the icons to improve performance
+          // Get rid of the require() when ESM JSON modules are widely supported
+          return isBundling
+            ? `  '${collection}': () => import('${path}', { with: { type: 'json' } }).then(m => m.default),`
+            : `  '${collection}': () => require('${path}'),`
+        }
+        else {
+          const { prefix } = collection
+          if ('fetchEndpoint' in collection)
+            return `  '${prefix}': createRemoteCollection(${JSON.stringify(collection.fetchEndpoint)}),`
+          return `  '${prefix}': () => (${JSON.stringify(collection)}),`
+        }
+      })
+
+      const lines = [
+        ...(isBundling
+          ? []
+          : [
+            `import { createRequire } from 'module'`,
+            `const require = createRequire(import.meta.url)`,
+            ]
+        ),
+        `function createRemoteCollection(fetchEndpoint) {`,
+        '  let _cache',
+        '  return async () => {',
+        '    if (_cache)',
+        '      return _cache',
+        '    const res = await fetch(fetchEndpoint).then(r => r.json())',
+        '    _cache = res',
+        '    return res',
+        '  }',
+        '}',
+        '',
+        `export const collections = {`,
+        ...collectionsValues,
+        '}',
+      ]
+
+      return lines.join('\n')
+    },
+  })
+  nuxt.options.nitro.alias ||= {}
+  nuxt.options.nitro.alias['#nuxt-icon-server-bundle'] = templateServer.dst
+}
+
+async function discoverLocalCollections(): Promise<ServerBundleOptions['collections']> {
+  const collections = isFullCollectionExists
+    ? collectionNames
+    : collectionNames.filter(collection => isPackageExists('@iconify-json/' + collection))
+  if (isFullCollectionExists)
+    logger.success(`Nuxt Icon discovered local-installed ${collections.length} collections (@iconify/json)`)
+  else if (collections.length)
+    logger.success(`Nuxt Icon discovered local-installed ${collections.length} collections:`, collections.join(', '))
+  return collections
+}
diff --git a/src/module.ts b/src/module.ts
index 623aafee..99370b09 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -1,16 +1,11 @@
-import { basename, join, isAbsolute } from 'node:path'
-import fs from 'node:fs/promises'
-import { defineNuxtModule, addPlugin, addServerHandler, hasNuxtModule, createResolver, addTemplate, addComponent, logger } from '@nuxt/kit'
+import { defineNuxtModule, addPlugin, addServerHandler, hasNuxtModule, createResolver, addComponent, logger } from '@nuxt/kit'
 import { addCustomTab } from '@nuxt/devtools-kit'
-import type { Nuxt } from '@nuxt/schema'
-import fg from 'fast-glob'
-import type { IconifyIcon, IconifyJSON } from '@iconify/types'
-import { isPackageExists } from 'local-pkg'
-import { parseSVGContent, convertParsedSVG } from '@iconify/utils/lib/svg/parse'
 import collectionNames from './collections'
 import { schema } from './schema'
-import type { ModuleOptions, ResolvedServerBundleOptions, CustomCollection, ServerBundleOptions, NuxtIconRuntimeOptions, RemoteCollection } from './types'
+import type { ModuleOptions } from './types'
 import { unocssIntegration } from './integrations/unocss'
+import { registerServerBundle } from './bundle-server'
+import { registerClientBundle } from './bundle-client'
 
 export type { ModuleOptions }
 
@@ -20,8 +15,6 @@ const KEYWORDS_EDGE_TARGETS: string[] = [
   'worker',
 ]
 
-const isFullCollectionExists = isPackageExists('@iconify/json')
-
 export default defineNuxtModule<ModuleOptions>({
   meta: {
     name: '@nuxt/icon',
@@ -116,153 +109,8 @@ export default defineNuxtModule<ModuleOptions>({
       })
     })
 
-    // Bundle icons for server
-    const bundle = resolveServerBundle(
-      nuxt,
-      (!serverBundle || options.provider !== 'server')
-        ? { disabled: true }
-        : typeof serverBundle === 'string'
-          ? { remote: serverBundle === 'remote' }
-          : serverBundle,
-      options.customCollections,
-    )
-
-    const templateServer = addTemplate({
-      filename: 'nuxt-icon-server-bundle.mjs',
-      write: true,
-      async getContents() {
-        const {
-          collections,
-          remote,
-        } = await bundle
-
-        nuxt.options.appConfig.icon ||= {}
-        const appIcons = nuxt.options.appConfig.icon as NuxtIconRuntimeOptions
-        appIcons.collections ||= []
-        for (const collection of collections) {
-          const prefix = typeof collection === 'string' ? collection : collection.prefix
-          if (!appIcons.collections.includes(prefix))
-            appIcons.collections.push(prefix)
-        }
-
-        const isBundling = !nuxt.options.dev
-
-        function getRemoteEndpoint(name: string) {
-          if (typeof remote === 'function')
-            return remote(name)
-
-          switch (remote) {
-            case 'jsdelivr':
-              return `https://cdn.jsdelivr.net/npm/@iconify-json/${name}/icons.json`
-            case 'unpkg':
-              return `https://unpkg.com/@iconify-json/${name}/icons.json`
-            case 'github-raw':
-              return `https://raw.githubusercontent.com/iconify/icon-sets/master/json/${name}.json`
-            default:
-              throw new Error(`Unknown remote collection source: ${remote}`)
-          }
-        }
-
-        const collectionsValues = collections.map((collection) => {
-          if (typeof collection === 'string') {
-            if (remote) {
-              return `  '${collection}': createRemoteCollection(${JSON.stringify(getRemoteEndpoint(collection))}),`
-            }
-
-            const path = isFullCollectionExists
-              ? `@iconify/json/json/${collection}.json`
-              : `@iconify-json/${collection}/icons.json`
-
-            // When in dev mode, we avoid bundling the icons to improve performance
-            // Get rid of the require() when ESM JSON modules are widely supported
-            return isBundling
-              ? `  '${collection}': () => import('${path}', { with: { type: 'json' } }).then(m => m.default),`
-              : `  '${collection}': () => require('${path}'),`
-          }
-          else {
-            const { prefix } = collection
-            if ('fetchEndpoint' in collection)
-              return `  '${prefix}': createRemoteCollection(${JSON.stringify(collection.fetchEndpoint)}),`
-            return `  '${prefix}': () => (${JSON.stringify(collection)}),`
-          }
-        })
-
-        const lines = [
-          ...(isBundling
-            ? []
-            : [
-              `import { createRequire } from 'module'`,
-              `const require = createRequire(import.meta.url)`,
-              ]
-          ),
-          `function createRemoteCollection(fetchEndpoint) {`,
-          '  let _cache',
-          '  return async () => {',
-          '    if (_cache)',
-          '      return _cache',
-          '    const res = await fetch(fetchEndpoint).then(r => r.json())',
-          '    _cache = res',
-          '    return res',
-          '  }',
-          '}',
-          '',
-          `export const collections = {`,
-          ...collectionsValues,
-          '}',
-        ]
-
-        return lines.join('\n')
-      },
-    })
-    nuxt.options.nitro.alias ||= {}
-    nuxt.options.nitro.alias['#nuxt-icon-server-bundle'] = templateServer.dst
-
-    const iconifyCollectionMap = new Map<string, Promise<IconifyJSON | undefined>>()
-
-    // Client bundle
-    addTemplate({
-      filename: 'nuxt-icon-client-bundle.mjs',
-      write: true,
-      async getContents() {
-        const icons = options.clientBundle?.icons || []
-
-        if (!icons.length)
-          return 'export function init() {}'
-
-        const { getIconData } = await import('@iconify/utils')
-        const { loadCollectionFromFS } = await import('@iconify/utils/lib/loader/fs')
-
-        const lines: string[] = []
-
-        lines.push(
-          'import { addIcon } from "@iconify/vue"',
-          'let _initialized = false',
-          'export function init() {',
-          '  if (_initialized)',
-          '    return',
-          ...await Promise.all(icons.map(async (icon) => {
-            const [prefix, name] = icon.split(':')
-            if (!iconifyCollectionMap.has(prefix))
-              iconifyCollectionMap.set(prefix, loadCollectionFromFS(prefix))
-
-            let data: IconifyIcon | null = null
-            const collection = await iconifyCollectionMap.get(prefix)
-            if (collection)
-              data = getIconData(collection, name)
-
-            if (!data) {
-              logger.error(`Nuxt Icon could not fetch the icon data for \`${icon}\``)
-              return `  /* ${icon} failed to load */`
-            }
-            return `  addIcon('${icon}', ${JSON.stringify(data)})`
-          })),
-          '  _initialized = true',
-          '}',
-        )
-
-        return lines.join('\n')
-      },
-    })
+    registerServerBundle(options, nuxt, serverBundle)
+    registerClientBundle(options)
 
     // Devtools
     addCustomTab({
@@ -293,94 +141,3 @@ export default defineNuxtModule<ModuleOptions>({
     await nuxt.callHook('icon:serverKnownCssClasses', serverKnownCssClasses)
   },
 })
-
-async function discoverLocalCollections(): Promise<ServerBundleOptions['collections']> {
-  const collections = isFullCollectionExists
-    ? collectionNames
-    : collectionNames.filter(collection => isPackageExists('@iconify-json/' + collection))
-  if (isFullCollectionExists)
-    logger.success(`Nuxt Icon discovered local-installed ${collections.length} collections (@iconify/json)`)
-  else if (collections.length)
-    logger.success(`Nuxt Icon discovered local-installed ${collections.length} collections:`, collections.join(', '))
-  return collections
-}
-
-async function resolveServerBundle(
-  nuxt: Nuxt,
-  options: ServerBundleOptions | Promise<ServerBundleOptions>,
-  customCollections: CustomCollection[] = [],
-): Promise<ResolvedServerBundleOptions> {
-  const resolved = await options
-
-  if (resolved.disabled && customCollections.length)
-    logger.warn('Nuxt Icon server bundle is disabled, the custom collections will not be bundled.')
-
-  if (resolved.disabled) {
-    return {
-      disabled: true,
-      remote: false,
-      collections: [],
-    }
-  }
-
-  if (!resolved.collections)
-    resolved.collections = resolved.remote
-      ? collectionNames
-      : await discoverLocalCollections()
-
-  return {
-    disabled: false,
-    remote: resolved.remote === true
-      ? 'jsdelivr' // Default remote source
-      : resolved.remote || false,
-
-    collections: await Promise.all(([
-      ...(resolved.collections || []),
-      ...customCollections,
-    ])
-      .map(c => resolveCollection(nuxt, c))),
-  }
-}
-
-async function resolveCollection(
-  nuxt: Nuxt,
-  collection: string | IconifyJSON | CustomCollection | RemoteCollection,
-): Promise<string | IconifyJSON | RemoteCollection> {
-  if (typeof collection === 'string')
-    return collection
-  // Custom collection
-  if ('dir' in collection) {
-    const dir = isAbsolute(collection.dir) ? collection.dir : join(nuxt.options.rootDir, collection.dir)
-    const files = (await fg('*.svg', { cwd: dir, onlyFiles: true }))
-      .sort()
-
-    const parsedIcons = await Promise.all(files.map(async (file) => {
-      const name = basename(file, '.svg')
-      let svg = await fs.readFile(join(dir, file), 'utf-8')
-      const cleanupIdx = svg.indexOf('<svg')
-      if (cleanupIdx > 0)
-        svg = svg.slice(cleanupIdx)
-      const data = convertParsedSVG(parseSVGContent(svg)!)
-      if (!data) {
-        logger.error(`Nuxt Icon could not parse the SVG content for icon \`${name}\``)
-        return [name, {}]
-      }
-      if (data.top === 0)
-        delete data.top
-      if (data.left === 0)
-        delete data.left
-      return [name, data]
-    }))
-
-    const successfulIcons = parsedIcons.filter(([_, data]) => Object.keys(data).length > 0)
-    // @ts-expect-error remove extra properties
-    delete collection.dir
-
-    logger.success(`Nuxt Icon loaded local collection \`${collection.prefix}\` with ${successfulIcons.length} icons`)
-    return {
-      ...collection,
-      icons: Object.fromEntries(successfulIcons),
-    }
-  }
-  return collection
-}