move fabric to ReactCommon/react/renderer

Summary:
This diff moves fabric C++ code from ReactCommon/fabric to ReactCommon/react/renderer
As part of this diff I also refactored components, codegen and callsites on CatalystApp, FB4A and venice

Script: P137350694

changelog: [internal] internal refactor

Reviewed By: fkgozali

Differential Revision: D22852139

fbshipit-source-id: f85310ba858b6afd81abfd9cbe6d70b28eca7415

React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm

@@ -7,9 +7,9 @@
 
 #import "RCTActivityIndicatorViewComponentView.h"
 
-#import <react/components/rncore/ComponentDescriptors.h>
-#import <react/components/rncore/EventEmitters.h>
-#import <react/components/rncore/Props.h>
+#import <react/renderer/components/rncore/ComponentDescriptors.h>
+#import <react/renderer/components/rncore/EventEmitters.h>
+#import <react/renderer/components/rncore/Props.h>
 
 #import "FBRCTFabricComponentsPlugins.h"
 

React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm

@@ -10,13 +10,13 @@
 #import <React/RCTImageBlurUtils.h>
 #import <React/RCTImageResponseDelegate.h>
 #import <React/RCTImageResponseObserverProxy.h>
-#import <react/components/image/ImageComponentDescriptor.h>
-#import <react/components/image/ImageEventEmitter.h>
-#import <react/components/image/ImageProps.h>
-#import <react/imagemanager/ImageInstrumentation.h>
-#import <react/imagemanager/ImageRequest.h>
-#import <react/imagemanager/RCTImageInstrumentationProxy.h>
-#import <react/imagemanager/RCTImagePrimitivesConversions.h>
+#import <react/renderer/components/image/ImageComponentDescriptor.h>
+#import <react/renderer/components/image/ImageEventEmitter.h>
+#import <react/renderer/components/image/ImageProps.h>
+#import <react/renderer/imagemanager/ImageInstrumentation.h>
+#import <react/renderer/imagemanager/ImageRequest.h>
+#import <react/renderer/imagemanager/RCTImageInstrumentationProxy.h>
+#import <react/renderer/imagemanager/RCTImagePrimitivesConversions.h>
 
 #import "RCTConversions.h"
 #import "RCTFabricComponentsPlugins.h"

React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryComponentView.mm

@@ -11,8 +11,8 @@
 #import <React/RCTConversions.h>
 #import <React/RCTSurfaceTouchHandler.h>
 #import <React/UIView+React.h>
-#import <react/components/inputaccessory/InputAccessoryComponentDescriptor.h>
-#import <react/components/rncore/Props.h>
+#import <react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h>
+#import <react/renderer/components/rncore/Props.h>
 #import "RCTInputAccessoryContentView.h"
 
 #import "RCTFabricComponentsPlugins.h"

React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm

@@ -8,8 +8,8 @@
 #import "RCTLegacyViewManagerInteropComponentView.h"
 
 #import <React/UIView+React.h>
-#import <react/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h>
-#import <react/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h>
+#import <react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h>
+#import <react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h>
 #import <react/utils/ManagedObjectWrapper.h>
 #import "RCTLegacyViewManagerInteropCoordinatorAdapter.h"
 

React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropCoordinatorAdapter.h

@@ -6,7 +6,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <react/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h>
+#import <react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm

@@ -8,10 +8,10 @@
 #import "RCTModalHostViewComponentView.h"
 
 #import <React/UIView+React.h>
-#import <react/components/modal/ModalHostViewComponentDescriptor.h>
-#import <react/components/modal/ModalHostViewState.h>
-#import <react/components/rncore/EventEmitters.h>
-#import <react/components/rncore/Props.h>
+#import <react/renderer/components/modal/ModalHostViewComponentDescriptor.h>
+#import <react/renderer/components/modal/ModalHostViewState.h>
+#import <react/renderer/components/rncore/EventEmitters.h>
+#import <react/renderer/components/rncore/Props.h>
 
 #import "FBRCTFabricComponentsPlugins.h"
 #import "RCTConversions.h"

React/Fabric/Mounting/ComponentViews/Root/RCTRootComponentView.mm

@@ -7,8 +7,8 @@
 
 #import "RCTRootComponentView.h"
 
-#import <react/components/root/RootComponentDescriptor.h>
-#import <react/components/root/RootProps.h>
+#import <react/renderer/components/root/RootComponentDescriptor.h>
+#import <react/renderer/components/root/RootProps.h>
 
 using namespace facebook::react;
 

React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm

@@ -8,8 +8,8 @@
 #import "RCTSafeAreaViewComponentView.h"
 
 #import <React/RCTUtils.h>
-#import <react/components/safeareaview/SafeAreaViewComponentDescriptor.h>
-#import <react/components/safeareaview/SafeAreaViewState.h>
+#import <react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h>
+#import <react/renderer/components/safeareaview/SafeAreaViewState.h>
 #import "FBRCTFabricComponentsPlugins.h"
 #import "RCTConversions.h"
 #import "RCTFabricComponentsPlugins.h"

React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.mm

@@ -7,10 +7,10 @@
 
 #import "RCTPullToRefreshViewComponentView.h"
 
-#import <react/components/rncore/ComponentDescriptors.h>
-#import <react/components/rncore/EventEmitters.h>
-#import <react/components/rncore/Props.h>
-#import <react/components/rncore/RCTComponentViewHelpers.h>
+#import <react/renderer/components/rncore/ComponentDescriptors.h>
+#import <react/renderer/components/rncore/EventEmitters.h>
+#import <react/renderer/components/rncore/Props.h>
+#import <react/renderer/components/rncore/RCTComponentViewHelpers.h>
 
 #import <React/RCTConversions.h>
 #import <React/RCTRefreshableProtocol.h>

React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -11,12 +11,12 @@
 #import <React/RCTBridge+Private.h>
 #import <React/RCTScrollEvent.h>
 
-#import <react/components/scrollview/RCTComponentViewHelpers.h>
-#import <react/components/scrollview/ScrollViewComponentDescriptor.h>
-#import <react/components/scrollview/ScrollViewEventEmitter.h>
-#import <react/components/scrollview/ScrollViewProps.h>
-#import <react/components/scrollview/ScrollViewState.h>
-#import <react/graphics/Geometry.h>
+#import <react/renderer/components/scrollview/RCTComponentViewHelpers.h>
+#import <react/renderer/components/scrollview/ScrollViewComponentDescriptor.h>
+#import <react/renderer/components/scrollview/ScrollViewEventEmitter.h>
+#import <react/renderer/components/scrollview/ScrollViewProps.h>
+#import <react/renderer/components/scrollview/ScrollViewState.h>
+#import <react/renderer/graphics/Geometry.h>
 
 #import "RCTConversions.h"
 #import "RCTEnhancedScrollView.h"

React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm

@@ -9,9 +9,9 @@
 
 #import <React/RCTImageResponseDelegate.h>
 #import <React/RCTImageResponseObserverProxy.h>
-#import <react/components/rncore/EventEmitters.h>
-#import <react/components/rncore/Props.h>
-#import <react/components/slider/SliderComponentDescriptor.h>
+#import <react/renderer/components/rncore/EventEmitters.h>
+#import <react/renderer/components/rncore/Props.h>
+#import <react/renderer/components/slider/SliderComponentDescriptor.h>
 
 #import "FBRCTFabricComponentsPlugins.h"
 

React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm

@@ -7,10 +7,10 @@
 
 #import "RCTSwitchComponentView.h"
 
-#import <react/components/rncore/ComponentDescriptors.h>
-#import <react/components/rncore/EventEmitters.h>
-#import <react/components/rncore/Props.h>
-#import <react/components/rncore/RCTComponentViewHelpers.h>
+#import <react/renderer/components/rncore/ComponentDescriptors.h>
+#import <react/renderer/components/rncore/EventEmitters.h>
+#import <react/renderer/components/rncore/Props.h>
+#import <react/renderer/components/rncore/RCTComponentViewHelpers.h>
 
 #import "FBRCTFabricComponentsPlugins.h"
 

React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.h

@@ -7,9 +7,9 @@
 
 #import <UIKit/UIKit.h>
 
-#import <react/attributedstring/AttributedString.h>
-#import <react/attributedstring/ParagraphAttributes.h>
-#import <react/textlayoutmanager/RCTTextLayoutManager.h>
+#import <react/renderer/attributedstring/AttributedString.h>
+#import <react/renderer/attributedstring/ParagraphAttributes.h>
+#import <react/renderer/textlayoutmanager/RCTTextLayoutManager.h>
 
 #import "RCTParagraphComponentView.h"
 

React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentAccessibilityProvider.mm

@@ -8,10 +8,10 @@
 #import "RCTParagraphComponentAccessibilityProvider.h"
 
 #import <Foundation/Foundation.h>
-#import <react/components/text/ParagraphProps.h>
-#import <react/textlayoutmanager/RCTAttributedTextUtils.h>
-#import <react/textlayoutmanager/RCTTextLayoutManager.h>
-#import <react/textlayoutmanager/TextLayoutManager.h>
+#import <react/renderer/components/text/ParagraphProps.h>
+#import <react/renderer/textlayoutmanager/RCTAttributedTextUtils.h>
+#import <react/renderer/textlayoutmanager/RCTTextLayoutManager.h>
+#import <react/renderer/textlayoutmanager/TextLayoutManager.h>
 
 #import "RCTConversions.h"
 #import "RCTFabricComponentsPlugins.h"

React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm

@@ -8,15 +8,15 @@
 #import "RCTParagraphComponentView.h"
 #import "RCTParagraphComponentAccessibilityProvider.h"
 
-#import <react/components/text/ParagraphComponentDescriptor.h>
-#import <react/components/text/ParagraphProps.h>
-#import <react/components/text/ParagraphState.h>
-#import <react/components/text/RawTextComponentDescriptor.h>
-#import <react/components/text/TextComponentDescriptor.h>
-#import <react/graphics/Geometry.h>
-#import <react/textlayoutmanager/RCTAttributedTextUtils.h>
-#import <react/textlayoutmanager/RCTTextLayoutManager.h>
-#import <react/textlayoutmanager/TextLayoutManager.h>
+#import <react/renderer/components/text/ParagraphComponentDescriptor.h>
+#import <react/renderer/components/text/ParagraphProps.h>
+#import <react/renderer/components/text/ParagraphState.h>
+#import <react/renderer/components/text/RawTextComponentDescriptor.h>
+#import <react/renderer/components/text/TextComponentDescriptor.h>
+#import <react/renderer/graphics/Geometry.h>
+#import <react/renderer/textlayoutmanager/RCTAttributedTextUtils.h>
+#import <react/renderer/textlayoutmanager/RCTTextLayoutManager.h>
+#import <react/renderer/textlayoutmanager/TextLayoutManager.h>
 #import <react/utils/ManagedObjectWrapper.h>
 
 #import "RCTConversions.h"

React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm

@@ -7,10 +7,10 @@
 
 #import "RCTTextInputComponentView.h"
 
-#import <react/components/iostextinput/TextInputComponentDescriptor.h>
-#import <react/graphics/Geometry.h>
-#import <react/textlayoutmanager/RCTAttributedTextUtils.h>
-#import <react/textlayoutmanager/TextLayoutManager.h>
+#import <react/renderer/components/iostextinput/TextInputComponentDescriptor.h>
+#import <react/renderer/graphics/Geometry.h>
+#import <react/renderer/textlayoutmanager/RCTAttributedTextUtils.h>
+#import <react/renderer/textlayoutmanager/TextLayoutManager.h>
 
 #import <React/RCTBackedTextInputViewProtocol.h>
 #import <React/RCTUITextField.h>

React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputUtils.h

@@ -9,7 +9,7 @@
 
 #import <React/RCTBackedTextInputViewProtocol.h>
 #import <better/optional.h>
-#import <react/components/iostextinput/primitives.h>
+#import <react/renderer/components/iostextinput/primitives.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

React/Fabric/Mounting/ComponentViews/UnimplementedComponent/RCTUnimplementedNativeComponentView.mm

@@ -7,9 +7,9 @@
 
 #import "RCTUnimplementedNativeComponentView.h"
 
-#import <react/components/rncore/ComponentDescriptors.h>
-#import <react/components/rncore/EventEmitters.h>
-#import <react/components/rncore/Props.h>
+#import <react/renderer/components/rncore/ComponentDescriptors.h>
+#import <react/renderer/components/rncore/EventEmitters.h>
+#import <react/renderer/components/rncore/Props.h>
 
 using namespace facebook::react;
 

React/Fabric/Mounting/ComponentViews/UnimplementedView/RCTUnimplementedViewComponentView.mm

@@ -7,12 +7,12 @@
 
 #import "RCTUnimplementedViewComponentView.h"
 
-#import <react/components/rncore/ComponentDescriptors.h>
-#import <react/components/rncore/EventEmitters.h>
-#import <react/components/rncore/Props.h>
+#import <react/renderer/components/rncore/ComponentDescriptors.h>
+#import <react/renderer/components/rncore/EventEmitters.h>
+#import <react/renderer/components/rncore/Props.h>
 
-#import <react/components/unimplementedview/UnimplementedViewComponentDescriptor.h>
-#import <react/components/unimplementedview/UnimplementedViewShadowNode.h>
+#import <react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h>
+#import <react/renderer/components/unimplementedview/UnimplementedViewShadowNode.h>
 
 #import <React/RCTConversions.h>
 

React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h

@@ -10,11 +10,11 @@
 #import <React/RCTComponentViewProtocol.h>
 #import <React/RCTTouchableComponentViewProtocol.h>
 #import <React/UIView+ComponentViewProtocol.h>
-#import <react/components/view/ViewEventEmitter.h>
-#import <react/components/view/ViewProps.h>
-#import <react/core/EventEmitter.h>
-#import <react/core/LayoutMetrics.h>
-#import <react/core/Props.h>
+#import <react/renderer/components/view/ViewEventEmitter.h>
+#import <react/renderer/components/view/ViewProps.h>
+#import <react/renderer/core/EventEmitter.h>
+#import <react/renderer/core/LayoutMetrics.h>
+#import <react/renderer/core/Props.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -10,9 +10,9 @@
 #import <React/RCTAssert.h>
 #import <React/RCTBorderDrawing.h>
 #import <objc/runtime.h>
-#import <react/components/view/ViewComponentDescriptor.h>
-#import <react/components/view/ViewEventEmitter.h>
-#import <react/components/view/ViewProps.h>
+#import <react/renderer/components/view/ViewComponentDescriptor.h>
+#import <react/renderer/components/view/ViewEventEmitter.h>
+#import <react/renderer/components/view/ViewProps.h>
 
 #import "RCTConversions.h"
 #import "RCTFabricComponentsPlugins.h"

React/Fabric/Mounting/RCTComponentViewFactory.h

@@ -10,7 +10,7 @@
 #import <React/RCTComponentViewDescriptor.h>
 #import <React/RCTComponentViewProtocol.h>
 
-#import <react/componentregistry/ComponentDescriptorRegistry.h>
+#import <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

React/Fabric/Mounting/RCTComponentViewFactory.mm

@@ -13,8 +13,8 @@
 #import <better/map.h>
 #import <better/mutex.h>
 
-#import <react/componentregistry/ComponentDescriptorProviderRegistry.h>
-#import <react/core/ReactPrimitives.h>
+#import <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#import <react/renderer/core/ReactPrimitives.h>
 
 #ifdef RN_DISABLE_OSS_PLUGIN_HEADER
 #import <RCTFabricComponentPlugin/RCTFabricPluginProvider.h>

React/Fabric/Mounting/RCTComponentViewProtocol.h

@@ -8,11 +8,11 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTPrimitives.h>
-#import <react/componentregistry/ComponentDescriptorProvider.h>
-#import <react/core/EventEmitter.h>
-#import <react/core/LayoutMetrics.h>
-#import <react/core/Props.h>
-#import <react/core/State.h>
+#import <react/renderer/componentregistry/ComponentDescriptorProvider.h>
+#import <react/renderer/core/EventEmitter.h>
+#import <react/renderer/core/LayoutMetrics.h>
+#import <react/renderer/core/Props.h>
+#import <react/renderer/core/State.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

React/Fabric/Mounting/RCTComponentViewRegistry.h

@@ -10,7 +10,7 @@
 #import <React/RCTComponentViewDescriptor.h>
 #import <React/RCTComponentViewFactory.h>
 #import <React/RCTComponentViewProtocol.h>
-#import <react/core/ReactPrimitives.h>
+#import <react/renderer/core/ReactPrimitives.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

React/Fabric/Mounting/RCTMountingManager.h

@@ -9,10 +9,10 @@
 
 #import <React/RCTMountingManagerDelegate.h>
 #import <React/RCTPrimitives.h>
-#import <react/core/ComponentDescriptor.h>
-#import <react/core/ReactPrimitives.h>
-#import <react/mounting/MountingCoordinator.h>
-#import <react/mounting/ShadowView.h>
+#import <react/renderer/core/ComponentDescriptor.h>
+#import <react/renderer/core/ReactPrimitives.h>
+#import <react/renderer/mounting/MountingCoordinator.h>
+#import <react/renderer/mounting/ShadowView.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

React/Fabric/Mounting/RCTMountingManager.mm

@@ -12,10 +12,10 @@
 #import <React/RCTAssert.h>
 #import <React/RCTFollyConvert.h>
 #import <React/RCTUtils.h>
-#import <react/core/LayoutableShadowNode.h>
-#import <react/core/RawProps.h>
-#import <react/debug/SystraceSection.h>
-#import <react/mounting/TelemetryController.h>
+#import <react/renderer/core/LayoutableShadowNode.h>
+#import <react/renderer/core/RawProps.h>
+#import <react/renderer/debug/SystraceSection.h>
+#import <react/renderer/mounting/TelemetryController.h>
 
 #import "RCTComponentViewProtocol.h"
 #import "RCTComponentViewRegistry.h"

React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h

@@ -11,7 +11,7 @@
 #import <better/map.h>
 #import <better/set.h>
 
-#import <react/mounting/MountingTransactionMetadata.h>
+#import <react/renderer/mounting/MountingTransactionMetadata.h>
 
 class RCTMountingTransactionObserverCoordinator final {
  public:

React/Fabric/Mounting/RCTMountingTransactionObserving.h

@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import <react/mounting/MountingTransactionMetadata.h>
+#import <react/renderer/mounting/MountingTransactionMetadata.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

React/Fabric/RCTConversions.h

@@ -7,12 +7,12 @@
 
 #import <UIKit/UIKit.h>
 
-#import <react/components/view/AccessibilityPrimitives.h>
-#import <react/components/view/primitives.h>
-#import <react/core/LayoutPrimitives.h>
-#import <react/graphics/Color.h>
-#import <react/graphics/Geometry.h>
-#import <react/graphics/Transform.h>
+#import <react/renderer/components/view/AccessibilityPrimitives.h>
+#import <react/renderer/components/view/primitives.h>
+#import <react/renderer/core/LayoutPrimitives.h>
+#import <react/renderer/graphics/Color.h>
+#import <react/renderer/graphics/Geometry.h>
+#import <react/renderer/graphics/Transform.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

React/Fabric/RCTImageResponseObserverProxy.h

@@ -9,7 +9,7 @@
 
 #import "RCTImageResponseDelegate.h"
 
-#include <react/imagemanager/ImageResponseObserver.h>
+#include <react/renderer/imagemanager/ImageResponseObserver.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

React/Fabric/RCTImageResponseObserverProxy.mm

@@ -8,8 +8,8 @@
 #import "RCTImageResponseObserverProxy.h"
 
 #import <React/RCTUtils.h>
-#import <react/imagemanager/ImageResponse.h>
-#import <react/imagemanager/ImageResponseObserver.h>
+#import <react/renderer/imagemanager/ImageResponse.h>
+#import <react/renderer/imagemanager/ImageResponseObserver.h>
 #import <react/utils/ManagedObjectWrapper.h>
 
 namespace facebook {

React/Fabric/RCTScheduler.h

@@ -9,12 +9,12 @@
 #import <memory>
 
 #import <React/RCTPrimitives.h>
-#import <react/componentregistry/ComponentDescriptorFactory.h>
-#import <react/core/ComponentDescriptor.h>
-#import <react/core/LayoutConstraints.h>
-#import <react/core/LayoutContext.h>
-#import <react/mounting/MountingCoordinator.h>
-#import <react/scheduler/SchedulerToolbox.h>
+#import <react/renderer/componentregistry/ComponentDescriptorFactory.h>
+#import <react/renderer/core/ComponentDescriptor.h>
+#import <react/renderer/core/LayoutConstraints.h>
+#import <react/renderer/core/LayoutContext.h>
+#import <react/renderer/mounting/MountingCoordinator.h>
+#import <react/renderer/scheduler/SchedulerToolbox.h>
 #import <react/utils/ContextContainer.h>
 
 NS_ASSUME_NONNULL_BEGIN

React/Fabric/RCTScheduler.mm

@@ -7,11 +7,11 @@
 
 #import "RCTScheduler.h"
 
-#import <react/animations/LayoutAnimationDriver.h>
-#import <react/componentregistry/ComponentDescriptorFactory.h>
-#import <react/debug/SystraceSection.h>
-#import <react/scheduler/Scheduler.h>
-#import <react/scheduler/SchedulerDelegate.h>
+#import <react/renderer/animations/LayoutAnimationDriver.h>
+#import <react/renderer/componentregistry/ComponentDescriptorFactory.h>
+#import <react/renderer/debug/SystraceSection.h>
+#import <react/renderer/scheduler/Scheduler.h>
+#import <react/renderer/scheduler/SchedulerDelegate.h>
 #include <react/utils/RunLoopObserver.h>
 
 #import <React/RCTFollyConvert.h>

React/Fabric/RCTSurfacePresenter.mm

@@ -25,14 +25,14 @@
 
 #import <React/RCTScrollViewComponentView.h>
 
-#import <react/componentregistry/ComponentDescriptorFactory.h>
-#import <react/components/root/RootShadowNode.h>
 #import <react/config/ReactNativeConfig.h>
-#import <react/core/LayoutConstraints.h>
-#import <react/core/LayoutContext.h>
-#import <react/scheduler/AsynchronousEventBeat.h>
-#import <react/scheduler/SchedulerToolbox.h>
-#import <react/scheduler/SynchronousEventBeat.h>
+#import <react/renderer/componentregistry/ComponentDescriptorFactory.h>
+#import <react/renderer/components/root/RootShadowNode.h>
+#import <react/renderer/core/LayoutConstraints.h>
+#import <react/renderer/core/LayoutContext.h>
+#import <react/renderer/scheduler/AsynchronousEventBeat.h>
+#import <react/renderer/scheduler/SchedulerToolbox.h>
+#import <react/renderer/scheduler/SynchronousEventBeat.h>
 #import <react/utils/ContextContainer.h>
 #import <react/utils/ManagedObjectWrapper.h>
 

React/Fabric/RCTTouchableComponentViewProtocol.h

@@ -6,7 +6,7 @@
  */
 
 #import <UIKit/UIKit.h>
-#import <react/components/view/TouchEventEmitter.h>
+#import <react/renderer/components/view/TouchEventEmitter.h>
 
 @protocol RCTTouchableComponentViewProtocol <NSObject>
 - (facebook::react::SharedTouchEventEmitter)touchEventEmitterAtPoint:(CGPoint)point;

React/Fabric/Surface/RCTFabricSurface.h

@@ -7,7 +7,7 @@
 
 #import <React/RCTPrimitives.h>
 #import <React/RCTSurfaceStage.h>
-#import <react/mounting/MountingCoordinator.h>
+#import <react/renderer/mounting/MountingCoordinator.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

React/Fabric/Utils/MainRunLoopEventBeat.h

@@ -10,7 +10,7 @@
 #include <CoreFoundation/CFRunLoop.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <ReactCommon/RuntimeExecutor.h>
-#include <react/core/EventBeat.h>
+#include <react/renderer/core/EventBeat.h>
 
 namespace facebook {
 namespace react {

React/Fabric/Utils/RuntimeEventBeat.h

@@ -8,7 +8,7 @@
 #include <CoreFoundation/CFRunLoop.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <ReactCommon/RuntimeExecutor.h>
-#include <react/core/EventBeat.h>
+#include <react/renderer/core/EventBeat.h>
 
 namespace facebook {
 namespace react {

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/AsyncEventBeat.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include <jsi/jsi.h>
-#include <react/core/EventBeat.h>
-#include <react/uimanager/primitives.h>
+#include <react/renderer/core/EventBeat.h>
+#include <react/renderer/uimanager/primitives.h>
 
 #include "EventBeatManager.h"
 

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/BUCK

@@ -29,11 +29,11 @@ rn_xplat_cxx_library(
     deps = [
         react_native_xplat_target("better:better"),
         react_native_xplat_target("config:config"),
-        react_native_xplat_target("fabric/animations:animations"),
-        react_native_xplat_target("fabric/uimanager:uimanager"),
-        react_native_xplat_target("fabric/scheduler:scheduler"),
-        react_native_xplat_target("fabric/componentregistry:componentregistry"),
-        react_native_xplat_target("fabric/components/scrollview:scrollview"),
+        react_native_xplat_target("react/renderer/animations:animations"),
+        react_native_xplat_target("react/renderer/uimanager:uimanager"),
+        react_native_xplat_target("react/renderer/scheduler:scheduler"),
+        react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
+        react_native_xplat_target("react/renderer/components/scrollview:scrollview"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
         react_native_target("jni/react/jni:jni"),
         "//xplat/fbsystrace:fbsystrace",

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp

@@ -15,17 +15,17 @@
 #include <fbjni/fbjni.h>
 #include <jsi/JSIDynamic.h>
 #include <jsi/jsi.h>
-#include <react/animations/LayoutAnimationDriver.h>
-#include <react/componentregistry/ComponentDescriptorFactory.h>
-#include <react/components/scrollview/ScrollViewProps.h>
-#include <react/core/EventBeat.h>
-#include <react/core/EventEmitter.h>
-#include <react/core/conversions.h>
-#include <react/debug/SystraceSection.h>
-#include <react/scheduler/Scheduler.h>
-#include <react/scheduler/SchedulerDelegate.h>
-#include <react/scheduler/SchedulerToolbox.h>
-#include <react/uimanager/primitives.h>
+#include <react/renderer/animations/LayoutAnimationDriver.h>
+#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
+#include <react/renderer/components/scrollview/ScrollViewProps.h>
+#include <react/renderer/core/EventBeat.h>
+#include <react/renderer/core/EventEmitter.h>
+#include <react/renderer/core/conversions.h>
+#include <react/renderer/debug/SystraceSection.h>
+#include <react/renderer/scheduler/Scheduler.h>
+#include <react/renderer/scheduler/SchedulerDelegate.h>
+#include <react/renderer/scheduler/SchedulerToolbox.h>
+#include <react/renderer/uimanager/primitives.h>
 #include <react/utils/ContextContainer.h>
 
 #include <Glog/logging.h>

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h

@@ -8,13 +8,13 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include <react/animations/LayoutAnimationDriver.h>
 #include <react/jni/JMessageQueueThread.h>
 #include <react/jni/JRuntimeExecutor.h>
 #include <react/jni/ReadableNativeMap.h>
-#include <react/scheduler/Scheduler.h>
-#include <react/scheduler/SchedulerDelegate.h>
-#include <react/uimanager/LayoutAnimationStatusDelegate.h>
+#include <react/renderer/animations/LayoutAnimationDriver.h>
+#include <react/renderer/scheduler/Scheduler.h>
+#include <react/renderer/scheduler/SchedulerDelegate.h>
+#include <react/renderer/uimanager/LayoutAnimationStatusDelegate.h>
 #include <memory>
 #include <mutex>
 #include "ComponentFactoryDelegate.h"

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.cpp

@@ -9,7 +9,7 @@
 #include <android/log.h>
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
-#include <react/componentregistry/ComponentDescriptorRegistry.h>
+#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
 
 using namespace facebook::jsi;
 

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.h

@@ -9,8 +9,8 @@
 
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
-#include <react/componentregistry/ComponentDescriptorRegistry.h>
-#include <react/scheduler/Scheduler.h>
+#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
+#include <react/renderer/scheduler/Scheduler.h>
 #include <react/utils/ContextContainer.h>
 #include <mutex>
 #include <unordered_set>

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.h

@@ -12,7 +12,7 @@
 
 #include <ReactCommon/RuntimeExecutor.h>
 #include <fbjni/fbjni.h>
-#include <react/core/EventBeat.h>
+#include <react/renderer/core/EventBeat.h>
 
 namespace facebook {
 namespace react {

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp

@@ -33,4 +33,4 @@ void EventEmitterWrapper::registerNatives() {
 }
 
 } // namespace react
-} // namespace facebook
+} // namespace facebook

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include <react/core/EventEmitter.h>
 #include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/core/EventEmitter.h>
 
 namespace facebook {
 namespace react {

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/JBackgroundExecutor.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include <react/uimanager/primitives.h>
+#include <react/renderer/uimanager/primitives.h>
 
 namespace facebook {
 namespace react {

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include <react/core/State.h>
 #include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/core/State.h>
 
 namespace facebook {
 namespace react {

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include <react/core/State.h>
 #include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/core/State.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/animations/BUCK

@@ -29,7 +29,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "react/animations",
+        prefix = "react/renderer/animations",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -59,12 +59,12 @@ rn_xplat_cxx_library(
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
         react_native_xplat_target("config:config"),
-        react_native_xplat_target("fabric/componentregistry:componentregistry"),
-        react_native_xplat_target("fabric/components/view:view"),
-        react_native_xplat_target("fabric/core:core"),
-        react_native_xplat_target("fabric/debug:debug"),
-        react_native_xplat_target("fabric/mounting:mounting"),
-        react_native_xplat_target("fabric/uimanager:uimanager"),
+        react_native_xplat_target("react/renderer/componentregistry:componentregistry"),
+        react_native_xplat_target("react/renderer/components/view:view"),
+        react_native_xplat_target("react/renderer/core:core"),
+        react_native_xplat_target("react/renderer/debug:debug"),
+        react_native_xplat_target("react/renderer/mounting:mounting"),
+        react_native_xplat_target("react/renderer/uimanager:uimanager"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
     ],
 )
@@ -86,11 +86,11 @@ fb_xplat_cxx_test(
         "//xplat/folly:molly",
         "//xplat/third-party/gmock:gtest",
         react_native_xplat_target("config:config"),
-        react_native_xplat_target("fabric/components/activityindicator:activityindicator"),
-        react_native_xplat_target("fabric/components/image:image"),
-        react_native_xplat_target("fabric/components/root:root"),
-        react_native_xplat_target("fabric/components/scrollview:scrollview"),
-        react_native_xplat_target("fabric/components/view:view"),
+        react_native_xplat_target("react/renderer/components/activityindicator:activityindicator"),
+        react_native_xplat_target("react/renderer/components/image:image"),
+        react_native_xplat_target("react/renderer/components/root:root"),
+        react_native_xplat_target("react/renderer/components/scrollview:scrollview"),
+        react_native_xplat_target("react/renderer/components/view:view"),
         "//xplat/js/react-native-github:generated_components-rncore",
     ],
 )

ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp

@@ -10,19 +10,19 @@
 #include <algorithm>
 #include <chrono>
 
-#include <react/componentregistry/ComponentDescriptorFactory.h>
-#include <react/components/root/RootShadowNode.h>
-#include <react/components/view/ViewProps.h>
-#include <react/core/ComponentDescriptor.h>
-#include <react/core/LayoutMetrics.h>
-#include <react/core/LayoutableShadowNode.h>
-#include <react/core/Props.h>
-#include <react/mounting/MountingCoordinator.h>
+#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
+#include <react/renderer/components/root/RootShadowNode.h>
+#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/ComponentDescriptor.h>
+#include <react/renderer/core/LayoutMetrics.h>
+#include <react/renderer/core/LayoutableShadowNode.h>
+#include <react/renderer/core/Props.h>
+#include <react/renderer/mounting/MountingCoordinator.h>
 
-#include <react/mounting/Differentiator.h>
-#include <react/mounting/ShadowTreeRevision.h>
-#include <react/mounting/ShadowView.h>
-#include <react/mounting/ShadowViewMutation.h>
+#include <react/renderer/mounting/Differentiator.h>
+#include <react/renderer/mounting/ShadowTreeRevision.h>
+#include <react/renderer/mounting/ShadowView.h>
+#include <react/renderer/mounting/ShadowViewMutation.h>
 
 #include <glog/logging.h>
 

ReactCommon/react/renderer/animations/LayoutAnimationDriver.h

@@ -7,12 +7,12 @@
 
 #pragma once
 
-#include <react/core/EventTarget.h>
-#include <react/mounting/Differentiator.h>
-#include <react/mounting/MountingCoordinator.h>
-#include <react/mounting/MountingOverrideDelegate.h>
-#include <react/mounting/MountingTransaction.h>
-#include <react/uimanager/UIManagerAnimationDelegate.h>
+#include <react/renderer/core/EventTarget.h>
+#include <react/renderer/mounting/Differentiator.h>
+#include <react/renderer/mounting/MountingCoordinator.h>
+#include <react/renderer/mounting/MountingOverrideDelegate.h>
+#include <react/renderer/mounting/MountingTransaction.h>
+#include <react/renderer/uimanager/UIManagerAnimationDelegate.h>
 
 #include <folly/dynamic.h>
 

ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp

@@ -10,20 +10,20 @@
 #include <algorithm>
 #include <chrono>
 
-#include <react/componentregistry/ComponentDescriptorFactory.h>
-#include <react/components/root/RootShadowNode.h>
-#include <react/components/view/ViewProps.h>
-#include <react/core/ComponentDescriptor.h>
-#include <react/core/LayoutMetrics.h>
-#include <react/core/LayoutableShadowNode.h>
-#include <react/core/Props.h>
-#include <react/core/RawValue.h>
-#include <react/mounting/MountingCoordinator.h>
+#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
+#include <react/renderer/components/root/RootShadowNode.h>
+#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/ComponentDescriptor.h>
+#include <react/renderer/core/LayoutMetrics.h>
+#include <react/renderer/core/LayoutableShadowNode.h>
+#include <react/renderer/core/Props.h>
+#include <react/renderer/core/RawValue.h>
+#include <react/renderer/mounting/MountingCoordinator.h>
 
-#include <react/mounting/Differentiator.h>
-#include <react/mounting/ShadowTreeRevision.h>
-#include <react/mounting/ShadowView.h>
-#include <react/mounting/ShadowViewMutation.h>
+#include <react/renderer/mounting/Differentiator.h>
+#include <react/renderer/mounting/ShadowTreeRevision.h>
+#include <react/renderer/mounting/ShadowView.h>
+#include <react/renderer/mounting/ShadowViewMutation.h>
 
 #include <Glog/logging.h>
 

ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h

@@ -7,15 +7,15 @@
 
 #pragma once
 
-#include <react/core/EventTarget.h>
-#include <react/core/RawValue.h>
-#include <react/mounting/Differentiator.h>
-#include <react/mounting/MountingCoordinator.h>
-#include <react/mounting/MountingOverrideDelegate.h>
-#include <react/mounting/MountingTransaction.h>
-#include <react/mounting/ShadowViewMutation.h>
-#include <react/uimanager/LayoutAnimationStatusDelegate.h>
-#include <react/uimanager/UIManagerAnimationDelegate.h>
+#include <react/renderer/core/EventTarget.h>
+#include <react/renderer/core/RawValue.h>
+#include <react/renderer/mounting/Differentiator.h>
+#include <react/renderer/mounting/MountingCoordinator.h>
+#include <react/renderer/mounting/MountingOverrideDelegate.h>
+#include <react/renderer/mounting/MountingTransaction.h>
+#include <react/renderer/mounting/ShadowViewMutation.h>
+#include <react/renderer/uimanager/LayoutAnimationStatusDelegate.h>
+#include <react/renderer/uimanager/UIManagerAnimationDelegate.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/attributedstring/AttributedString.cpp

@@ -7,7 +7,7 @@
 
 #include "AttributedString.h"
 
-#include <react/debug/DebugStringConvertibleItem.h>
+#include <react/renderer/debug/DebugStringConvertibleItem.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/attributedstring/AttributedString.h

@@ -12,11 +12,11 @@
 
 #include <folly/Hash.h>
 #include <folly/Optional.h>
-#include <react/attributedstring/TextAttributes.h>
-#include <react/core/Sealable.h>
-#include <react/core/ShadowNode.h>
-#include <react/debug/DebugStringConvertible.h>
-#include <react/mounting/ShadowView.h>
+#include <react/renderer/attributedstring/TextAttributes.h>
+#include <react/renderer/core/Sealable.h>
+#include <react/renderer/core/ShadowNode.h>
+#include <react/renderer/debug/DebugStringConvertible.h>
+#include <react/renderer/mounting/ShadowView.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/attributedstring/AttributedStringBox.h

@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include <react/attributedstring/AttributedString.h>
+#include <react/renderer/attributedstring/AttributedString.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/attributedstring/BUCK

@@ -29,7 +29,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "react/attributedstring",
+        prefix = "react/renderer/attributedstring",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -56,10 +56,10 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         react_native_xplat_target("utils:utils"),
-        react_native_xplat_target("fabric/debug:debug"),
-        react_native_xplat_target("fabric/core:core"),
-        react_native_xplat_target("fabric/graphics:graphics"),
-        react_native_xplat_target("fabric/mounting:mounting"),
+        react_native_xplat_target("react/renderer/debug:debug"),
+        react_native_xplat_target("react/renderer/core:core"),
+        react_native_xplat_target("react/renderer/graphics:graphics"),
+        react_native_xplat_target("react/renderer/mounting:mounting"),
     ],
 )
 

ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp

@@ -7,9 +7,9 @@
 
 #include "ParagraphAttributes.h"
 
-#include <react/attributedstring/conversions.h>
-#include <react/debug/debugStringConvertibleUtils.h>
-#include <react/graphics/conversions.h>
+#include <react/renderer/attributedstring/conversions.h>
+#include <react/renderer/debug/debugStringConvertibleUtils.h>
+#include <react/renderer/graphics/conversions.h>
 #include <react/utils/FloatComparison.h>
 
 namespace facebook {

ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h

@@ -10,9 +10,9 @@
 #include <limits>
 
 #include <folly/Hash.h>
-#include <react/attributedstring/primitives.h>
-#include <react/debug/DebugStringConvertible.h>
-#include <react/graphics/Geometry.h>
+#include <react/renderer/attributedstring/primitives.h>
+#include <react/renderer/debug/DebugStringConvertible.h>
+#include <react/renderer/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/attributedstring/TextAttributes.cpp

@@ -7,13 +7,13 @@
 
 #include "TextAttributes.h"
 
-#include <react/attributedstring/conversions.h>
-#include <react/core/conversions.h>
-#include <react/graphics/conversions.h>
+#include <react/renderer/attributedstring/conversions.h>
+#include <react/renderer/core/conversions.h>
+#include <react/renderer/graphics/conversions.h>
 #include <react/utils/FloatComparison.h>
 #include <cmath>
 
-#include <react/debug/debugStringConvertibleUtils.h>
+#include <react/renderer/debug/debugStringConvertibleUtils.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/attributedstring/TextAttributes.h

@@ -12,12 +12,12 @@
 
 #include <folly/Hash.h>
 #include <folly/Optional.h>
-#include <react/attributedstring/primitives.h>
-#include <react/core/LayoutPrimitives.h>
-#include <react/core/ReactPrimitives.h>
-#include <react/debug/DebugStringConvertible.h>
-#include <react/graphics/Color.h>
-#include <react/graphics/Geometry.h>
+#include <react/renderer/attributedstring/primitives.h>
+#include <react/renderer/core/LayoutPrimitives.h>
+#include <react/renderer/core/ReactPrimitives.h>
+#include <react/renderer/debug/DebugStringConvertible.h>
+#include <react/renderer/graphics/Color.h>
+#include <react/renderer/graphics/Geometry.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/attributedstring/conversions.h

@@ -9,17 +9,17 @@
 
 #include <folly/Conv.h>
 #include <folly/dynamic.h>
-#include <react/attributedstring/AttributedString.h>
-#include <react/attributedstring/ParagraphAttributes.h>
-#include <react/attributedstring/TextAttributes.h>
-#include <react/attributedstring/conversions.h>
-#include <react/attributedstring/primitives.h>
-#include <react/core/LayoutableShadowNode.h>
-#include <react/core/ShadowNode.h>
-#include <react/core/conversions.h>
-#include <react/core/propsConversions.h>
-#include <react/graphics/Geometry.h>
-#include <react/graphics/conversions.h>
+#include <react/renderer/attributedstring/AttributedString.h>
+#include <react/renderer/attributedstring/ParagraphAttributes.h>
+#include <react/renderer/attributedstring/TextAttributes.h>
+#include <react/renderer/attributedstring/conversions.h>
+#include <react/renderer/attributedstring/primitives.h>
+#include <react/renderer/core/LayoutableShadowNode.h>
+#include <react/renderer/core/ShadowNode.h>
+#include <react/renderer/core/conversions.h>
+#include <react/renderer/core/propsConversions.h>
+#include <react/renderer/graphics/Geometry.h>
+#include <react/renderer/graphics/conversions.h>
 #include <cmath>
 
 #include <glog/logging.h>

ReactCommon/react/renderer/attributedstring/tests/AttributedStringTest.cpp

@@ -9,10 +9,10 @@
 
 #include <assert.h>
 #include <gtest/gtest.h>
-#include <react/attributedstring/TextAttributes.h>
-#include <react/attributedstring/conversions.h>
-#include <react/attributedstring/primitives.h>
-#include <react/graphics/conversions.h>
+#include <react/renderer/attributedstring/TextAttributes.h>
+#include <react/renderer/attributedstring/conversions.h>
+#include <react/renderer/attributedstring/primitives.h>
+#include <react/renderer/graphics/conversions.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/attributedstring/tests/ParagraphAttributesTest.cpp

@@ -9,9 +9,9 @@
 
 #include <assert.h>
 #include <gtest/gtest.h>
-#include <react/attributedstring/ParagraphAttributes.h>
-#include <react/attributedstring/conversions.h>
-#include <react/attributedstring/primitives.h>
+#include <react/renderer/attributedstring/ParagraphAttributes.h>
+#include <react/renderer/attributedstring/conversions.h>
+#include <react/renderer/attributedstring/primitives.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/attributedstring/tests/TextAttributesTest.cpp

@@ -9,10 +9,10 @@
 
 #include <assert.h>
 #include <gtest/gtest.h>
-#include <react/attributedstring/TextAttributes.h>
-#include <react/attributedstring/conversions.h>
-#include <react/attributedstring/primitives.h>
-#include <react/graphics/conversions.h>
+#include <react/renderer/attributedstring/TextAttributes.h>
+#include <react/renderer/attributedstring/conversions.h>
+#include <react/renderer/attributedstring/primitives.h>
+#include <react/renderer/graphics/conversions.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/componentregistry/BUCK

@@ -28,7 +28,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "react/componentregistry",
+        prefix = "react/renderer/componentregistry",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -55,8 +55,8 @@ rn_xplat_cxx_library(
         "//xplat/folly:molly",
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
-        react_native_xplat_target("fabric/core:core"),
-        react_native_xplat_target("fabric/debug:debug"),
+        react_native_xplat_target("react/renderer/core:core"),
+        react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("utils:utils"),
     ],
 )

ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h

@@ -9,8 +9,8 @@
 
 #include <memory>
 
-#include <react/core/ComponentDescriptor.h>
-#include <react/core/EventDispatcher.h>
+#include <react/renderer/core/ComponentDescriptor.h>
+#include <react/renderer/core/EventDispatcher.h>
 #include <react/utils/ContextContainer.h>
 
 #include "ComponentDescriptorRegistry.h"

ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <react/core/ComponentDescriptor.h>
-#include <react/core/EventDispatcher.h>
+#include <react/renderer/core/ComponentDescriptor.h>
+#include <react/renderer/core/EventDispatcher.h>
 #include <react/utils/ContextContainer.h>
 
 namespace facebook {

ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h

@@ -9,9 +9,9 @@
 
 #include <better/mutex.h>
 
-#include <react/componentregistry/ComponentDescriptorProvider.h>
-#include <react/componentregistry/ComponentDescriptorRegistry.h>
-#include <react/core/ComponentDescriptor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
+#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
+#include <react/renderer/core/ComponentDescriptor.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp

@@ -7,8 +7,8 @@
 
 #include "ComponentDescriptorRegistry.h"
 
-#include <react/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/core/ShadowNodeFragment.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/core/ShadowNodeFragment.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h

@@ -12,8 +12,8 @@
 #include <better/map.h>
 #include <better/mutex.h>
 
-#include <react/componentregistry/ComponentDescriptorProvider.h>
-#include <react/core/ComponentDescriptor.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProvider.h>
+#include <react/renderer/core/ComponentDescriptor.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/components/activityindicator/BUCK

@@ -27,7 +27,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "react/components/activityindicator",
+        prefix = "react/renderer/components/activityindicator",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -53,10 +53,10 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
-        react_native_xplat_target("fabric/debug:debug"),
-        react_native_xplat_target("fabric/core:core"),
-        react_native_xplat_target("fabric/graphics:graphics"),
-        react_native_xplat_target("fabric/components/view:view"),
+        react_native_xplat_target("react/renderer/debug:debug"),
+        react_native_xplat_target("react/renderer/core:core"),
+        react_native_xplat_target("react/renderer/graphics:graphics"),
+        react_native_xplat_target("react/renderer/components/view:view"),
     ],
 )
 

ReactCommon/react/renderer/components/activityindicator/conversions.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <folly/dynamic.h>
-#include <react/components/activityindicator/primitives.h>
+#include <react/renderer/components/activityindicator/primitives.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/components/image/BUCK

@@ -27,7 +27,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "react/components/image",
+        prefix = "react/renderer/components/image",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -53,11 +53,11 @@ rn_xplat_cxx_library(
         "//xplat/folly:memory",
         "//xplat/folly:molly",
         YOGA_CXX_TARGET,
-        react_native_xplat_target("fabric/debug:debug"),
-        react_native_xplat_target("fabric/core:core"),
-        react_native_xplat_target("fabric/graphics:graphics"),
-        react_native_xplat_target("fabric/imagemanager:imagemanager"),
-        react_native_xplat_target("fabric/components/view:view"),
+        react_native_xplat_target("react/renderer/debug:debug"),
+        react_native_xplat_target("react/renderer/core:core"),
+        react_native_xplat_target("react/renderer/graphics:graphics"),
+        react_native_xplat_target("react/renderer/imagemanager:imagemanager"),
+        react_native_xplat_target("react/renderer/components/view:view"),
     ],
 )
 

ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <react/components/image/ImageShadowNode.h>
-#include <react/core/ConcreteComponentDescriptor.h>
-#include <react/imagemanager/ImageManager.h>
+#include <react/renderer/components/image/ImageShadowNode.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/imagemanager/ImageManager.h>
 #include <react/utils/ContextContainer.h>
 
 namespace facebook {

ReactCommon/react/renderer/components/image/ImageEventEmitter.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/components/view/ViewEventEmitter.h>
+#include <react/renderer/components/view/ViewEventEmitter.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/components/image/ImageProps.cpp

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <react/components/image/ImageProps.h>
-#include <react/components/image/conversions.h>
-#include <react/core/propsConversions.h>
+#include <react/renderer/components/image/ImageProps.h>
+#include <react/renderer/components/image/conversions.h>
+#include <react/renderer/core/propsConversions.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/components/image/ImageProps.h

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <react/components/view/ViewProps.h>
-#include <react/graphics/Color.h>
-#include <react/imagemanager/primitives.h>
+#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/graphics/Color.h>
+#include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/components/image/ImageShadowNode.cpp

@@ -8,8 +8,8 @@
 #include <cstdlib>
 #include <limits>
 
-#include <react/components/image/ImageShadowNode.h>
-#include <react/core/LayoutContext.h>
+#include <react/renderer/components/image/ImageShadowNode.h>
+#include <react/renderer/core/LayoutContext.h>
 #include "ImageState.h"
 
 namespace facebook {

ReactCommon/react/renderer/components/image/ImageShadowNode.h

@@ -7,12 +7,12 @@
 
 #pragma once
 
-#include <react/components/image/ImageEventEmitter.h>
-#include <react/components/image/ImageProps.h>
-#include <react/components/image/ImageState.h>
-#include <react/components/view/ConcreteViewShadowNode.h>
-#include <react/imagemanager/ImageManager.h>
-#include <react/imagemanager/primitives.h>
+#include <react/renderer/components/image/ImageEventEmitter.h>
+#include <react/renderer/components/image/ImageProps.h>
+#include <react/renderer/components/image/ImageState.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <react/renderer/imagemanager/ImageManager.h>
+#include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/components/image/ImageState.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include <folly/dynamic.h>
-#include <react/imagemanager/ImageRequest.h>
-#include <react/imagemanager/primitives.h>
+#include <react/renderer/imagemanager/ImageRequest.h>
+#include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/components/image/conversions.h

@@ -9,8 +9,8 @@
 
 #include <better/map.h>
 #include <folly/dynamic.h>
-#include <react/graphics/conversions.h>
-#include <react/imagemanager/primitives.h>
+#include <react/renderer/graphics/conversions.h>
+#include <react/renderer/imagemanager/primitives.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/components/inputaccessory/BUCK

@@ -22,7 +22,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "react/components/inputaccessory",
+        prefix = "react/renderer/components/inputaccessory",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -41,7 +41,7 @@ rn_xplat_cxx_library(
     ],
     visibility = ["PUBLIC"],
     deps = [
-        react_native_xplat_target("fabric/core:core"),
+        react_native_xplat_target("react/renderer/core:core"),
         "//xplat/js/react-native-github:generated_components-rncore",
     ],
 )

ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <react/components/inputaccessory/InputAccessoryShadowNode.h>
-#include <react/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/components/inputaccessory/InputAccessoryShadowNode.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/components/inputaccessory/InputAccessoryShadowNode.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <react/components/inputaccessory/InputAccessoryState.h>
-#include <react/components/rncore/EventEmitters.h>
-#include <react/components/rncore/Props.h>
-#include <react/components/view/ConcreteViewShadowNode.h>
+#include <react/renderer/components/inputaccessory/InputAccessoryState.h>
+#include <react/renderer/components/rncore/EventEmitters.h>
+#include <react/renderer/components/rncore/Props.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/components/inputaccessory/InputAccessoryState.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <react/graphics/Float.h>
-#include <react/graphics/Geometry.h>
-#include <react/graphics/conversions.h>
+#include <react/renderer/graphics/Float.h>
+#include <react/renderer/graphics/Geometry.h>
+#include <react/renderer/graphics/conversions.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK

@@ -25,7 +25,7 @@ rn_xplat_cxx_library(
         [
             ("", "*.h"),
         ],
-        prefix = "react/components/legacyviewmanagerinterop",
+        prefix = "react/renderer/components/legacyviewmanagerinterop",
     ),
     compiler_flags = [
         "-fexceptions",
@@ -46,8 +46,8 @@ rn_xplat_cxx_library(
     deps = [
         "//xplat/folly:headers_only",
         "//xplat/folly:memory",
-        react_native_xplat_target("fabric/core:core"),
-        react_native_xplat_target("fabric/components/view:view"),
+        react_native_xplat_target("react/renderer/core:core"),
+        react_native_xplat_target("react/renderer/components/view:view"),
         "//xplat/js/react-native-github:generated_components-rncore",
     ],
 )

ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include <react/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.h>
-#include <react/core/ConcreteComponentDescriptor.h>
+#include <react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropShadowNode.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook {
 namespace react {