diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/UiFactory.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Extension.kt
similarity index 69%
rename from flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/UiFactory.kt
rename to flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Extension.kt
index bd1265a..5963af6 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/UiFactory.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Extension.kt
@@ -21,24 +21,14 @@
  */
 package com.highcapable.flexiui.utils
 
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.border
-import androidx.compose.runtime.Stable
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.RectangleShape
-import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.isSpecified
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.isSpecified
 
 inline fun Dp.orElse() = if (isSpecified) this else null
 
 inline fun Color.orElse() = if (isSpecified) this else null
 
-inline fun TextUnit.orElse() = if (isSpecified) this else null
-
-@Stable
-fun Modifier.borderOrNot(border: BorderStroke, shape: Shape = RectangleShape) = border.takeIf { it.width > 0.dp }?.let { border(it, shape) } ?: this
\ No newline at end of file
+inline fun TextUnit.orElse() = if (isSpecified) this else null
\ No newline at end of file
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Modifier.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Modifier.kt
new file mode 100644
index 0000000..ef21b19
--- /dev/null
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/utils/Modifier.kt
@@ -0,0 +1,12 @@
+package com.highcapable.flexiui.utils
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.border
+import androidx.compose.runtime.Stable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.unit.dp
+
+@Stable
+fun Modifier.borderOrNot(border: BorderStroke, shape: Shape = RectangleShape) = border.takeIf { it.width > 0.dp }?.let { border(it, shape) } ?: this
\ No newline at end of file