diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt
index 631833e..066c585 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Button.kt
@@ -51,10 +51,10 @@ import com.highcapable.betterandroid.compose.extension.ui.orNull
 import com.highcapable.flexiui.LocalColors
 import com.highcapable.flexiui.LocalShapes
 import com.highcapable.flexiui.LocalSizes
-import com.highcapable.flexiui.interaction.InteractionDefaults
-import com.highcapable.flexiui.interaction.RippleStyle
-import com.highcapable.flexiui.interaction.rippleClickable
-import com.highcapable.flexiui.interaction.rippleToggleable
+import com.highcapable.flexiui.component.interaction.InteractionDefaults
+import com.highcapable.flexiui.component.interaction.RippleStyle
+import com.highcapable.flexiui.component.interaction.rippleClickable
+import com.highcapable.flexiui.component.interaction.rippleToggleable
 
 /**
  * Colors defines for button.
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt
index 29040bc..9b6dec4 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Dropdown.kt
@@ -111,7 +111,7 @@ import com.highcapable.betterandroid.compose.extension.ui.window.Popup
 import com.highcapable.flexiui.LocalColors
 import com.highcapable.flexiui.LocalShapes
 import com.highcapable.flexiui.LocalSizes
-import com.highcapable.flexiui.interaction.rippleClickable
+import com.highcapable.flexiui.component.interaction.rippleClickable
 import com.highcapable.flexiui.resources.FlexiIcons
 import com.highcapable.flexiui.resources.icon.Dropdown
 import kotlin.math.max
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ItemBox.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ItemBox.kt
index cc08179..a50631d 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ItemBox.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/ItemBox.kt
@@ -44,7 +44,7 @@ import com.highcapable.betterandroid.compose.extension.ui.componentState
 import com.highcapable.flexiui.LocalColors
 import com.highcapable.flexiui.LocalSizes
 import com.highcapable.flexiui.LocalTypography
-import com.highcapable.flexiui.interaction.rippleClickable
+import com.highcapable.flexiui.component.interaction.rippleClickable
 import com.highcapable.flexiui.resources.FlexiIcons
 import com.highcapable.flexiui.resources.icon.ArrowForward
 
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/NavigationBar.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/NavigationBar.kt
index 99b11bf..9f40e0c 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/NavigationBar.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/NavigationBar.kt
@@ -60,8 +60,8 @@ import com.highcapable.betterandroid.compose.extension.ui.componentState
 import com.highcapable.betterandroid.compose.extension.ui.orNull
 import com.highcapable.flexiui.LocalColors
 import com.highcapable.flexiui.LocalSizes
-import com.highcapable.flexiui.interaction.InteractionDefaults
-import com.highcapable.flexiui.interaction.rippleClickable
+import com.highcapable.flexiui.component.interaction.InteractionDefaults
+import com.highcapable.flexiui.component.interaction.rippleClickable
 
 /**
  * Colors defines for navigation bar.
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Tab.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Tab.kt
index 53e9348..37d4eaa 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Tab.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Tab.kt
@@ -76,7 +76,7 @@ import com.highcapable.betterandroid.compose.extension.ui.orNull
 import com.highcapable.flexiui.LocalColors
 import com.highcapable.flexiui.LocalShapes
 import com.highcapable.flexiui.LocalSizes
-import com.highcapable.flexiui.interaction.rippleClickable
+import com.highcapable.flexiui.component.interaction.rippleClickable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/interaction/Interaction.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/interaction/Interaction.kt
similarity index 99%
rename from flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/interaction/Interaction.kt
rename to flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/interaction/Interaction.kt
index 9cdcf0b..5307fd9 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/interaction/Interaction.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/interaction/Interaction.kt
@@ -21,7 +21,7 @@
  */
 @file:Suppress("unused")
 
-package com.highcapable.flexiui.interaction
+package com.highcapable.flexiui.component.interaction
 
 import androidx.compose.foundation.Indication
 import androidx.compose.foundation.interaction.MutableInteractionSource
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/window/Dialog.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/window/Dialog.kt
similarity index 99%
rename from flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/window/Dialog.kt
rename to flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/window/Dialog.kt
index 1cadad6..be59556 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/window/Dialog.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/window/Dialog.kt
@@ -21,7 +21,7 @@
  */
 @file:Suppress("unused")
 
-package com.highcapable.flexiui.window
+package com.highcapable.flexiui.component.window
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.Animatable
diff --git a/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt b/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt
index edafdc8..a831b7d 100644
--- a/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt
+++ b/flexiui-core/src/desktopMain/kotlin/com/highcapable/flexiui/component/DesktopContextMenu.kt
@@ -65,7 +65,7 @@ import com.highcapable.betterandroid.compose.extension.ui.orNull
 import com.highcapable.flexiui.LocalColors
 import com.highcapable.flexiui.LocalShapes
 import com.highcapable.flexiui.LocalSizes
-import com.highcapable.flexiui.interaction.rippleClickable
+import com.highcapable.flexiui.component.interaction.rippleClickable
 import java.awt.event.KeyEvent
 
 /**