From 1ae76bf0ddd640d3265215b15f5b016aa0734a2f Mon Sep 17 00:00:00 2001 From: David Vacca Date: Sat, 1 Aug 2020 13:26:35 -0700 Subject: [PATCH] Remove inner folders of react/renderer/core Summary: This diff removes the inner folder of react/renderer/core, moving all its files into react/renderer/core This is necessary to simplify the compilation of Fabric in OSS More details: https://fb.quip.com/amaRA631DX3K changelog: [internal] Internal Reviewed By: fkgozali, JoshuaGross Differential Revision: D22875854 fbshipit-source-id: e2d969c3ec67eab1bbdc9288e5a4285c740fa944 --- ReactCommon/react/renderer/core/BUCK | 6 ------ .../react/renderer/core/{events => }/BatchedEventQueue.cpp | 0 .../react/renderer/core/{events => }/BatchedEventQueue.h | 0 .../core/{componentdescriptor => }/ComponentDescriptor.cpp | 0 .../core/{componentdescriptor => }/ComponentDescriptor.h | 0 .../{componentdescriptor => }/ConcreteComponentDescriptor.h | 0 .../renderer/core/{shadownode => }/ConcreteShadowNode.h | 0 ReactCommon/react/renderer/core/{state => }/ConcreteState.h | 0 ReactCommon/react/renderer/core/{events => }/EventBeat.cpp | 0 ReactCommon/react/renderer/core/{events => }/EventBeat.h | 0 .../react/renderer/core/{events => }/EventDispatcher.cpp | 0 .../react/renderer/core/{events => }/EventDispatcher.h | 0 .../react/renderer/core/{events => }/EventEmitter.cpp | 0 ReactCommon/react/renderer/core/{events => }/EventEmitter.h | 0 ReactCommon/react/renderer/core/{events => }/EventHandler.h | 0 ReactCommon/react/renderer/core/{events => }/EventPipe.h | 0 .../react/renderer/core/{events => }/EventPriority.h | 0 ReactCommon/react/renderer/core/{events => }/EventQueue.cpp | 0 ReactCommon/react/renderer/core/{events => }/EventQueue.h | 0 .../react/renderer/core/{events => }/EventTarget.cpp | 0 ReactCommon/react/renderer/core/{events => }/EventTarget.h | 0 .../react/renderer/core/{layout => }/LayoutConstraints.cpp | 0 .../react/renderer/core/{layout => }/LayoutConstraints.h | 0 .../react/renderer/core/{layout => }/LayoutContext.h | 0 .../react/renderer/core/{layout => }/LayoutMetrics.h | 0 .../react/renderer/core/{layout => }/LayoutPrimitives.h | 0 .../renderer/core/{layout => }/LayoutableShadowNode.cpp | 0 .../react/renderer/core/{layout => }/LayoutableShadowNode.h | 0 ReactCommon/react/renderer/core/{shadownode => }/Props.cpp | 0 ReactCommon/react/renderer/core/{shadownode => }/Props.h | 0 ReactCommon/react/renderer/core/{events => }/RawEvent.cpp | 0 ReactCommon/react/renderer/core/{events => }/RawEvent.h | 0 .../react/renderer/core/{primitives => }/RawProps.cpp | 0 ReactCommon/react/renderer/core/{primitives => }/RawProps.h | 0 .../react/renderer/core/{primitives => }/RawPropsKey.cpp | 0 .../react/renderer/core/{primitives => }/RawPropsKey.h | 0 .../react/renderer/core/{primitives => }/RawPropsKeyMap.cpp | 0 .../react/renderer/core/{primitives => }/RawPropsKeyMap.h | 0 .../react/renderer/core/{primitives => }/RawPropsParser.cpp | 0 .../react/renderer/core/{primitives => }/RawPropsParser.h | 0 .../renderer/core/{primitives => }/RawPropsPrimitives.h | 0 .../react/renderer/core/{primitives => }/RawValue.cpp | 0 ReactCommon/react/renderer/core/{primitives => }/RawValue.h | 0 .../react/renderer/core/{primitives => }/ReactPrimitives.h | 0 .../react/renderer/core/{primitives => }/Sealable.cpp | 0 ReactCommon/react/renderer/core/{primitives => }/Sealable.h | 0 .../react/renderer/core/{shadownode => }/ShadowNode.cpp | 0 .../react/renderer/core/{shadownode => }/ShadowNode.h | 0 .../renderer/core/{shadownode => }/ShadowNodeFamily.cpp | 0 .../react/renderer/core/{shadownode => }/ShadowNodeFamily.h | 0 .../core/{shadownode => }/ShadowNodeFamilyFragment.cpp | 0 .../core/{shadownode => }/ShadowNodeFamilyFragment.h | 0 .../renderer/core/{shadownode => }/ShadowNodeFragment.cpp | 0 .../renderer/core/{shadownode => }/ShadowNodeFragment.h | 0 .../renderer/core/{shadownode => }/ShadowNodeTraits.cpp | 0 .../react/renderer/core/{shadownode => }/ShadowNodeTraits.h | 0 ReactCommon/react/renderer/core/{state => }/State.cpp | 0 ReactCommon/react/renderer/core/{state => }/State.h | 0 ReactCommon/react/renderer/core/{state => }/StateData.h | 0 ReactCommon/react/renderer/core/{state => }/StatePipe.h | 0 ReactCommon/react/renderer/core/{state => }/StateUpdate.cpp | 0 ReactCommon/react/renderer/core/{state => }/StateUpdate.h | 0 .../renderer/core/{events => }/UnbatchedEventQueue.cpp | 0 .../react/renderer/core/{events => }/UnbatchedEventQueue.h | 0 ReactCommon/react/renderer/core/{events => }/ValueFactory.h | 0 65 files changed, 6 deletions(-) rename ReactCommon/react/renderer/core/{events => }/BatchedEventQueue.cpp (100%) rename ReactCommon/react/renderer/core/{events => }/BatchedEventQueue.h (100%) rename ReactCommon/react/renderer/core/{componentdescriptor => }/ComponentDescriptor.cpp (100%) rename ReactCommon/react/renderer/core/{componentdescriptor => }/ComponentDescriptor.h (100%) rename ReactCommon/react/renderer/core/{componentdescriptor => }/ConcreteComponentDescriptor.h (100%) rename ReactCommon/react/renderer/core/{shadownode => }/ConcreteShadowNode.h (100%) rename ReactCommon/react/renderer/core/{state => }/ConcreteState.h (100%) rename ReactCommon/react/renderer/core/{events => }/EventBeat.cpp (100%) rename ReactCommon/react/renderer/core/{events => }/EventBeat.h (100%) rename ReactCommon/react/renderer/core/{events => }/EventDispatcher.cpp (100%) rename ReactCommon/react/renderer/core/{events => }/EventDispatcher.h (100%) rename ReactCommon/react/renderer/core/{events => }/EventEmitter.cpp (100%) rename ReactCommon/react/renderer/core/{events => }/EventEmitter.h (100%) rename ReactCommon/react/renderer/core/{events => }/EventHandler.h (100%) rename ReactCommon/react/renderer/core/{events => }/EventPipe.h (100%) rename ReactCommon/react/renderer/core/{events => }/EventPriority.h (100%) rename ReactCommon/react/renderer/core/{events => }/EventQueue.cpp (100%) rename ReactCommon/react/renderer/core/{events => }/EventQueue.h (100%) rename ReactCommon/react/renderer/core/{events => }/EventTarget.cpp (100%) rename ReactCommon/react/renderer/core/{events => }/EventTarget.h (100%) rename ReactCommon/react/renderer/core/{layout => }/LayoutConstraints.cpp (100%) rename ReactCommon/react/renderer/core/{layout => }/LayoutConstraints.h (100%) rename ReactCommon/react/renderer/core/{layout => }/LayoutContext.h (100%) rename ReactCommon/react/renderer/core/{layout => }/LayoutMetrics.h (100%) rename ReactCommon/react/renderer/core/{layout => }/LayoutPrimitives.h (100%) rename ReactCommon/react/renderer/core/{layout => }/LayoutableShadowNode.cpp (100%) rename ReactCommon/react/renderer/core/{layout => }/LayoutableShadowNode.h (100%) rename ReactCommon/react/renderer/core/{shadownode => }/Props.cpp (100%) rename ReactCommon/react/renderer/core/{shadownode => }/Props.h (100%) rename ReactCommon/react/renderer/core/{events => }/RawEvent.cpp (100%) rename ReactCommon/react/renderer/core/{events => }/RawEvent.h (100%) rename ReactCommon/react/renderer/core/{primitives => }/RawProps.cpp (100%) rename ReactCommon/react/renderer/core/{primitives => }/RawProps.h (100%) rename ReactCommon/react/renderer/core/{primitives => }/RawPropsKey.cpp (100%) rename ReactCommon/react/renderer/core/{primitives => }/RawPropsKey.h (100%) rename ReactCommon/react/renderer/core/{primitives => }/RawPropsKeyMap.cpp (100%) rename ReactCommon/react/renderer/core/{primitives => }/RawPropsKeyMap.h (100%) rename ReactCommon/react/renderer/core/{primitives => }/RawPropsParser.cpp (100%) rename ReactCommon/react/renderer/core/{primitives => }/RawPropsParser.h (100%) rename ReactCommon/react/renderer/core/{primitives => }/RawPropsPrimitives.h (100%) rename ReactCommon/react/renderer/core/{primitives => }/RawValue.cpp (100%) rename ReactCommon/react/renderer/core/{primitives => }/RawValue.h (100%) rename ReactCommon/react/renderer/core/{primitives => }/ReactPrimitives.h (100%) rename ReactCommon/react/renderer/core/{primitives => }/Sealable.cpp (100%) rename ReactCommon/react/renderer/core/{primitives => }/Sealable.h (100%) rename ReactCommon/react/renderer/core/{shadownode => }/ShadowNode.cpp (100%) rename ReactCommon/react/renderer/core/{shadownode => }/ShadowNode.h (100%) rename ReactCommon/react/renderer/core/{shadownode => }/ShadowNodeFamily.cpp (100%) rename ReactCommon/react/renderer/core/{shadownode => }/ShadowNodeFamily.h (100%) rename ReactCommon/react/renderer/core/{shadownode => }/ShadowNodeFamilyFragment.cpp (100%) rename ReactCommon/react/renderer/core/{shadownode => }/ShadowNodeFamilyFragment.h (100%) rename ReactCommon/react/renderer/core/{shadownode => }/ShadowNodeFragment.cpp (100%) rename ReactCommon/react/renderer/core/{shadownode => }/ShadowNodeFragment.h (100%) rename ReactCommon/react/renderer/core/{shadownode => }/ShadowNodeTraits.cpp (100%) rename ReactCommon/react/renderer/core/{shadownode => }/ShadowNodeTraits.h (100%) rename ReactCommon/react/renderer/core/{state => }/State.cpp (100%) rename ReactCommon/react/renderer/core/{state => }/State.h (100%) rename ReactCommon/react/renderer/core/{state => }/StateData.h (100%) rename ReactCommon/react/renderer/core/{state => }/StatePipe.h (100%) rename ReactCommon/react/renderer/core/{state => }/StateUpdate.cpp (100%) rename ReactCommon/react/renderer/core/{state => }/StateUpdate.h (100%) rename ReactCommon/react/renderer/core/{events => }/UnbatchedEventQueue.cpp (100%) rename ReactCommon/react/renderer/core/{events => }/UnbatchedEventQueue.h (100%) rename ReactCommon/react/renderer/core/{events => }/ValueFactory.h (100%) diff --git a/ReactCommon/react/renderer/core/BUCK b/ReactCommon/react/renderer/core/BUCK index 7d5f6c65bde..32d4cec2d83 100644 --- a/ReactCommon/react/renderer/core/BUCK +++ b/ReactCommon/react/renderer/core/BUCK @@ -29,12 +29,6 @@ rn_xplat_cxx_library( exported_headers = subdir_glob( [ ("", "*.h"), - ("events", "*.h"), - ("primitives", "*.h"), - ("componentdescriptor", "*.h"), - ("layout", "*.h"), - ("shadownode", "*.h"), - ("state", "*.h"), ], prefix = "react/renderer/core", ), diff --git a/ReactCommon/react/renderer/core/events/BatchedEventQueue.cpp b/ReactCommon/react/renderer/core/BatchedEventQueue.cpp similarity index 100% rename from ReactCommon/react/renderer/core/events/BatchedEventQueue.cpp rename to ReactCommon/react/renderer/core/BatchedEventQueue.cpp diff --git a/ReactCommon/react/renderer/core/events/BatchedEventQueue.h b/ReactCommon/react/renderer/core/BatchedEventQueue.h similarity index 100% rename from ReactCommon/react/renderer/core/events/BatchedEventQueue.h rename to ReactCommon/react/renderer/core/BatchedEventQueue.h diff --git a/ReactCommon/react/renderer/core/componentdescriptor/ComponentDescriptor.cpp b/ReactCommon/react/renderer/core/ComponentDescriptor.cpp similarity index 100% rename from ReactCommon/react/renderer/core/componentdescriptor/ComponentDescriptor.cpp rename to ReactCommon/react/renderer/core/ComponentDescriptor.cpp diff --git a/ReactCommon/react/renderer/core/componentdescriptor/ComponentDescriptor.h b/ReactCommon/react/renderer/core/ComponentDescriptor.h similarity index 100% rename from ReactCommon/react/renderer/core/componentdescriptor/ComponentDescriptor.h rename to ReactCommon/react/renderer/core/ComponentDescriptor.h diff --git a/ReactCommon/react/renderer/core/componentdescriptor/ConcreteComponentDescriptor.h b/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h similarity index 100% rename from ReactCommon/react/renderer/core/componentdescriptor/ConcreteComponentDescriptor.h rename to ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h diff --git a/ReactCommon/react/renderer/core/shadownode/ConcreteShadowNode.h b/ReactCommon/react/renderer/core/ConcreteShadowNode.h similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/ConcreteShadowNode.h rename to ReactCommon/react/renderer/core/ConcreteShadowNode.h diff --git a/ReactCommon/react/renderer/core/state/ConcreteState.h b/ReactCommon/react/renderer/core/ConcreteState.h similarity index 100% rename from ReactCommon/react/renderer/core/state/ConcreteState.h rename to ReactCommon/react/renderer/core/ConcreteState.h diff --git a/ReactCommon/react/renderer/core/events/EventBeat.cpp b/ReactCommon/react/renderer/core/EventBeat.cpp similarity index 100% rename from ReactCommon/react/renderer/core/events/EventBeat.cpp rename to ReactCommon/react/renderer/core/EventBeat.cpp diff --git a/ReactCommon/react/renderer/core/events/EventBeat.h b/ReactCommon/react/renderer/core/EventBeat.h similarity index 100% rename from ReactCommon/react/renderer/core/events/EventBeat.h rename to ReactCommon/react/renderer/core/EventBeat.h diff --git a/ReactCommon/react/renderer/core/events/EventDispatcher.cpp b/ReactCommon/react/renderer/core/EventDispatcher.cpp similarity index 100% rename from ReactCommon/react/renderer/core/events/EventDispatcher.cpp rename to ReactCommon/react/renderer/core/EventDispatcher.cpp diff --git a/ReactCommon/react/renderer/core/events/EventDispatcher.h b/ReactCommon/react/renderer/core/EventDispatcher.h similarity index 100% rename from ReactCommon/react/renderer/core/events/EventDispatcher.h rename to ReactCommon/react/renderer/core/EventDispatcher.h diff --git a/ReactCommon/react/renderer/core/events/EventEmitter.cpp b/ReactCommon/react/renderer/core/EventEmitter.cpp similarity index 100% rename from ReactCommon/react/renderer/core/events/EventEmitter.cpp rename to ReactCommon/react/renderer/core/EventEmitter.cpp diff --git a/ReactCommon/react/renderer/core/events/EventEmitter.h b/ReactCommon/react/renderer/core/EventEmitter.h similarity index 100% rename from ReactCommon/react/renderer/core/events/EventEmitter.h rename to ReactCommon/react/renderer/core/EventEmitter.h diff --git a/ReactCommon/react/renderer/core/events/EventHandler.h b/ReactCommon/react/renderer/core/EventHandler.h similarity index 100% rename from ReactCommon/react/renderer/core/events/EventHandler.h rename to ReactCommon/react/renderer/core/EventHandler.h diff --git a/ReactCommon/react/renderer/core/events/EventPipe.h b/ReactCommon/react/renderer/core/EventPipe.h similarity index 100% rename from ReactCommon/react/renderer/core/events/EventPipe.h rename to ReactCommon/react/renderer/core/EventPipe.h diff --git a/ReactCommon/react/renderer/core/events/EventPriority.h b/ReactCommon/react/renderer/core/EventPriority.h similarity index 100% rename from ReactCommon/react/renderer/core/events/EventPriority.h rename to ReactCommon/react/renderer/core/EventPriority.h diff --git a/ReactCommon/react/renderer/core/events/EventQueue.cpp b/ReactCommon/react/renderer/core/EventQueue.cpp similarity index 100% rename from ReactCommon/react/renderer/core/events/EventQueue.cpp rename to ReactCommon/react/renderer/core/EventQueue.cpp diff --git a/ReactCommon/react/renderer/core/events/EventQueue.h b/ReactCommon/react/renderer/core/EventQueue.h similarity index 100% rename from ReactCommon/react/renderer/core/events/EventQueue.h rename to ReactCommon/react/renderer/core/EventQueue.h diff --git a/ReactCommon/react/renderer/core/events/EventTarget.cpp b/ReactCommon/react/renderer/core/EventTarget.cpp similarity index 100% rename from ReactCommon/react/renderer/core/events/EventTarget.cpp rename to ReactCommon/react/renderer/core/EventTarget.cpp diff --git a/ReactCommon/react/renderer/core/events/EventTarget.h b/ReactCommon/react/renderer/core/EventTarget.h similarity index 100% rename from ReactCommon/react/renderer/core/events/EventTarget.h rename to ReactCommon/react/renderer/core/EventTarget.h diff --git a/ReactCommon/react/renderer/core/layout/LayoutConstraints.cpp b/ReactCommon/react/renderer/core/LayoutConstraints.cpp similarity index 100% rename from ReactCommon/react/renderer/core/layout/LayoutConstraints.cpp rename to ReactCommon/react/renderer/core/LayoutConstraints.cpp diff --git a/ReactCommon/react/renderer/core/layout/LayoutConstraints.h b/ReactCommon/react/renderer/core/LayoutConstraints.h similarity index 100% rename from ReactCommon/react/renderer/core/layout/LayoutConstraints.h rename to ReactCommon/react/renderer/core/LayoutConstraints.h diff --git a/ReactCommon/react/renderer/core/layout/LayoutContext.h b/ReactCommon/react/renderer/core/LayoutContext.h similarity index 100% rename from ReactCommon/react/renderer/core/layout/LayoutContext.h rename to ReactCommon/react/renderer/core/LayoutContext.h diff --git a/ReactCommon/react/renderer/core/layout/LayoutMetrics.h b/ReactCommon/react/renderer/core/LayoutMetrics.h similarity index 100% rename from ReactCommon/react/renderer/core/layout/LayoutMetrics.h rename to ReactCommon/react/renderer/core/LayoutMetrics.h diff --git a/ReactCommon/react/renderer/core/layout/LayoutPrimitives.h b/ReactCommon/react/renderer/core/LayoutPrimitives.h similarity index 100% rename from ReactCommon/react/renderer/core/layout/LayoutPrimitives.h rename to ReactCommon/react/renderer/core/LayoutPrimitives.h diff --git a/ReactCommon/react/renderer/core/layout/LayoutableShadowNode.cpp b/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp similarity index 100% rename from ReactCommon/react/renderer/core/layout/LayoutableShadowNode.cpp rename to ReactCommon/react/renderer/core/LayoutableShadowNode.cpp diff --git a/ReactCommon/react/renderer/core/layout/LayoutableShadowNode.h b/ReactCommon/react/renderer/core/LayoutableShadowNode.h similarity index 100% rename from ReactCommon/react/renderer/core/layout/LayoutableShadowNode.h rename to ReactCommon/react/renderer/core/LayoutableShadowNode.h diff --git a/ReactCommon/react/renderer/core/shadownode/Props.cpp b/ReactCommon/react/renderer/core/Props.cpp similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/Props.cpp rename to ReactCommon/react/renderer/core/Props.cpp diff --git a/ReactCommon/react/renderer/core/shadownode/Props.h b/ReactCommon/react/renderer/core/Props.h similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/Props.h rename to ReactCommon/react/renderer/core/Props.h diff --git a/ReactCommon/react/renderer/core/events/RawEvent.cpp b/ReactCommon/react/renderer/core/RawEvent.cpp similarity index 100% rename from ReactCommon/react/renderer/core/events/RawEvent.cpp rename to ReactCommon/react/renderer/core/RawEvent.cpp diff --git a/ReactCommon/react/renderer/core/events/RawEvent.h b/ReactCommon/react/renderer/core/RawEvent.h similarity index 100% rename from ReactCommon/react/renderer/core/events/RawEvent.h rename to ReactCommon/react/renderer/core/RawEvent.h diff --git a/ReactCommon/react/renderer/core/primitives/RawProps.cpp b/ReactCommon/react/renderer/core/RawProps.cpp similarity index 100% rename from ReactCommon/react/renderer/core/primitives/RawProps.cpp rename to ReactCommon/react/renderer/core/RawProps.cpp diff --git a/ReactCommon/react/renderer/core/primitives/RawProps.h b/ReactCommon/react/renderer/core/RawProps.h similarity index 100% rename from ReactCommon/react/renderer/core/primitives/RawProps.h rename to ReactCommon/react/renderer/core/RawProps.h diff --git a/ReactCommon/react/renderer/core/primitives/RawPropsKey.cpp b/ReactCommon/react/renderer/core/RawPropsKey.cpp similarity index 100% rename from ReactCommon/react/renderer/core/primitives/RawPropsKey.cpp rename to ReactCommon/react/renderer/core/RawPropsKey.cpp diff --git a/ReactCommon/react/renderer/core/primitives/RawPropsKey.h b/ReactCommon/react/renderer/core/RawPropsKey.h similarity index 100% rename from ReactCommon/react/renderer/core/primitives/RawPropsKey.h rename to ReactCommon/react/renderer/core/RawPropsKey.h diff --git a/ReactCommon/react/renderer/core/primitives/RawPropsKeyMap.cpp b/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp similarity index 100% rename from ReactCommon/react/renderer/core/primitives/RawPropsKeyMap.cpp rename to ReactCommon/react/renderer/core/RawPropsKeyMap.cpp diff --git a/ReactCommon/react/renderer/core/primitives/RawPropsKeyMap.h b/ReactCommon/react/renderer/core/RawPropsKeyMap.h similarity index 100% rename from ReactCommon/react/renderer/core/primitives/RawPropsKeyMap.h rename to ReactCommon/react/renderer/core/RawPropsKeyMap.h diff --git a/ReactCommon/react/renderer/core/primitives/RawPropsParser.cpp b/ReactCommon/react/renderer/core/RawPropsParser.cpp similarity index 100% rename from ReactCommon/react/renderer/core/primitives/RawPropsParser.cpp rename to ReactCommon/react/renderer/core/RawPropsParser.cpp diff --git a/ReactCommon/react/renderer/core/primitives/RawPropsParser.h b/ReactCommon/react/renderer/core/RawPropsParser.h similarity index 100% rename from ReactCommon/react/renderer/core/primitives/RawPropsParser.h rename to ReactCommon/react/renderer/core/RawPropsParser.h diff --git a/ReactCommon/react/renderer/core/primitives/RawPropsPrimitives.h b/ReactCommon/react/renderer/core/RawPropsPrimitives.h similarity index 100% rename from ReactCommon/react/renderer/core/primitives/RawPropsPrimitives.h rename to ReactCommon/react/renderer/core/RawPropsPrimitives.h diff --git a/ReactCommon/react/renderer/core/primitives/RawValue.cpp b/ReactCommon/react/renderer/core/RawValue.cpp similarity index 100% rename from ReactCommon/react/renderer/core/primitives/RawValue.cpp rename to ReactCommon/react/renderer/core/RawValue.cpp diff --git a/ReactCommon/react/renderer/core/primitives/RawValue.h b/ReactCommon/react/renderer/core/RawValue.h similarity index 100% rename from ReactCommon/react/renderer/core/primitives/RawValue.h rename to ReactCommon/react/renderer/core/RawValue.h diff --git a/ReactCommon/react/renderer/core/primitives/ReactPrimitives.h b/ReactCommon/react/renderer/core/ReactPrimitives.h similarity index 100% rename from ReactCommon/react/renderer/core/primitives/ReactPrimitives.h rename to ReactCommon/react/renderer/core/ReactPrimitives.h diff --git a/ReactCommon/react/renderer/core/primitives/Sealable.cpp b/ReactCommon/react/renderer/core/Sealable.cpp similarity index 100% rename from ReactCommon/react/renderer/core/primitives/Sealable.cpp rename to ReactCommon/react/renderer/core/Sealable.cpp diff --git a/ReactCommon/react/renderer/core/primitives/Sealable.h b/ReactCommon/react/renderer/core/Sealable.h similarity index 100% rename from ReactCommon/react/renderer/core/primitives/Sealable.h rename to ReactCommon/react/renderer/core/Sealable.h diff --git a/ReactCommon/react/renderer/core/shadownode/ShadowNode.cpp b/ReactCommon/react/renderer/core/ShadowNode.cpp similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/ShadowNode.cpp rename to ReactCommon/react/renderer/core/ShadowNode.cpp diff --git a/ReactCommon/react/renderer/core/shadownode/ShadowNode.h b/ReactCommon/react/renderer/core/ShadowNode.h similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/ShadowNode.h rename to ReactCommon/react/renderer/core/ShadowNode.h diff --git a/ReactCommon/react/renderer/core/shadownode/ShadowNodeFamily.cpp b/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/ShadowNodeFamily.cpp rename to ReactCommon/react/renderer/core/ShadowNodeFamily.cpp diff --git a/ReactCommon/react/renderer/core/shadownode/ShadowNodeFamily.h b/ReactCommon/react/renderer/core/ShadowNodeFamily.h similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/ShadowNodeFamily.h rename to ReactCommon/react/renderer/core/ShadowNodeFamily.h diff --git a/ReactCommon/react/renderer/core/shadownode/ShadowNodeFamilyFragment.cpp b/ReactCommon/react/renderer/core/ShadowNodeFamilyFragment.cpp similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/ShadowNodeFamilyFragment.cpp rename to ReactCommon/react/renderer/core/ShadowNodeFamilyFragment.cpp diff --git a/ReactCommon/react/renderer/core/shadownode/ShadowNodeFamilyFragment.h b/ReactCommon/react/renderer/core/ShadowNodeFamilyFragment.h similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/ShadowNodeFamilyFragment.h rename to ReactCommon/react/renderer/core/ShadowNodeFamilyFragment.h diff --git a/ReactCommon/react/renderer/core/shadownode/ShadowNodeFragment.cpp b/ReactCommon/react/renderer/core/ShadowNodeFragment.cpp similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/ShadowNodeFragment.cpp rename to ReactCommon/react/renderer/core/ShadowNodeFragment.cpp diff --git a/ReactCommon/react/renderer/core/shadownode/ShadowNodeFragment.h b/ReactCommon/react/renderer/core/ShadowNodeFragment.h similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/ShadowNodeFragment.h rename to ReactCommon/react/renderer/core/ShadowNodeFragment.h diff --git a/ReactCommon/react/renderer/core/shadownode/ShadowNodeTraits.cpp b/ReactCommon/react/renderer/core/ShadowNodeTraits.cpp similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/ShadowNodeTraits.cpp rename to ReactCommon/react/renderer/core/ShadowNodeTraits.cpp diff --git a/ReactCommon/react/renderer/core/shadownode/ShadowNodeTraits.h b/ReactCommon/react/renderer/core/ShadowNodeTraits.h similarity index 100% rename from ReactCommon/react/renderer/core/shadownode/ShadowNodeTraits.h rename to ReactCommon/react/renderer/core/ShadowNodeTraits.h diff --git a/ReactCommon/react/renderer/core/state/State.cpp b/ReactCommon/react/renderer/core/State.cpp similarity index 100% rename from ReactCommon/react/renderer/core/state/State.cpp rename to ReactCommon/react/renderer/core/State.cpp diff --git a/ReactCommon/react/renderer/core/state/State.h b/ReactCommon/react/renderer/core/State.h similarity index 100% rename from ReactCommon/react/renderer/core/state/State.h rename to ReactCommon/react/renderer/core/State.h diff --git a/ReactCommon/react/renderer/core/state/StateData.h b/ReactCommon/react/renderer/core/StateData.h similarity index 100% rename from ReactCommon/react/renderer/core/state/StateData.h rename to ReactCommon/react/renderer/core/StateData.h diff --git a/ReactCommon/react/renderer/core/state/StatePipe.h b/ReactCommon/react/renderer/core/StatePipe.h similarity index 100% rename from ReactCommon/react/renderer/core/state/StatePipe.h rename to ReactCommon/react/renderer/core/StatePipe.h diff --git a/ReactCommon/react/renderer/core/state/StateUpdate.cpp b/ReactCommon/react/renderer/core/StateUpdate.cpp similarity index 100% rename from ReactCommon/react/renderer/core/state/StateUpdate.cpp rename to ReactCommon/react/renderer/core/StateUpdate.cpp diff --git a/ReactCommon/react/renderer/core/state/StateUpdate.h b/ReactCommon/react/renderer/core/StateUpdate.h similarity index 100% rename from ReactCommon/react/renderer/core/state/StateUpdate.h rename to ReactCommon/react/renderer/core/StateUpdate.h diff --git a/ReactCommon/react/renderer/core/events/UnbatchedEventQueue.cpp b/ReactCommon/react/renderer/core/UnbatchedEventQueue.cpp similarity index 100% rename from ReactCommon/react/renderer/core/events/UnbatchedEventQueue.cpp rename to ReactCommon/react/renderer/core/UnbatchedEventQueue.cpp diff --git a/ReactCommon/react/renderer/core/events/UnbatchedEventQueue.h b/ReactCommon/react/renderer/core/UnbatchedEventQueue.h similarity index 100% rename from ReactCommon/react/renderer/core/events/UnbatchedEventQueue.h rename to ReactCommon/react/renderer/core/UnbatchedEventQueue.h diff --git a/ReactCommon/react/renderer/core/events/ValueFactory.h b/ReactCommon/react/renderer/core/ValueFactory.h similarity index 100% rename from ReactCommon/react/renderer/core/events/ValueFactory.h rename to ReactCommon/react/renderer/core/ValueFactory.h