diff --git a/ReactCommon/react/nativemodule/core/BUCK b/ReactCommon/react/nativemodule/core/BUCK
index 9de875edcb6542..143dcb6183e395 100644
--- a/ReactCommon/react/nativemodule/core/BUCK
+++ b/ReactCommon/react/nativemodule/core/BUCK
@@ -1,5 +1,7 @@
 load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "CXX", "FBJNI_TARGET", "get_objc_arc_preprocessor_flags", "get_preprocessor_flags_for_build_mode", "get_static_library_ios_flags", "react_native_target", "react_native_xplat_shared_library_target", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
 
+oncall("react_native")
+
 rn_xplat_cxx_library(
     name = "core",
     srcs = glob(
@@ -43,7 +45,7 @@ rn_xplat_cxx_library(
     ],
     ios_exported_headers = subdir_glob(
         [
-            ("platform/ios", "*.h"),
+            ("platform/ios/ReactCommon", "*.h"),
         ],
         prefix = "ReactCommon",
     ),
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTBlockGuard.h b/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTBlockGuard.h
similarity index 100%
rename from ReactCommon/react/nativemodule/core/platform/ios/RCTBlockGuard.h
rename to ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTBlockGuard.h
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTBlockGuard.mm b/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTBlockGuard.mm
similarity index 100%
rename from ReactCommon/react/nativemodule/core/platform/ios/RCTBlockGuard.mm
rename to ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTBlockGuard.mm
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h b/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.h
similarity index 100%
rename from ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h
rename to ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.h
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm b/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm
similarity index 100%
rename from ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm
rename to ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.h b/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.h
similarity index 100%
rename from ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.h
rename to ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.h
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm b/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm
similarity index 100%
rename from ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm
rename to ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm
diff --git a/ReactCommon/react/nativemodule/samples/BUCK b/ReactCommon/react/nativemodule/samples/BUCK
index 2285cf02648ade..ea1153fa91c277 100644
--- a/ReactCommon/react/nativemodule/samples/BUCK
+++ b/ReactCommon/react/nativemodule/samples/BUCK
@@ -1,5 +1,7 @@
 load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "FBJNI_TARGET", "get_objc_arc_preprocessor_flags", "get_preprocessor_flags_for_build_mode", "get_static_library_ios_flags", "react_native_dep", "react_native_target", "react_native_xplat_target", "rn_android_library", "rn_xplat_cxx_library", "subdir_glob")
 
+oncall("react_native")
+
 rn_xplat_cxx_library(
     name = "samples",
     srcs = glob(
@@ -44,7 +46,7 @@ rn_xplat_cxx_library(
     ],
     ios_exported_headers = subdir_glob(
         [
-            ("platform/ios", "*.h"),
+            ("platform/ios/ReactCommon", "*.h"),
         ],
         prefix = "ReactCommon",
     ),
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h b/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTNativeSampleTurboModuleSpec.h
similarity index 100%
rename from ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h
rename to ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTNativeSampleTurboModuleSpec.h
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm b/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTNativeSampleTurboModuleSpec.mm
similarity index 100%
rename from ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm
rename to ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTNativeSampleTurboModuleSpec.mm
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboCxxModule.h b/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboCxxModule.h
similarity index 100%
rename from ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboCxxModule.h
rename to ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboCxxModule.h
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboCxxModule.mm b/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboCxxModule.mm
similarity index 100%
rename from ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboCxxModule.mm
rename to ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboCxxModule.mm
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.h b/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.h
similarity index 100%
rename from ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.h
rename to ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.h
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.mm b/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.mm
similarity index 100%
rename from ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.mm
rename to ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/RCTSampleTurboModule.mm
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.cpp b/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/SampleTurboCxxModuleLegacyImpl.cpp
similarity index 100%
rename from ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.cpp
rename to ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/SampleTurboCxxModuleLegacyImpl.cpp
diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.h b/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/SampleTurboCxxModuleLegacyImpl.h
similarity index 100%
rename from ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.h
rename to ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/SampleTurboCxxModuleLegacyImpl.h