diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK
index 12f7279dd60..ede1b68846a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK
@@ -47,5 +47,6 @@ rn_xplat_cxx_library(
         "//xplat/js/react-native-github:generated_components-rncore",
         react_native_xplat_target("react/renderer/components/image:image"),
         react_native_xplat_target("react/renderer/components/text:text"),
+        react_native_xplat_target("react/renderer/components/textinput:androidtextinput"),
     ],
 )
diff --git a/ReactCommon/react/renderer/components/textinput/BUCK b/ReactCommon/react/renderer/components/textinput/BUCK
index 6a09a1034da..7667e5515de 100644
--- a/ReactCommon/react/renderer/components/textinput/BUCK
+++ b/ReactCommon/react/renderer/components/textinput/BUCK
@@ -29,7 +29,7 @@ rn_xplat_cxx_library(
     exported_headers = subdir_glob(
         [
             ("", "*.h"),
-            ("androidtextinput", "*.h"),
+            ("androidtextinput/react/renderer/components/androidtextinput", "*.h"),
         ],
         prefix = "react/renderer/components/androidtextinput",
     ),
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputComponentDescriptor.h
rename to ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputEventEmitter.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputEventEmitter.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputEventEmitter.cpp
rename to ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputEventEmitter.cpp
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputEventEmitter.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputEventEmitter.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputEventEmitter.h
rename to ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputEventEmitter.h
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputProps.cpp
rename to ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputProps.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputProps.h
rename to ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputShadowNode.cpp
rename to ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputShadowNode.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputShadowNode.h
rename to ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputState.cpp b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputState.cpp
rename to ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputState.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/androidtextinput/AndroidTextInputState.h
rename to ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h