diff --git a/src/module.ts b/src/module.ts
index 61002e4..8e81f04 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -23,20 +23,20 @@ export default defineNuxtModule<ModuleOptions>({
     const resolver = createResolver(import.meta.url)
 
     // performances
-    addPlugin(resolver.resolve('./runtime/plugins/web-vitals/plugin.client'))
+    addPlugin(resolver.resolve('./runtime/web-vitals/plugin.client'))
 
     // hydration
-    addPlugin(resolver.resolve('./runtime/plugins/hydration/plugin.client'))
+    addPlugin(resolver.resolve('./runtime/hydration/plugin.client'))
     addBuildPlugin(InjectHydrationPlugin)
     addComponent({
       name: 'NuxtIsland',
-      filePath: resolver.resolve('./runtime/components/nuxt-island'),
+      filePath: resolver.resolve('./runtime/core/components/nuxt-island'),
       priority: 1000,
     })
 
     // third-party scripts
-    addPlugin(resolver.resolve('./runtime/plugins/third-party-scripts/plugin.client'))
-    addServerPlugin(resolver.resolve('./runtime/plugins/third-party-scripts/nitro.plugin'))
+    addPlugin(resolver.resolve('./runtime/third-party-scripts/plugin.client'))
+    addServerPlugin(resolver.resolve('./runtime/third-party-scripts/nitro.plugin'))
 
     nuxt.hook('prepare:types', ({ references }) => {
       references.push({
@@ -46,7 +46,7 @@ export default defineNuxtModule<ModuleOptions>({
 
     if (options.devtools) {
       setupDevToolsUI(nuxt, resolver)
-      addPlugin(resolver.resolve('./runtime/plugins/vue-tracer-state.client'))
+      addPlugin(resolver.resolve('./runtime/core/plugins/vue-tracer-state.client'))
     }
   },
 })
diff --git a/src/plugins/hydration.ts b/src/plugins/hydration.ts
index 1f1ee92..20397dd 100644
--- a/src/plugins/hydration.ts
+++ b/src/plugins/hydration.ts
@@ -19,7 +19,7 @@ export const InjectHydrationPlugin = createUnplugin(() => {
       // Add useHydrationCheck after the <script setup> tag
       m.appendRight(
         match.index + match[0].length,
-        `\nimport { useHydrationCheck } from '@nuxt/hints/runtime/composables/hydration'\nuseHydrationCheck();`,
+        `\nimport { useHydrationCheck } from '@nuxt/hints/runtime/hydration/composables'\nuseHydrationCheck();`,
       )
 
       return {
diff --git a/src/runtime/components/nuxt-island.ts b/src/runtime/core/components/nuxt-island.ts
similarity index 100%
rename from src/runtime/components/nuxt-island.ts
rename to src/runtime/core/components/nuxt-island.ts
diff --git a/src/runtime/plugins/vue-tracer-state.client.ts b/src/runtime/core/plugins/vue-tracer-state.client.ts
similarity index 100%
rename from src/runtime/plugins/vue-tracer-state.client.ts
rename to src/runtime/core/plugins/vue-tracer-state.client.ts
diff --git a/src/runtime/composables/hydration.ts b/src/runtime/hydration/composables.ts
similarity index 100%
rename from src/runtime/composables/hydration.ts
rename to src/runtime/hydration/composables.ts
diff --git a/src/runtime/plugins/hydration/plugin.client.ts b/src/runtime/hydration/plugin.client.ts
similarity index 100%
rename from src/runtime/plugins/hydration/plugin.client.ts
rename to src/runtime/hydration/plugin.client.ts
diff --git a/src/runtime/plugins/third-party-scripts/nitro.plugin.ts b/src/runtime/third-party-scripts/nitro.plugin.ts
similarity index 100%
rename from src/runtime/plugins/third-party-scripts/nitro.plugin.ts
rename to src/runtime/third-party-scripts/nitro.plugin.ts
diff --git a/src/runtime/plugins/third-party-scripts/plugin.client.ts b/src/runtime/third-party-scripts/plugin.client.ts
similarity index 100%
rename from src/runtime/plugins/third-party-scripts/plugin.client.ts
rename to src/runtime/third-party-scripts/plugin.client.ts
diff --git a/src/runtime/plugins/web-vitals/plugin.client.ts b/src/runtime/web-vitals/plugin.client.ts
similarity index 100%
rename from src/runtime/plugins/web-vitals/plugin.client.ts
rename to src/runtime/web-vitals/plugin.client.ts
diff --git a/src/runtime/plugins/web-vitals/utils.ts b/src/runtime/web-vitals/utils.ts
similarity index 100%
rename from src/runtime/plugins/web-vitals/utils.ts
rename to src/runtime/web-vitals/utils.ts