diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
index 87ee60ed353..27ad7f64b71 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BUCK
@@ -76,7 +76,6 @@ rn_android_library(
         react_native_target("java/com/facebook/debug/tags:tags"),
         react_native_target("java/com/facebook/debug/holder:holder"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
-        react_native_target("java/com/facebook/react/uimanager/jni:jni"),
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/common/mapbuffer:mapbuffer"),
         react_native_target("java/com/facebook/react/config:config"),
@@ -86,6 +85,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/touch:touch"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager/util:util"),
+        react_native_target("jni/react/uimanager:jni"),
         react_native_target("res:uimanager"),
     ],
     exported_deps = [
diff --git a/ReactAndroid/src/main/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/CMakeLists.txt
index eaeded22a3b..bd0a7727c76 100644
--- a/ReactAndroid/src/main/jni/CMakeLists.txt
+++ b/ReactAndroid/src/main/jni/CMakeLists.txt
@@ -98,7 +98,7 @@ add_react_android_subdir(src/main/jni/react/jni)
 add_react_android_subdir(src/main/jni/react/reactperflogger)
 add_react_android_subdir(src/main/java/com/facebook/react/jscexecutor)
 add_react_android_subdir(src/main/java/com/facebook/react/turbomodule/core/jni)
-add_react_android_subdir(src/main/java/com/facebook/react/uimanager/jni)
+add_react_android_subdir(src/main/jni/react/uimanager)
 add_react_android_subdir(src/main/java/com/facebook/react/common/mapbuffer/jni)
 add_react_android_subdir(src/main/java/com/facebook/react/fabric/jni)
 add_react_android_subdir(src/main/java/com/facebook/react/modules/blob/jni)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK b/ReactAndroid/src/main/jni/react/uimanager/BUCK
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/BUCK
rename to ReactAndroid/src/main/jni/react/uimanager/BUCK
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/CMakeLists.txt b/ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/CMakeLists.txt
rename to ReactAndroid/src/main/jni/react/uimanager/CMakeLists.txt
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp b/ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverManager.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp
rename to ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverManager.cpp
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h b/ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverManager.h
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h
rename to ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverManager.h
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/react/uimanager/OnLoad.cpp
similarity index 100%
rename from ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/OnLoad.cpp
rename to ReactAndroid/src/main/jni/react/uimanager/OnLoad.cpp