diff --git a/component-toolkit/src/commonMain/kotlin/com/macaosoftware/MacaoApplicationCallback.kt b/component-toolkit/src/commonMain/kotlin/com/macaosoftware/MacaoApplicationCallback.kt
deleted file mode 100644
index ce6a02ee..00000000
--- a/component-toolkit/src/commonMain/kotlin/com/macaosoftware/MacaoApplicationCallback.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.macaosoftware
-
-import com.macaosoftware.plugin.MacaoPlugin
-
-interface MacaoApplicationCallback : MacaoPlugin {
-    fun onExit()
-}
\ No newline at end of file
diff --git a/component-toolkit/src/commonMain/kotlin/com/macaosoftware/plugin/MacaoApplicationCallback.kt b/component-toolkit/src/commonMain/kotlin/com/macaosoftware/plugin/MacaoApplicationCallback.kt
new file mode 100644
index 00000000..06cfabf0
--- /dev/null
+++ b/component-toolkit/src/commonMain/kotlin/com/macaosoftware/plugin/MacaoApplicationCallback.kt
@@ -0,0 +1,5 @@
+package com.macaosoftware.plugin
+
+interface MacaoApplicationCallback : MacaoPlugin {
+    fun onExit()
+}
\ No newline at end of file
diff --git a/composeApp/src/androidMain/kotlin/com/macaosoftware/component/demo/AndroidPluginManagerInitializer.kt b/composeApp/src/androidMain/kotlin/com/macaosoftware/component/demo/AndroidPluginManagerInitializer.kt
index ee90a0e5..8d20932b 100644
--- a/composeApp/src/androidMain/kotlin/com/macaosoftware/component/demo/AndroidPluginManagerInitializer.kt
+++ b/composeApp/src/androidMain/kotlin/com/macaosoftware/component/demo/AndroidPluginManagerInitializer.kt
@@ -1,7 +1,7 @@
 package com.macaosoftware.component.demo
 
 import android.app.Activity
-import com.macaosoftware.MacaoApplicationCallback
+import com.macaosoftware.plugin.MacaoApplicationCallback
 import com.macaosoftware.app.PluginFactory
 import com.macaosoftware.app.PluginManager
 import com.macaosoftware.app.PluginManagerInitializer
diff --git a/composeApp/src/commonMain/kotlin/com/macaosoftware/component/demo/startup/DemoRootComponentInitializer.kt b/composeApp/src/commonMain/kotlin/com/macaosoftware/component/demo/startup/DemoRootComponentInitializer.kt
index 137b32c1..636a914f 100644
--- a/composeApp/src/commonMain/kotlin/com/macaosoftware/component/demo/startup/DemoRootComponentInitializer.kt
+++ b/composeApp/src/commonMain/kotlin/com/macaosoftware/component/demo/startup/DemoRootComponentInitializer.kt
@@ -1,6 +1,6 @@
 package com.macaosoftware.component.demo.startup
 
-import com.macaosoftware.MacaoApplicationCallback
+import com.macaosoftware.plugin.MacaoApplicationCallback
 import com.macaosoftware.component.core.Component
 import com.macaosoftware.component.stack.StackComponent
 import com.macaosoftware.component.stack.StackComponentDefaults
diff --git a/composeApp/src/iosMain/kotlin/com/macaosoftware/component/demo/IosPluginManagerInitializer.kt b/composeApp/src/iosMain/kotlin/com/macaosoftware/component/demo/IosPluginManagerInitializer.kt
index fdbc8009..34ae4a2d 100644
--- a/composeApp/src/iosMain/kotlin/com/macaosoftware/component/demo/IosPluginManagerInitializer.kt
+++ b/composeApp/src/iosMain/kotlin/com/macaosoftware/component/demo/IosPluginManagerInitializer.kt
@@ -1,6 +1,6 @@
 package com.macaosoftware.component.demo
 
-import com.macaosoftware.MacaoApplicationCallback
+import com.macaosoftware.plugin.MacaoApplicationCallback
 import com.macaosoftware.app.PluginFactory
 import com.macaosoftware.app.PluginManager
 import com.macaosoftware.app.PluginManagerInitializer
diff --git a/composeApp/src/jsMain/kotlin/com/macaosoftware/component/demo/JsPluginManagerInitializer.kt b/composeApp/src/jsMain/kotlin/com/macaosoftware/component/demo/JsPluginManagerInitializer.kt
index a83a7023..8ac094ae 100644
--- a/composeApp/src/jsMain/kotlin/com/macaosoftware/component/demo/JsPluginManagerInitializer.kt
+++ b/composeApp/src/jsMain/kotlin/com/macaosoftware/component/demo/JsPluginManagerInitializer.kt
@@ -1,6 +1,6 @@
 package com.macaosoftware.component.demo
 
-import com.macaosoftware.MacaoApplicationCallback
+import com.macaosoftware.plugin.MacaoApplicationCallback
 import com.macaosoftware.app.PluginFactory
 import com.macaosoftware.app.PluginManager
 import com.macaosoftware.app.PluginManagerInitializer
diff --git a/composeApp/src/jvmMain/kotlin/com/macaosoftware/component/demo/JvmPluginManagerInitializer.kt b/composeApp/src/jvmMain/kotlin/com/macaosoftware/component/demo/JvmPluginManagerInitializer.kt
index a667ed45..01f89ec7 100644
--- a/composeApp/src/jvmMain/kotlin/com/macaosoftware/component/demo/JvmPluginManagerInitializer.kt
+++ b/composeApp/src/jvmMain/kotlin/com/macaosoftware/component/demo/JvmPluginManagerInitializer.kt
@@ -1,6 +1,6 @@
 package com.macaosoftware.component.demo
 
-import com.macaosoftware.MacaoApplicationCallback
+import com.macaosoftware.plugin.MacaoApplicationCallback
 import com.macaosoftware.app.PluginFactory
 import com.macaosoftware.app.PluginManager
 import com.macaosoftware.app.PluginManagerInitializer
diff --git a/composeApp/src/wasmJsMain/kotlin/com/macaosoftware/component/demo/WasmPluginManagerInitializer.kt b/composeApp/src/wasmJsMain/kotlin/com/macaosoftware/component/demo/WasmPluginManagerInitializer.kt
index 3243dad5..bd37e07d 100644
--- a/composeApp/src/wasmJsMain/kotlin/com/macaosoftware/component/demo/WasmPluginManagerInitializer.kt
+++ b/composeApp/src/wasmJsMain/kotlin/com/macaosoftware/component/demo/WasmPluginManagerInitializer.kt
@@ -1,6 +1,6 @@
 package com.macaosoftware.component.demo
 
-import com.macaosoftware.MacaoApplicationCallback
+import com.macaosoftware.plugin.MacaoApplicationCallback
 import com.macaosoftware.app.PluginFactory
 import com.macaosoftware.app.PluginManager
 import com.macaosoftware.app.PluginManagerInitializer