diff --git a/ReactCommon/react/renderer/components/text/basetext/BaseTextProps.cpp b/ReactCommon/react/renderer/components/text/BaseTextProps.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/text/basetext/BaseTextProps.cpp
rename to ReactCommon/react/renderer/components/text/BaseTextProps.cpp
diff --git a/ReactCommon/react/renderer/components/text/basetext/BaseTextProps.h b/ReactCommon/react/renderer/components/text/BaseTextProps.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/basetext/BaseTextProps.h
rename to ReactCommon/react/renderer/components/text/BaseTextProps.h
diff --git a/ReactCommon/react/renderer/components/text/basetext/BaseTextShadowNode.cpp b/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/text/basetext/BaseTextShadowNode.cpp
rename to ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp
diff --git a/ReactCommon/react/renderer/components/text/basetext/BaseTextShadowNode.h b/ReactCommon/react/renderer/components/text/BaseTextShadowNode.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/basetext/BaseTextShadowNode.h
rename to ReactCommon/react/renderer/components/text/BaseTextShadowNode.h
diff --git a/ReactCommon/react/renderer/components/text/paragraph/ParagraphComponentDescriptor.h b/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/paragraph/ParagraphComponentDescriptor.h
rename to ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h
diff --git a/ReactCommon/react/renderer/components/text/paragraph/ParagraphEventEmitter.cpp b/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/text/paragraph/ParagraphEventEmitter.cpp
rename to ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp
diff --git a/ReactCommon/react/renderer/components/text/paragraph/ParagraphEventEmitter.h b/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/paragraph/ParagraphEventEmitter.h
rename to ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h
diff --git a/ReactCommon/react/renderer/components/text/paragraph/ParagraphProps.cpp b/ReactCommon/react/renderer/components/text/ParagraphProps.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/text/paragraph/ParagraphProps.cpp
rename to ReactCommon/react/renderer/components/text/ParagraphProps.cpp
diff --git a/ReactCommon/react/renderer/components/text/paragraph/ParagraphProps.h b/ReactCommon/react/renderer/components/text/ParagraphProps.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/paragraph/ParagraphProps.h
rename to ReactCommon/react/renderer/components/text/ParagraphProps.h
diff --git a/ReactCommon/react/renderer/components/text/paragraph/ParagraphShadowNode.cpp b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/text/paragraph/ParagraphShadowNode.cpp
rename to ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
diff --git a/ReactCommon/react/renderer/components/text/paragraph/ParagraphShadowNode.h b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/paragraph/ParagraphShadowNode.h
rename to ReactCommon/react/renderer/components/text/ParagraphShadowNode.h
diff --git a/ReactCommon/react/renderer/components/text/paragraph/ParagraphState.cpp b/ReactCommon/react/renderer/components/text/ParagraphState.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/text/paragraph/ParagraphState.cpp
rename to ReactCommon/react/renderer/components/text/ParagraphState.cpp
diff --git a/ReactCommon/react/renderer/components/text/paragraph/ParagraphState.h b/ReactCommon/react/renderer/components/text/ParagraphState.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/paragraph/ParagraphState.h
rename to ReactCommon/react/renderer/components/text/ParagraphState.h
diff --git a/ReactCommon/react/renderer/components/text/rawtext/RawTextComponentDescriptor.h b/ReactCommon/react/renderer/components/text/RawTextComponentDescriptor.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/rawtext/RawTextComponentDescriptor.h
rename to ReactCommon/react/renderer/components/text/RawTextComponentDescriptor.h
diff --git a/ReactCommon/react/renderer/components/text/rawtext/RawTextProps.cpp b/ReactCommon/react/renderer/components/text/RawTextProps.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/text/rawtext/RawTextProps.cpp
rename to ReactCommon/react/renderer/components/text/RawTextProps.cpp
diff --git a/ReactCommon/react/renderer/components/text/rawtext/RawTextProps.h b/ReactCommon/react/renderer/components/text/RawTextProps.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/rawtext/RawTextProps.h
rename to ReactCommon/react/renderer/components/text/RawTextProps.h
diff --git a/ReactCommon/react/renderer/components/text/rawtext/RawTextShadowNode.cpp b/ReactCommon/react/renderer/components/text/RawTextShadowNode.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/text/rawtext/RawTextShadowNode.cpp
rename to ReactCommon/react/renderer/components/text/RawTextShadowNode.cpp
diff --git a/ReactCommon/react/renderer/components/text/rawtext/RawTextShadowNode.h b/ReactCommon/react/renderer/components/text/RawTextShadowNode.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/rawtext/RawTextShadowNode.h
rename to ReactCommon/react/renderer/components/text/RawTextShadowNode.h
diff --git a/ReactCommon/react/renderer/components/text/text/TextComponentDescriptor.h b/ReactCommon/react/renderer/components/text/TextComponentDescriptor.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/text/TextComponentDescriptor.h
rename to ReactCommon/react/renderer/components/text/TextComponentDescriptor.h
diff --git a/ReactCommon/react/renderer/components/text/text/TextProps.cpp b/ReactCommon/react/renderer/components/text/TextProps.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/text/text/TextProps.cpp
rename to ReactCommon/react/renderer/components/text/TextProps.cpp
diff --git a/ReactCommon/react/renderer/components/text/text/TextProps.h b/ReactCommon/react/renderer/components/text/TextProps.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/text/TextProps.h
rename to ReactCommon/react/renderer/components/text/TextProps.h
diff --git a/ReactCommon/react/renderer/components/text/text/TextShadowNode.cpp b/ReactCommon/react/renderer/components/text/TextShadowNode.cpp
similarity index 100%
rename from ReactCommon/react/renderer/components/text/text/TextShadowNode.cpp
rename to ReactCommon/react/renderer/components/text/TextShadowNode.cpp
diff --git a/ReactCommon/react/renderer/components/text/text/TextShadowNode.h b/ReactCommon/react/renderer/components/text/TextShadowNode.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/text/TextShadowNode.h
rename to ReactCommon/react/renderer/components/text/TextShadowNode.h
diff --git a/ReactCommon/react/renderer/components/text/paragraph/conversions.h b/ReactCommon/react/renderer/components/text/conversions.h
similarity index 100%
rename from ReactCommon/react/renderer/components/text/paragraph/conversions.h
rename to ReactCommon/react/renderer/components/text/conversions.h