diff --git a/modules/javafx.incubator.controls/.classpath b/modules/javafx.incubator.richtext/.classpath
similarity index 100%
rename from modules/javafx.incubator.controls/.classpath
rename to modules/javafx.incubator.richtext/.classpath
diff --git a/modules/javafx.incubator.controls/.project b/modules/javafx.incubator.richtext/.project
similarity index 100%
rename from modules/javafx.incubator.controls/.project
rename to modules/javafx.incubator.richtext/.project
diff --git a/modules/javafx.incubator.controls/.settings/org.eclipse.core.resources.prefs b/modules/javafx.incubator.richtext/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from modules/javafx.incubator.controls/.settings/org.eclipse.core.resources.prefs
rename to modules/javafx.incubator.richtext/.settings/org.eclipse.core.resources.prefs
diff --git a/modules/javafx.incubator.controls/README.md b/modules/javafx.incubator.richtext/README.md
similarity index 100%
rename from modules/javafx.incubator.controls/README.md
rename to modules/javafx.incubator.richtext/README.md
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/input/HList.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/input/HList.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/input/HList.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/input/HList.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/CachingStyleResolver.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/CachingStyleResolver.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/CachingStyleResolver.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/CachingStyleResolver.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/CellArrangement.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/CellArrangement.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/CellArrangement.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/CellArrangement.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/ClippedPane.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/ClippedPane.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/ClippedPane.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/ClippedPane.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/CompoundKey.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/CompoundKey.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/CompoundKey.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/CompoundKey.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/Converters.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/Converters.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/Converters.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/Converters.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/CssStyles.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/CssStyles.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/CssStyles.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/CssStyles.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/D.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/D.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/D.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/D.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/FastCache.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/FastCache.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/FastCache.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/FastCache.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/FirstLineIndentSpacer.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/FirstLineIndentSpacer.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/FirstLineIndentSpacer.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/FirstLineIndentSpacer.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/FxPathBuilder.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/FxPathBuilder.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/FxPathBuilder.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/FxPathBuilder.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/HighlightShape.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/HighlightShape.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/HighlightShape.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/HighlightShape.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/HtmlStyledOutput.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/HtmlStyledOutput.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/HtmlStyledOutput.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/HtmlStyledOutput.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/MarkerHelper.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/MarkerHelper.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/MarkerHelper.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/MarkerHelper.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/Markers.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/Markers.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/Markers.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/Markers.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/Origin.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/Origin.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/Origin.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/Origin.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/Params.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/Params.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/Params.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/Params.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichParagraphHelper.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichParagraphHelper.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichParagraphHelper.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichParagraphHelper.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichTextAreaBehavior.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichTextAreaBehavior.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichTextAreaBehavior.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichTextAreaBehavior.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichTextAreaSkinHelper.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichTextAreaSkinHelper.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichTextAreaSkinHelper.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichTextAreaSkinHelper.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichTextFormatHandlerHelper.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichTextFormatHandlerHelper.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichTextFormatHandlerHelper.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/RichTextFormatHandlerHelper.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/RtfStyledOutput.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/RtfStyledOutput.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/RtfStyledOutput.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/RtfStyledOutput.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/SegmentStyledInput.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/SegmentStyledInput.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/SegmentStyledInput.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/SegmentStyledInput.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/SegmentStyledOutput.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/SegmentStyledOutput.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/SegmentStyledOutput.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/SegmentStyledOutput.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/SelInfo.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/SelInfo.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/SelInfo.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/SelInfo.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/SelectionHelper.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/SelectionHelper.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/SelectionHelper.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/SelectionHelper.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/StringBuilderStyledOutput.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/StringBuilderStyledOutput.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/StringBuilderStyledOutput.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/StringBuilderStyledOutput.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/StringStyledInput.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/StringStyledInput.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/StringStyledInput.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/StringStyledInput.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/TextCell.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/TextCell.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/TextCell.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/TextCell.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/UndoableChange.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/UndoableChange.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/UndoableChange.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/UndoableChange.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/VFlow.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/VFlow.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/VFlow.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/VFlow.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/VFlowCellContext.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/VFlowCellContext.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/VFlowCellContext.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/VFlowCellContext.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/AbstractFilter.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/AbstractFilter.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/AbstractFilter.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/AbstractFilter.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/AttrSet.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/AttrSet.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/AttrSet.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/AttrSet.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFAttribute.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFAttribute.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFAttribute.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFAttribute.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFAttributes.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFAttributes.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFAttributes.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFAttributes.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFParser.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFParser.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFParser.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFParser.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFReader.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFReader.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFReader.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/RTFReader.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/Style.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/Style.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/Style.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/Style.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/NeXT.txt b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/NeXT.txt
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/NeXT.txt
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/NeXT.txt
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/ansi.txt b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/ansi.txt
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/ansi.txt
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/ansi.txt
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/cpg437.txt b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/cpg437.txt
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/cpg437.txt
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/cpg437.txt
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/cpg850.txt b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/cpg850.txt
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/cpg850.txt
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/cpg850.txt
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/mac.txt b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/mac.txt
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/mac.txt
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/rtf/charsets/mac.txt
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/IDisconnectable.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/IDisconnectable.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/IDisconnectable.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/IDisconnectable.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/ImgUtil.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/ImgUtil.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/ImgUtil.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/ImgUtil.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/ListenerHelper.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/ListenerHelper.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/ListenerHelper.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/ListenerHelper.java
diff --git a/modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/RichUtils.java b/modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/RichUtils.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/RichUtils.java
rename to modules/javafx.incubator.richtext/src/main/java/com/sun/javafx/incubator/scene/control/rich/util/RichUtils.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/input/BehaviorBase.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/input/BehaviorBase.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/input/BehaviorBase.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/input/BehaviorBase.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/input/EventCriteria.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/input/EventCriteria.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/input/EventCriteria.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/input/EventCriteria.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/input/FunctionTag.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/input/FunctionTag.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/input/FunctionTag.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/input/FunctionTag.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/input/InputMap.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/input/InputMap.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/input/InputMap.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/input/InputMap.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/input/KeyBinding.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/input/KeyBinding.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/input/KeyBinding.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/input/KeyBinding.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/input/package-info.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/input/package-info.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/input/package-info.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/input/package-info.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/CaretInfo.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/CaretInfo.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/CaretInfo.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/CaretInfo.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/CellContext.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/CellContext.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/CellContext.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/CellContext.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/CodeArea.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/CodeArea.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/CodeArea.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/CodeArea.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/CodeTextModel.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/CodeTextModel.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/CodeTextModel.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/CodeTextModel.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/ConfigurationParameters.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/ConfigurationParameters.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/ConfigurationParameters.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/ConfigurationParameters.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/Marker.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/Marker.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/Marker.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/Marker.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/RichTextArea.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/RichTextArea.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/RichTextArea.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/RichTextArea.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/SelectionModel.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/SelectionModel.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/SelectionModel.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/SelectionModel.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/SelectionSegment.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/SelectionSegment.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/SelectionSegment.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/SelectionSegment.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/SideDecorator.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/SideDecorator.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/SideDecorator.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/SideDecorator.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/SingleSelectionModel.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/SingleSelectionModel.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/SingleSelectionModel.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/SingleSelectionModel.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/StyleAttributeHandler.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/StyleAttributeHandler.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/StyleAttributeHandler.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/StyleAttributeHandler.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/StyleHandlerRegistry.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/StyleHandlerRegistry.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/StyleHandlerRegistry.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/StyleHandlerRegistry.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/StyleResolver.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/StyleResolver.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/StyleResolver.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/StyleResolver.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/SyntaxDecorator.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/SyntaxDecorator.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/SyntaxDecorator.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/SyntaxDecorator.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/TextPos.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/TextPos.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/TextPos.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/TextPos.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/DataFormatHandler.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/DataFormatHandler.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/DataFormatHandler.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/DataFormatHandler.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/EditableRichTextModel.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/EditableRichTextModel.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/EditableRichTextModel.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/EditableRichTextModel.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/HtmlExportFormatHandler.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/HtmlExportFormatHandler.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/HtmlExportFormatHandler.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/HtmlExportFormatHandler.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/ImageCellPane.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/ImageCellPane.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/ImageCellPane.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/ImageCellPane.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/PlainTextFormatHandler.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/PlainTextFormatHandler.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/PlainTextFormatHandler.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/PlainTextFormatHandler.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/PlainTextModel.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/PlainTextModel.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/PlainTextModel.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/PlainTextModel.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/RichParagraph.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/RichParagraph.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/RichParagraph.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/RichParagraph.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/RichTextFormatHandler.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/RichTextFormatHandler.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/RichTextFormatHandler.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/RichTextFormatHandler.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/RtfFormatHandler.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/RtfFormatHandler.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/RtfFormatHandler.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/RtfFormatHandler.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/SimpleViewOnlyStyledModel.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/SimpleViewOnlyStyledModel.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/SimpleViewOnlyStyledModel.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/SimpleViewOnlyStyledModel.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyleAttribute.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyleAttribute.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyleAttribute.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyleAttribute.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyleAttrs.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyleAttrs.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyleAttrs.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyleAttrs.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyledInput.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyledInput.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyledInput.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyledInput.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyledOutput.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyledOutput.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyledOutput.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyledOutput.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyledSegment.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyledSegment.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyledSegment.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyledSegment.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyledTextModel.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyledTextModel.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyledTextModel.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyledTextModel.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyledTextModelViewOnlyBase.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyledTextModelViewOnlyBase.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/StyledTextModelViewOnlyBase.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/StyledTextModelViewOnlyBase.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/package-info.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/package-info.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/model/package-info.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/model/package-info.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/package-info.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/package-info.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/package-info.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/package-info.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/skin/CodeAreaSkin.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/skin/CodeAreaSkin.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/skin/CodeAreaSkin.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/skin/CodeAreaSkin.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/skin/LineNumberDecorator.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/skin/LineNumberDecorator.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/skin/LineNumberDecorator.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/skin/LineNumberDecorator.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/skin/RichTextAreaSkin.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/skin/RichTextAreaSkin.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/skin/RichTextAreaSkin.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/skin/RichTextAreaSkin.java
diff --git a/modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/skin/package-info.java b/modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/skin/package-info.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/javafx/incubator/scene/control/rich/skin/package-info.java
rename to modules/javafx.incubator.richtext/src/main/java/javafx/incubator/scene/control/rich/skin/package-info.java
diff --git a/modules/javafx.incubator.controls/src/main/java/module-info.java b/modules/javafx.incubator.richtext/src/main/java/module-info.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/main/java/module-info.java
rename to modules/javafx.incubator.richtext/src/main/java/module-info.java
diff --git a/modules/javafx.incubator.controls/src/shims/java/javafx/incubator/scene/control/rich/RichTextAreaShim.java b/modules/javafx.incubator.richtext/src/shims/java/javafx/incubator/scene/control/rich/RichTextAreaShim.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/shims/java/javafx/incubator/scene/control/rich/RichTextAreaShim.java
rename to modules/javafx.incubator.richtext/src/shims/java/javafx/incubator/scene/control/rich/RichTextAreaShim.java
diff --git a/modules/javafx.incubator.controls/src/test/addExports b/modules/javafx.incubator.richtext/src/test/addExports
similarity index 100%
rename from modules/javafx.incubator.controls/src/test/addExports
rename to modules/javafx.incubator.richtext/src/test/addExports
diff --git a/modules/javafx.incubator.controls/src/test/java/test/com/sun/javafx/incubator/scene/control/rich/TestRichTextArea.java b/modules/javafx.incubator.richtext/src/test/java/test/com/sun/javafx/incubator/scene/control/rich/TestRichTextArea.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/test/java/test/com/sun/javafx/incubator/scene/control/rich/TestRichTextArea.java
rename to modules/javafx.incubator.richtext/src/test/java/test/com/sun/javafx/incubator/scene/control/rich/TestRichTextArea.java
diff --git a/modules/javafx.incubator.controls/src/test/java/test/javafx/incubator/scene/control/rich/model/TestEditableRichTextModel.java b/modules/javafx.incubator.richtext/src/test/java/test/javafx/incubator/scene/control/rich/model/TestEditableRichTextModel.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/test/java/test/javafx/incubator/scene/control/rich/model/TestEditableRichTextModel.java
rename to modules/javafx.incubator.richtext/src/test/java/test/javafx/incubator/scene/control/rich/model/TestEditableRichTextModel.java
diff --git a/modules/javafx.incubator.controls/src/test/java/test/javafx/incubator/scene/control/rich/model/TestRichTextFormatHandler.java b/modules/javafx.incubator.richtext/src/test/java/test/javafx/incubator/scene/control/rich/model/TestRichTextFormatHandler.java
similarity index 100%
rename from modules/javafx.incubator.controls/src/test/java/test/javafx/incubator/scene/control/rich/model/TestRichTextFormatHandler.java
rename to modules/javafx.incubator.richtext/src/test/java/test/javafx/incubator/scene/control/rich/model/TestRichTextFormatHandler.java