diff --git a/core/src/main/java/com/terning/core/designsystem/textfield/NameTextField.kt b/core/src/main/java/com/terning/core/designsystem/component/textfield/NameTextField.kt
similarity index 95%
rename from core/src/main/java/com/terning/core/designsystem/textfield/NameTextField.kt
rename to core/src/main/java/com/terning/core/designsystem/component/textfield/NameTextField.kt
index 6b5a9ec9a..88d60457d 100644
--- a/core/src/main/java/com/terning/core/designsystem/textfield/NameTextField.kt
+++ b/core/src/main/java/com/terning/core/designsystem/component/textfield/NameTextField.kt
@@ -1,4 +1,4 @@
-package com.terning.core.designsystem.textfield
+package com.terning.core.designsystem.component.textfield
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
diff --git a/core/src/main/java/com/terning/core/designsystem/component/textfield/SearchTextField.kt b/core/src/main/java/com/terning/core/designsystem/component/textfield/SearchTextField.kt
new file mode 100644
index 000000000..bc065431e
--- /dev/null
+++ b/core/src/main/java/com/terning/core/designsystem/component/textfield/SearchTextField.kt
@@ -0,0 +1,29 @@
+package com.terning.core.designsystem.component.textfield
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.SolidColor
+import com.terning.core.designsystem.theme.Grey300
+import com.terning.core.designsystem.theme.Grey400
+import com.terning.core.designsystem.theme.TerningTheme
+
+@Composable
+fun SearchTextField(
+    text: String,
+    onValueChange: (String) -> Unit,
+    hint: String,
+    leftIcon: Int,
+) {
+    TerningBasicTextField(
+        value = text,
+        onValueChange = onValueChange,
+        textStyle = TerningTheme.typography.button3,
+        textColor = Grey400,
+        cursorBrush = SolidColor(Grey300),
+        drawLineColor = Grey300,
+        strokeWidth = 2f,
+        hint = hint,
+        hintColor = Grey300,
+        leftIcon = leftIcon,
+        leftIconColor = Grey400,
+    )
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/terning/core/designsystem/textfield/TerningBasicTextField.kt b/core/src/main/java/com/terning/core/designsystem/component/textfield/TerningBasicTextField.kt
similarity index 98%
rename from core/src/main/java/com/terning/core/designsystem/textfield/TerningBasicTextField.kt
rename to core/src/main/java/com/terning/core/designsystem/component/textfield/TerningBasicTextField.kt
index 7a030647e..358e42b5a 100644
--- a/core/src/main/java/com/terning/core/designsystem/textfield/TerningBasicTextField.kt
+++ b/core/src/main/java/com/terning/core/designsystem/component/textfield/TerningBasicTextField.kt
@@ -1,4 +1,4 @@
-package com.terning.core.designsystem.textfield
+package com.terning.core.designsystem.component.textfield
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
diff --git a/core/src/main/java/com/terning/core/designsystem/textfield/SearchTextField.kt b/core/src/main/java/com/terning/core/designsystem/textfield/SearchTextField.kt
deleted file mode 100644
index e06cfa14f..000000000
--- a/core/src/main/java/com/terning/core/designsystem/textfield/SearchTextField.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.terning.core.designsystem.textfield
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.SolidColor
-import com.terning.core.designsystem.theme.Grey300
-import com.terning.core.designsystem.theme.Grey400
-import com.terning.core.designsystem.theme.TerningTheme
-
-@Composable
-fun SearchTextField(
-    text: String,
-    onValueChange: (String) -> Unit,
-    hint: String,
-    leftIcon: Int,
-) {
-//    TerningBasicTextField(
-//        value = text,
-//        onValueChange = onValueChange,
-//        textStyle = TerningTheme.typography.button3,
-//        textColor = Grey400,
-//        cursorBrush = SolidColor(Grey300),
-//        drawLineColor = Grey300,
-//        strokeWidth = 2f,
-//        hint = hint,
-//        hintColor = Grey300,
-//        leftIcon = leftIcon,
-//        leftIconColor = Grey400,
-//    )
-}
\ No newline at end of file
diff --git a/feature/src/main/java/com/terning/feature/search/SearchRoute.kt b/feature/src/main/java/com/terning/feature/search/SearchRoute.kt
index 1c2531d5a..90701416c 100644
--- a/feature/src/main/java/com/terning/feature/search/SearchRoute.kt
+++ b/feature/src/main/java/com/terning/feature/search/SearchRoute.kt
@@ -1,22 +1,18 @@
 package com.terning.feature.search
 
-import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.terning.core.designsystem.textfield.NameTextField
-import com.terning.core.designsystem.textfield.SearchTextField
+import com.terning.core.designsystem.component.textfield.NameTextField
+import com.terning.core.designsystem.component.textfield.SearchTextField
 import com.terning.core.designsystem.theme.Grey400
 import com.terning.core.designsystem.theme.TerningMain
 import com.terning.core.designsystem.theme.WarningRed