diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK b/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK
index 28b6cf40d8289b..7b60f0a67174bc 100644
--- a/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK
+++ b/ReactCommon/react/renderer/components/textinput/iostextinput/BUCK
@@ -12,6 +12,8 @@ load(
     "subdir_glob",
 )
 
+oncall("react_native")
+
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
@@ -28,6 +30,7 @@ rn_xplat_cxx_library(
     exported_headers = subdir_glob(
         [
             ("", "*.h"),
+            ("react/renderer/components/iostextinput", "*.h"),
         ],
         # TODO(shergin) T26519801 Figure out better directories structure
         prefix = "react/renderer/components/iostextinput",
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputComponentDescriptor.h b/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputComponentDescriptor.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/iostextinput/TextInputComponentDescriptor.h
rename to ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputComponentDescriptor.h
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.cpp
rename to ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.cpp
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.h b/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/iostextinput/TextInputEventEmitter.h
rename to ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.h
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
rename to ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.cpp
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.h b/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.h
rename to ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.h
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputShadowNode.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.cpp
rename to ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputShadowNode.cpp
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.h b/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputShadowNode.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/iostextinput/TextInputShadowNode.h
rename to ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputShadowNode.h
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.cpp b/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputState.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.cpp
rename to ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputState.cpp
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.h b/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputState.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/iostextinput/TextInputState.h
rename to ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputState.h
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h b/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/conversions.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/iostextinput/conversions.h
rename to ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/conversions.h
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h b/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/primitives.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/iostextinput/primitives.h
rename to ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/primitives.h
diff --git a/ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h b/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/propsConversions.h
similarity index 100%
rename from ReactCommon/react/renderer/components/textinput/iostextinput/propsConversions.h
rename to ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/propsConversions.h