diff --git a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/OneshotFreezeBurn.kt b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/OneshotFreezeBurn.kt
similarity index 97%
rename from core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/OneshotFreezeBurn.kt
rename to core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/OneshotFreezeBurn.kt
index 6bddd67..bc56c73 100644
--- a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/OneshotFreezeBurn.kt
+++ b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/OneshotFreezeBurn.kt
@@ -1,4 +1,4 @@
-package cn.rdlevel.rdkt.core.data
+package cn.rdlevel.rdkt.core.data.row
 
 import kotlin.jvm.JvmStatic
 
diff --git a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/OneshotHold.kt b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/OneshotHold.kt
similarity index 97%
rename from core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/OneshotHold.kt
rename to core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/OneshotHold.kt
index baab79f..83c294e 100644
--- a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/OneshotHold.kt
+++ b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/OneshotHold.kt
@@ -1,4 +1,4 @@
-package cn.rdlevel.rdkt.core.data
+package cn.rdlevel.rdkt.core.data.row
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/OneshotPulse.kt b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/OneshotPulse.kt
similarity index 98%
rename from core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/OneshotPulse.kt
rename to core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/OneshotPulse.kt
index 2e60a10..c5cb116 100644
--- a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/OneshotPulse.kt
+++ b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/OneshotPulse.kt
@@ -1,4 +1,4 @@
-package cn.rdlevel.rdkt.core.data
+package cn.rdlevel.rdkt.core.data.row
 
 import kotlin.jvm.JvmOverloads
 import kotlin.jvm.JvmStatic
diff --git a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/RowPattern.kt b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/RowPattern.kt
similarity index 97%
rename from core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/RowPattern.kt
rename to core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/RowPattern.kt
index b161e75..bbe28a8 100644
--- a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/RowPattern.kt
+++ b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/RowPattern.kt
@@ -1,7 +1,7 @@
-package cn.rdlevel.rdkt.core.data
+package cn.rdlevel.rdkt.core.data.row
 
 import cn.rdlevel.rdkt.core.annotations.RDKTInternalAPI
-import cn.rdlevel.rdkt.core.data.RowPattern.Companion.ALLOWED_CHARS
+import cn.rdlevel.rdkt.core.data.row.RowPattern.Companion.ALLOWED_CHARS
 import cn.rdlevel.rdkt.core.serialization.TransformSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.serializer
diff --git a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/SyncoSettings.kt b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/SyncoSettings.kt
similarity index 98%
rename from core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/SyncoSettings.kt
rename to core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/SyncoSettings.kt
index e85b77a..4ff4c4a 100644
--- a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/SyncoSettings.kt
+++ b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/SyncoSettings.kt
@@ -1,4 +1,4 @@
-package cn.rdlevel.rdkt.core.data
+package cn.rdlevel.rdkt.core.data.row
 
 import kotlin.jvm.JvmStatic
 
diff --git a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/SyncoStyle.kt b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/SyncoStyle.kt
similarity index 96%
rename from core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/SyncoStyle.kt
rename to core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/SyncoStyle.kt
index c972ddd..f0e1148 100644
--- a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/SyncoStyle.kt
+++ b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/data/row/SyncoStyle.kt
@@ -1,4 +1,4 @@
-package cn.rdlevel.rdkt.core.data
+package cn.rdlevel.rdkt.core.data.row
 
 import kotlin.jvm.JvmStatic
 
diff --git a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/events/AddOneshotBeatEvent.kt b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/events/AddOneshotBeatEvent.kt
index dab92fe..ce45f59 100644
--- a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/events/AddOneshotBeatEvent.kt
+++ b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/events/AddOneshotBeatEvent.kt
@@ -4,9 +4,9 @@ package cn.rdlevel.rdkt.core.events
 
 
 import cn.rdlevel.rdkt.core.annotations.RDKTInternalAPI
-import cn.rdlevel.rdkt.core.data.OneshotFreezeBurn
-import cn.rdlevel.rdkt.core.data.OneshotHold
-import cn.rdlevel.rdkt.core.data.OneshotPulse
+import cn.rdlevel.rdkt.core.data.row.OneshotFreezeBurn
+import cn.rdlevel.rdkt.core.data.row.OneshotHold
+import cn.rdlevel.rdkt.core.data.row.OneshotPulse
 import cn.rdlevel.rdkt.core.serialization.TransformSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/events/NarrateRowInfoEvent.kt b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/events/NarrateRowInfoEvent.kt
index a5d1c2f..879d649 100644
--- a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/events/NarrateRowInfoEvent.kt
+++ b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/events/NarrateRowInfoEvent.kt
@@ -1,7 +1,7 @@
 package cn.rdlevel.rdkt.core.events
 
 
-import cn.rdlevel.rdkt.core.data.RowPattern
+import cn.rdlevel.rdkt.core.data.row.RowPattern
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
diff --git a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/events/SetRowXsEvent.kt b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/events/SetRowXsEvent.kt
index 2312699..2c21afb 100644
--- a/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/events/SetRowXsEvent.kt
+++ b/core/src/commonMain/kotlin/cn/rdlevel/rdkt/core/events/SetRowXsEvent.kt
@@ -4,9 +4,9 @@ package cn.rdlevel.rdkt.core.events
 
 
 import cn.rdlevel.rdkt.core.annotations.RDKTInternalAPI
-import cn.rdlevel.rdkt.core.data.RowPattern
-import cn.rdlevel.rdkt.core.data.SyncoSettings
-import cn.rdlevel.rdkt.core.data.SyncoStyle
+import cn.rdlevel.rdkt.core.data.row.RowPattern
+import cn.rdlevel.rdkt.core.data.row.SyncoSettings
+import cn.rdlevel.rdkt.core.data.row.SyncoStyle
 import cn.rdlevel.rdkt.core.serialization.TransformSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -15,7 +15,7 @@ import kotlinx.serialization.Serializable
  * Sets the row pattern and synco settings for a row.
  *
  * @property pattern The [RowPattern] representing the pulse pattern of the row.
- * @property synco The [cn.rdlevel.rdkt.core.data.SyncoSettings] representing the synco settings of the row.
+ * @property synco The [SyncoSettings] representing the synco settings of the row.
  */
 @Serializable(SetRowXsEvent.Serializer::class)
 @SerialName("SetRowXs")
diff --git a/core/src/commonTest/kotlin/cn/rdlevel/rdkt/core/test/NarrateRowInfoEventTest.kt b/core/src/commonTest/kotlin/cn/rdlevel/rdkt/core/test/NarrateRowInfoEventTest.kt
index b6861ea..676759e 100644
--- a/core/src/commonTest/kotlin/cn/rdlevel/rdkt/core/test/NarrateRowInfoEventTest.kt
+++ b/core/src/commonTest/kotlin/cn/rdlevel/rdkt/core/test/NarrateRowInfoEventTest.kt
@@ -1,6 +1,6 @@
 package cn.rdlevel.rdkt.core.test
 
-import cn.rdlevel.rdkt.core.data.RowPattern
+import cn.rdlevel.rdkt.core.data.row.RowPattern
 import cn.rdlevel.rdkt.core.events.Event
 import cn.rdlevel.rdkt.core.events.NarrateRowInfoEvent
 import kotlinx.serialization.ExperimentalSerializationApi