diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
index 90e47e77f5d..018f45b834e 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
@@ -8,10 +8,10 @@
 #import "RCTScrollViewComponentView.h"
 
 #import <React/RCTAssert.h>
+#import <fabric/components/scrollview/ScrollViewLocalData.h>
+#import <fabric/components/scrollview/ScrollViewProps.h>
+#import <fabric/components/scrollview/ScrollViewEventEmitter.h>
 #import <fabric/graphics/Geometry.h>
-#import <fabric/scrollview/ScrollViewLocalData.h>
-#import <fabric/scrollview/ScrollViewProps.h>
-#import <fabric/scrollview/ScrollViewEventEmitter.h>
 
 #import "RCTConversions.h"
 #import "RCTEnhancedScrollView.h"
diff --git a/ReactCommon/fabric/scrollview/BUCK b/ReactCommon/fabric/components/scrollview/BUCK
similarity index 97%
rename from ReactCommon/fabric/scrollview/BUCK
rename to ReactCommon/fabric/components/scrollview/BUCK
index d7343182b5a..007249e5f68 100644
--- a/ReactCommon/fabric/scrollview/BUCK
+++ b/ReactCommon/fabric/components/scrollview/BUCK
@@ -28,7 +28,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "fabric/scrollview",
+        prefix = "fabric/components/scrollview",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/scrollview/ScrollViewComponentDescriptor.h b/ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h
similarity index 87%
rename from ReactCommon/fabric/scrollview/ScrollViewComponentDescriptor.h
rename to ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h
index b1c075980ff..9b7b3737735 100644
--- a/ReactCommon/fabric/scrollview/ScrollViewComponentDescriptor.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewComponentDescriptor.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include <fabric/components/scrollview/ScrollViewShadowNode.h>
 #include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/scrollview/ScrollViewShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/scrollview/ScrollViewEventEmitter.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.cpp
similarity index 100%
rename from ReactCommon/fabric/scrollview/ScrollViewEventEmitter.cpp
rename to ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.cpp
diff --git a/ReactCommon/fabric/scrollview/ScrollViewEventEmitter.h b/ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
similarity index 100%
rename from ReactCommon/fabric/scrollview/ScrollViewEventEmitter.h
rename to ReactCommon/fabric/components/scrollview/ScrollViewEventEmitter.h
diff --git a/ReactCommon/fabric/scrollview/ScrollViewLocalData.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.cpp
similarity index 100%
rename from ReactCommon/fabric/scrollview/ScrollViewLocalData.cpp
rename to ReactCommon/fabric/components/scrollview/ScrollViewLocalData.cpp
diff --git a/ReactCommon/fabric/scrollview/ScrollViewLocalData.h b/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.h
similarity index 100%
rename from ReactCommon/fabric/scrollview/ScrollViewLocalData.h
rename to ReactCommon/fabric/components/scrollview/ScrollViewLocalData.h
diff --git a/ReactCommon/fabric/scrollview/ScrollViewProps.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp
similarity index 99%
rename from ReactCommon/fabric/scrollview/ScrollViewProps.cpp
rename to ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp
index c3b1b4e7a7e..cdee74966e6 100644
--- a/ReactCommon/fabric/scrollview/ScrollViewProps.cpp
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp
@@ -7,9 +7,9 @@
 
 #include "ScrollViewProps.h"
 
-#include <fabric/graphics/conversions.h>
-#include <fabric/scrollview/conversions.h>
+#include <fabric/components/scrollview/conversions.h>
 #include <fabric/debug/debugStringConvertibleUtils.h>
+#include <fabric/graphics/conversions.h>
 
 #include <fabric/core/propsConversions.h>
 
diff --git a/ReactCommon/fabric/scrollview/ScrollViewProps.h b/ReactCommon/fabric/components/scrollview/ScrollViewProps.h
similarity index 96%
rename from ReactCommon/fabric/scrollview/ScrollViewProps.h
rename to ReactCommon/fabric/components/scrollview/ScrollViewProps.h
index 219902470cb..ff5562a6a3b 100644
--- a/ReactCommon/fabric/scrollview/ScrollViewProps.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewProps.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <fabric/scrollview/primitives.h>
+#include <fabric/components/scrollview/primitives.h>
 #include <fabric/view/ViewProps.h>
 
 namespace facebook {
diff --git a/ReactCommon/fabric/scrollview/ScrollViewShadowNode.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.cpp
similarity index 100%
rename from ReactCommon/fabric/scrollview/ScrollViewShadowNode.cpp
rename to ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.cpp
diff --git a/ReactCommon/fabric/scrollview/ScrollViewShadowNode.h b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
similarity index 88%
rename from ReactCommon/fabric/scrollview/ScrollViewShadowNode.h
rename to ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
index c2db4ed66c8..1c8f77830cb 100644
--- a/ReactCommon/fabric/scrollview/ScrollViewShadowNode.h
+++ b/ReactCommon/fabric/components/scrollview/ScrollViewShadowNode.h
@@ -9,9 +9,9 @@
 
 #include <memory>
 
+#include <fabric/components/scrollview/ScrollViewEventEmitter.h>
+#include <fabric/components/scrollview/ScrollViewProps.h>
 #include <fabric/core/LayoutContext.h>
-#include <fabric/scrollview/ScrollViewEventEmitter.h>
-#include <fabric/scrollview/ScrollViewProps.h>
 #include <fabric/view/ConcreteViewShadowNode.h>
 
 namespace facebook {
diff --git a/ReactCommon/fabric/scrollview/conversions.h b/ReactCommon/fabric/components/scrollview/conversions.h
similarity index 97%
rename from ReactCommon/fabric/scrollview/conversions.h
rename to ReactCommon/fabric/components/scrollview/conversions.h
index e0fc07a6c50..e7f6ba0f4ea 100644
--- a/ReactCommon/fabric/scrollview/conversions.h
+++ b/ReactCommon/fabric/components/scrollview/conversions.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <fabric/scrollview/primitives.h>
+#include <fabric/components/scrollview/primitives.h>
 #include <folly/dynamic.h>
 
 namespace facebook {
diff --git a/ReactCommon/fabric/scrollview/primitives.h b/ReactCommon/fabric/components/scrollview/primitives.h
similarity index 100%
rename from ReactCommon/fabric/scrollview/primitives.h
rename to ReactCommon/fabric/components/scrollview/primitives.h
diff --git a/ReactCommon/fabric/scrollview/tests/ScrollViewTest.cpp b/ReactCommon/fabric/components/scrollview/tests/ScrollViewTest.cpp
similarity index 100%
rename from ReactCommon/fabric/scrollview/tests/ScrollViewTest.cpp
rename to ReactCommon/fabric/components/scrollview/tests/ScrollViewTest.cpp
diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/fabric/uimanager/BUCK
index 52c3d1f6eb8..49af8f32ce9 100644
--- a/ReactCommon/fabric/uimanager/BUCK
+++ b/ReactCommon/fabric/uimanager/BUCK
@@ -56,11 +56,11 @@ rn_xplat_cxx_library(
         "xplat//folly:memory",
         "xplat//folly:molly",
         "xplat//third-party/glog:glog",
+        react_native_xplat_target("fabric/components/scrollview:scrollview"),
         react_native_xplat_target("fabric/components/text:text"),
         react_native_xplat_target("fabric/core:core"),
         react_native_xplat_target("fabric/debug:debug"),
         react_native_xplat_target("fabric/view:view"),
-        react_native_xplat_target("fabric/scrollview:scrollview"),
     ],
 )
 
diff --git a/ReactCommon/fabric/uimanager/Scheduler.cpp b/ReactCommon/fabric/uimanager/Scheduler.cpp
index d42adc224d2..027f7cade8c 100644
--- a/ReactCommon/fabric/uimanager/Scheduler.cpp
+++ b/ReactCommon/fabric/uimanager/Scheduler.cpp
@@ -5,11 +5,11 @@
 
 #include "Scheduler.h"
 
+#include <fabric/components/scrollview/ScrollViewComponentDescriptor.h>
 #include <fabric/components/text/ParagraphComponentDescriptor.h>
 #include <fabric/components/text/RawTextComponentDescriptor.h>
 #include <fabric/components/text/TextComponentDescriptor.h>
 #include <fabric/core/LayoutContext.h>
-#include <fabric/scrollview/ScrollViewComponentDescriptor.h>
 #include <fabric/uimanager/ComponentDescriptorRegistry.h>
 #include <fabric/uimanager/FabricUIManager.h>
 #include <fabric/view/ViewComponentDescriptor.h>