diff --git a/ReactCommon/react/renderer/imagemanager/BUCK b/ReactCommon/react/renderer/imagemanager/BUCK
index fa5c067f08d556..2bb98e086b2d29 100644
--- a/ReactCommon/react/renderer/imagemanager/BUCK
+++ b/ReactCommon/react/renderer/imagemanager/BUCK
@@ -13,6 +13,8 @@ load(
     "subdir_glob",
 )
 
+oncall("react_native")
+
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
@@ -49,7 +51,7 @@ rn_xplat_cxx_library(
     ios_exported_headers = subdir_glob(
         [
             ("", "*.h"),
-            ("platform/ios", "RCTImagePrimitivesConversions.h"),
+            ("platform/ios/react/renderer/imagemanager", "RCTImagePrimitivesConversions.h"),
         ],
         prefix = "react/renderer/imagemanager",
     ),
@@ -61,7 +63,7 @@ rn_xplat_cxx_library(
     ios_headers = subdir_glob(
         [
             ("", "*.h"),
-            ("platform/ios", "**/*.h"),
+            ("platform/ios/react/renderer/imagemanager", "**/*.h"),
         ],
         prefix = "",
     ),
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/ImageManager.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageManager.mm
similarity index 100%
rename from ReactCommon/react/renderer/imagemanager/platform/ios/ImageManager.mm
rename to ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageManager.mm
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/ImageRequest.cpp b/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp
similarity index 100%
rename from ReactCommon/react/renderer/imagemanager/platform/ios/ImageRequest.cpp
rename to ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.h b/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManager.h
similarity index 100%
rename from ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.h
rename to ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManager.h
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManager.mm
similarity index 100%
rename from ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
rename to ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManager.mm
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManagerProtocol.h b/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManagerProtocol.h
similarity index 100%
rename from ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManagerProtocol.h
rename to ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManagerProtocol.h
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h b/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImagePrimitivesConversions.h
similarity index 100%
rename from ReactCommon/react/renderer/imagemanager/platform/ios/RCTImagePrimitivesConversions.h
rename to ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImagePrimitivesConversions.h
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.h b/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTSyncImageManager.h
similarity index 100%
rename from ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.h
rename to ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTSyncImageManager.h
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTSyncImageManager.mm
similarity index 100%
rename from ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm
rename to ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTSyncImageManager.mm