diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
index 770913113ec..ecdc55569cf 100644
--- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
@@ -7,10 +7,10 @@
 
 #import "RCTParagraphComponentView.h"
 
+#import <fabric/components/text/ParagraphLocalData.h>
+#import <fabric/components/text/ParagraphProps.h>
 #import <fabric/core/LocalData.h>
 #import <fabric/graphics/Geometry.h>
-#import <fabric/text/ParagraphLocalData.h>
-#import <fabric/text/ParagraphProps.h>
 #import <fabric/textlayoutmanager/TextLayoutManager.h>
 #import <fabric/textlayoutmanager/RCTTextLayoutManager.h>
 #import "RCTConversions.h"
diff --git a/ReactCommon/fabric/text/BUCK b/ReactCommon/fabric/components/text/BUCK
similarity index 98%
rename from ReactCommon/fabric/text/BUCK
rename to ReactCommon/fabric/components/text/BUCK
index dd51a9b5b6b..c9711245d75 100644
--- a/ReactCommon/fabric/text/BUCK
+++ b/ReactCommon/fabric/components/text/BUCK
@@ -32,7 +32,7 @@ rn_xplat_cxx_library(
             ("text", "*.h"),
             ("rawtext", "*.h"),
         ],
-        prefix = "fabric/text",
+        prefix = "fabric/components/text",
     ),
     compiler_flags = [
         "-fexceptions",
diff --git a/ReactCommon/fabric/text/basetext/BaseTextProps.cpp b/ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp
similarity index 100%
rename from ReactCommon/fabric/text/basetext/BaseTextProps.cpp
rename to ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp
diff --git a/ReactCommon/fabric/text/basetext/BaseTextProps.h b/ReactCommon/fabric/components/text/basetext/BaseTextProps.h
similarity index 100%
rename from ReactCommon/fabric/text/basetext/BaseTextProps.h
rename to ReactCommon/fabric/components/text/basetext/BaseTextProps.h
diff --git a/ReactCommon/fabric/text/basetext/BaseTextShadowNode.cpp b/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp
similarity index 89%
rename from ReactCommon/fabric/text/basetext/BaseTextShadowNode.cpp
rename to ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp
index ec97f412444..6f7c0333b14 100644
--- a/ReactCommon/fabric/text/basetext/BaseTextShadowNode.cpp
+++ b/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.cpp
@@ -7,11 +7,11 @@
 
 #include "BaseTextShadowNode.h"
 
+#include <fabric/components/text/RawTextShadowNode.h>
+#include <fabric/components/text/RawTextProps.h>
+#include <fabric/components/text/TextShadowNode.h>
+#include <fabric/components/text/TextProps.h>
 #include <fabric/debug/DebugStringConvertibleItem.h>
-#include <fabric/text/RawTextShadowNode.h>
-#include <fabric/text/RawTextProps.h>
-#include <fabric/text/TextShadowNode.h>
-#include <fabric/text/TextProps.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/text/basetext/BaseTextShadowNode.h b/ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.h
similarity index 100%
rename from ReactCommon/fabric/text/basetext/BaseTextShadowNode.h
rename to ReactCommon/fabric/components/text/basetext/BaseTextShadowNode.h
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphComponentDescriptor.h b/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h
similarity index 96%
rename from ReactCommon/fabric/text/paragraph/ParagraphComponentDescriptor.h
rename to ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h
index 71e6b8adaa9..3d9074cbcad 100644
--- a/ReactCommon/fabric/text/paragraph/ParagraphComponentDescriptor.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include <fabric/components/text/ParagraphShadowNode.h>
 #include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/text/ParagraphShadowNode.h>
 #include <fabric/textlayoutmanager/TextLayoutManager.h>
 
 namespace facebook {
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphLocalData.cpp b/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.cpp
similarity index 100%
rename from ReactCommon/fabric/text/paragraph/ParagraphLocalData.cpp
rename to ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.cpp
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphLocalData.h b/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.h
similarity index 100%
rename from ReactCommon/fabric/text/paragraph/ParagraphLocalData.h
rename to ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.h
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphProps.cpp b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp
similarity index 100%
rename from ReactCommon/fabric/text/paragraph/ParagraphProps.cpp
rename to ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphProps.h b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
similarity index 96%
rename from ReactCommon/fabric/text/paragraph/ParagraphProps.h
rename to ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
index 5877be6cb86..f31789eacbe 100644
--- a/ReactCommon/fabric/text/paragraph/ParagraphProps.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
@@ -11,8 +11,8 @@
 #include <memory>
 
 #include <fabric/attributedstring/ParagraphAttributes.h>
+#include <fabric/components/text/BaseTextProps.h>
 #include <fabric/core/Props.h>
-#include <fabric/text/BaseTextProps.h>
 #include <fabric/view/ViewProps.h>
 
 namespace facebook {
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphShadowNode.cpp b/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.cpp
similarity index 100%
rename from ReactCommon/fabric/text/paragraph/ParagraphShadowNode.cpp
rename to ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.cpp
diff --git a/ReactCommon/fabric/text/paragraph/ParagraphShadowNode.h b/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h
similarity index 95%
rename from ReactCommon/fabric/text/paragraph/ParagraphShadowNode.h
rename to ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h
index f7b1ea4fd2a..c18be91d7b4 100644
--- a/ReactCommon/fabric/text/paragraph/ParagraphShadowNode.h
+++ b/ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.h
@@ -7,11 +7,11 @@
 
 #pragma once
 
+#include <fabric/components/text/ParagraphProps.h>
+#include <fabric/components/text/TextShadowNode.h>
 #include <fabric/core/ConcreteShadowNode.h>
 #include <fabric/core/ShadowNode.h>
 #include <fabric/core/LayoutContext.h>
-#include <fabric/text/ParagraphProps.h>
-#include <fabric/text/TextShadowNode.h>
 #include <fabric/textlayoutmanager/TextLayoutManager.h>
 #include <fabric/view/ConcreteViewShadowNode.h>
 #include <folly/Optional.h>
diff --git a/ReactCommon/fabric/text/rawtext/RawTextComponentDescriptor.h b/ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h
similarity index 88%
rename from ReactCommon/fabric/text/rawtext/RawTextComponentDescriptor.h
rename to ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h
index ca2ccdbe1cf..4d53805a3c1 100644
--- a/ReactCommon/fabric/text/rawtext/RawTextComponentDescriptor.h
+++ b/ReactCommon/fabric/components/text/rawtext/RawTextComponentDescriptor.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include <fabric/components/text/RawTextShadowNode.h>
 #include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/text/RawTextShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/text/rawtext/RawTextProps.cpp b/ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp
similarity index 100%
rename from ReactCommon/fabric/text/rawtext/RawTextProps.cpp
rename to ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp
diff --git a/ReactCommon/fabric/text/rawtext/RawTextProps.h b/ReactCommon/fabric/components/text/rawtext/RawTextProps.h
similarity index 100%
rename from ReactCommon/fabric/text/rawtext/RawTextProps.h
rename to ReactCommon/fabric/components/text/rawtext/RawTextProps.h
diff --git a/ReactCommon/fabric/text/rawtext/RawTextShadowNode.cpp b/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.cpp
similarity index 100%
rename from ReactCommon/fabric/text/rawtext/RawTextShadowNode.cpp
rename to ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.cpp
diff --git a/ReactCommon/fabric/text/rawtext/RawTextShadowNode.h b/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h
similarity index 94%
rename from ReactCommon/fabric/text/rawtext/RawTextShadowNode.h
rename to ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h
index f4a2e2ffceb..5d37e86e911 100644
--- a/ReactCommon/fabric/text/rawtext/RawTextShadowNode.h
+++ b/ReactCommon/fabric/components/text/rawtext/RawTextShadowNode.h
@@ -9,9 +9,9 @@
 
 #include <memory>
 
+#include <fabric/components/text/RawTextProps.h>
 #include <fabric/core/ConcreteShadowNode.h>
 #include <fabric/core/ShadowNode.h>
-#include <fabric/text/RawTextProps.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/text/tests/TextTest.cpp b/ReactCommon/fabric/components/text/tests/TextTest.cpp
similarity index 100%
rename from ReactCommon/fabric/text/tests/TextTest.cpp
rename to ReactCommon/fabric/components/text/tests/TextTest.cpp
diff --git a/ReactCommon/fabric/text/text/TextComponentDescriptor.h b/ReactCommon/fabric/components/text/text/TextComponentDescriptor.h
similarity index 89%
rename from ReactCommon/fabric/text/text/TextComponentDescriptor.h
rename to ReactCommon/fabric/components/text/text/TextComponentDescriptor.h
index 5abb428e33d..af8d9f12c54 100644
--- a/ReactCommon/fabric/text/text/TextComponentDescriptor.h
+++ b/ReactCommon/fabric/components/text/text/TextComponentDescriptor.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include <fabric/components/text/TextShadowNode.h>
 #include <fabric/core/ConcreteComponentDescriptor.h>
-#include <fabric/text/TextShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/text/text/TextProps.cpp b/ReactCommon/fabric/components/text/text/TextProps.cpp
similarity index 100%
rename from ReactCommon/fabric/text/text/TextProps.cpp
rename to ReactCommon/fabric/components/text/text/TextProps.cpp
diff --git a/ReactCommon/fabric/text/text/TextProps.h b/ReactCommon/fabric/components/text/text/TextProps.h
similarity index 94%
rename from ReactCommon/fabric/text/text/TextProps.h
rename to ReactCommon/fabric/components/text/text/TextProps.h
index b4205073174..9213b0dfc13 100644
--- a/ReactCommon/fabric/text/text/TextProps.h
+++ b/ReactCommon/fabric/components/text/text/TextProps.h
@@ -8,10 +8,10 @@
 #pragma once
 
 #include <fabric/attributedstring/TextAttributes.h>
+#include <fabric/components/text/BaseTextProps.h>
 #include <fabric/core/Props.h>
 #include <fabric/graphics/Color.h>
 #include <fabric/graphics/Geometry.h>
-#include <fabric/text/BaseTextProps.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/text/text/TextShadowNode.cpp b/ReactCommon/fabric/components/text/text/TextShadowNode.cpp
similarity index 100%
rename from ReactCommon/fabric/text/text/TextShadowNode.cpp
rename to ReactCommon/fabric/components/text/text/TextShadowNode.cpp
diff --git a/ReactCommon/fabric/text/text/TextShadowNode.h b/ReactCommon/fabric/components/text/text/TextShadowNode.h
similarity index 83%
rename from ReactCommon/fabric/text/text/TextShadowNode.h
rename to ReactCommon/fabric/components/text/text/TextShadowNode.h
index 12c73e1a17e..f9e584f51f9 100644
--- a/ReactCommon/fabric/text/text/TextShadowNode.h
+++ b/ReactCommon/fabric/components/text/text/TextShadowNode.h
@@ -9,11 +9,11 @@
 
 #include <fabric/attributedstring/AttributedString.h>
 #include <fabric/attributedstring/TextAttributes.h>
+#include <fabric/components/text/BaseTextShadowNode.h>
+#include <fabric/components/text/TextProps.h>
+#include <fabric/components/text/TextShadowNode.h>
 #include <fabric/core/ConcreteShadowNode.h>
 #include <fabric/core/ShadowNode.h>
-#include <fabric/text/BaseTextShadowNode.h>
-#include <fabric/text/TextProps.h>
-#include <fabric/text/TextShadowNode.h>
 
 namespace facebook {
 namespace react {
diff --git a/ReactCommon/fabric/uimanager/BUCK b/ReactCommon/fabric/uimanager/BUCK
index c7bc58bc42e..52c3d1f6eb8 100644
--- a/ReactCommon/fabric/uimanager/BUCK
+++ b/ReactCommon/fabric/uimanager/BUCK
@@ -56,12 +56,11 @@ rn_xplat_cxx_library(
         "xplat//folly:memory",
         "xplat//folly:molly",
         "xplat//third-party/glog:glog",
+        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/text:text"),
         react_native_xplat_target("fabric/view:view"),
         react_native_xplat_target("fabric/scrollview:scrollview"),
-        react_native_xplat_target("fabric/text:text"),
     ],
 )
 
diff --git a/ReactCommon/fabric/uimanager/Scheduler.cpp b/ReactCommon/fabric/uimanager/Scheduler.cpp
index c7e3f51100a..d42adc224d2 100644
--- a/ReactCommon/fabric/uimanager/Scheduler.cpp
+++ b/ReactCommon/fabric/uimanager/Scheduler.cpp
@@ -5,11 +5,11 @@
 
 #include "Scheduler.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/text/ParagraphComponentDescriptor.h>
-#include <fabric/text/RawTextComponentDescriptor.h>
-#include <fabric/text/TextComponentDescriptor.h>
 #include <fabric/uimanager/ComponentDescriptorRegistry.h>
 #include <fabric/uimanager/FabricUIManager.h>
 #include <fabric/view/ViewComponentDescriptor.h>