From 60f01927a918ed55b4d4e8457730f7890f323ae6 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Sun, 24 May 2009 21:52:50 +0000
Subject: [PATCH] Split AvalonEdit.Gui into Editing and Rendering

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4141 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../{Gui => Editing}/AbstractMargin.cs        |   0
 .../{Gui => Editing}/Caret.cs                 |   0
 .../{Gui => Editing}/CaretLayer.cs            |   0
 .../CaretNavigationCommandHandler.cs          |   0
 .../{Gui => Editing}/DragDropException.cs     |   0
 .../{Gui => Editing}/EditingCommandHandler.cs |   0
 .../FoldingElementGenerator.cs                |   0
 .../{Gui => Editing}/FoldingManager.cs        |   0
 .../{Gui => Editing}/FoldingMargin.cs         |   0
 .../{Gui => Editing}/FoldingMarginMarker.cs   |   0
 .../{Gui => Editing}/FoldingSection.cs        |   0
 .../IReadOnlySectionProvider.cs               |   0
 .../{Gui => Editing}/LineNumberMargin.cs      |   0
 .../{Gui => Editing}/NoReadOnlySections.cs    |   0
 .../{Gui => Editing}/Selection.cs             |   0
 .../{Gui => Editing}/SelectionColorizer.cs    |   0
 .../{Gui => Editing}/SelectionLayer.cs        |   0
 .../{Gui => Editing}/SelectionMouseHandler.cs |   0
 .../{Gui => Editing}/TextArea.cs              |   0
 .../TextAreaDefaultInputHandlers.cs           |   0
 .../{Gui => Editing}/TextAreaInputHandler.cs  |   0
 .../TextSegmentReadOnlySectionProvider.cs     |   0
 .../ICSharpCode.AvalonEdit.csproj             | 195 +++++++++---------
 .../BackgroundGeometryBuilder.cs              |   0
 .../CollapsedLineSection.cs                   |   0
 .../ColorizingTransformer.cs                  |   0
 .../DocumentColorizingTransformer.cs          |   0
 .../FormattedTextElement.cs                   |   0
 .../GlobalTextRunProperties.cs                |   0
 .../{Gui => Rendering}/HeightTree.cs          |   0
 .../{Gui => Rendering}/HeightTreeLineNode.cs  |   0
 .../{Gui => Rendering}/HeightTreeNode.cs      |   0
 .../{Gui => Rendering}/IBackgroundRenderer.cs |   0
 .../ITextRunConstructionContext.cs            |   0
 .../{Gui => Rendering}/ITextViewConnect.cs    |   0
 .../IVisualLineTransformer.cs                 |   0
 .../{Gui => Rendering}/InlineObjectRun.cs     |   0
 .../{Gui => Rendering}/Layer.cs               |   0
 .../{Gui => Rendering}/LayerPosition.cs       |   0
 .../NewLineElementGenerator.cs                |   0
 .../SingleCharacterElementGenerator.cs        |   0
 .../{Gui => Rendering}/TextLayer.cs           |   0
 .../{Gui => Rendering}/TextView.cs            |   0
 .../{Gui => Rendering}/TextViewPosition.cs    |   0
 .../TextViewWeakEventManager.cs               |   0
 .../{Gui => Rendering}/VisualLine.cs          |   0
 .../{Gui => Rendering}/VisualLineElement.cs   |   0
 .../VisualLineElementGenerator.cs             |   0
 .../VisualLineElementTextRunProperties.cs     |   0
 .../{Gui => Rendering}/VisualLineText.cs      |   0
 .../VisualLineTextParagraphProperties.cs      |   0
 .../VisualLineTextSource.cs                   |   0
 .../VisualLinesInvalidException.cs            |   0
 .../{Gui => Rendering}/VisualYPosition.cs     |   0
 .../{Gui => }/TextEditor.cs                   |   0
 .../{Gui => }/TextEditor.xaml                 |   0
 .../{Gui => }/TextEditorWeakEventManager.cs   |   0
 .../Project/Src/Commands/MenuItemBuilders.cs  |   4 +-
 58 files changed, 99 insertions(+), 100 deletions(-)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/AbstractMargin.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/Caret.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/CaretLayer.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/CaretNavigationCommandHandler.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/DragDropException.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/EditingCommandHandler.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/FoldingElementGenerator.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/FoldingManager.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/FoldingMargin.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/FoldingMarginMarker.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/FoldingSection.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/IReadOnlySectionProvider.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/LineNumberMargin.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/NoReadOnlySections.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/Selection.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/SelectionColorizer.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/SelectionLayer.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/SelectionMouseHandler.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/TextArea.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/TextAreaDefaultInputHandlers.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/TextAreaInputHandler.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Editing}/TextSegmentReadOnlySectionProvider.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/BackgroundGeometryBuilder.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/CollapsedLineSection.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/ColorizingTransformer.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/DocumentColorizingTransformer.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/FormattedTextElement.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/GlobalTextRunProperties.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/HeightTree.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/HeightTreeLineNode.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/HeightTreeNode.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/IBackgroundRenderer.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/ITextRunConstructionContext.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/ITextViewConnect.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/IVisualLineTransformer.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/InlineObjectRun.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/Layer.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/LayerPosition.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/NewLineElementGenerator.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/SingleCharacterElementGenerator.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/TextLayer.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/TextView.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/TextViewPosition.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/TextViewWeakEventManager.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/VisualLine.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/VisualLineElement.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/VisualLineElementGenerator.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/VisualLineElementTextRunProperties.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/VisualLineText.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/VisualLineTextParagraphProperties.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/VisualLineTextSource.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/VisualLinesInvalidException.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => Rendering}/VisualYPosition.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => }/TextEditor.cs (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => }/TextEditor.xaml (100%)
 rename src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/{Gui => }/TextEditorWeakEventManager.cs (100%)

diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/AbstractMargin.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/AbstractMargin.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/AbstractMargin.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/AbstractMargin.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/Caret.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/Caret.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/CaretLayer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretLayer.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/CaretLayer.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretLayer.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/CaretNavigationCommandHandler.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretNavigationCommandHandler.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/CaretNavigationCommandHandler.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretNavigationCommandHandler.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/DragDropException.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/DragDropException.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/DragDropException.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/DragDropException.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/EditingCommandHandler.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/EditingCommandHandler.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/EditingCommandHandler.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/EditingCommandHandler.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/FoldingElementGenerator.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/FoldingElementGenerator.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/FoldingElementGenerator.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/FoldingElementGenerator.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/FoldingManager.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/FoldingManager.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/FoldingManager.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/FoldingManager.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/FoldingMargin.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/FoldingMargin.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/FoldingMargin.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/FoldingMargin.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/FoldingMarginMarker.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/FoldingMarginMarker.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/FoldingMarginMarker.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/FoldingMarginMarker.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/FoldingSection.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/FoldingSection.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/FoldingSection.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/FoldingSection.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/IReadOnlySectionProvider.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/IReadOnlySectionProvider.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/IReadOnlySectionProvider.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/IReadOnlySectionProvider.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/LineNumberMargin.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/LineNumberMargin.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/LineNumberMargin.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/LineNumberMargin.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/NoReadOnlySections.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/NoReadOnlySections.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/NoReadOnlySections.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/NoReadOnlySections.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/Selection.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Selection.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/Selection.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Selection.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/SelectionColorizer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/SelectionColorizer.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/SelectionColorizer.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/SelectionColorizer.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/SelectionLayer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/SelectionLayer.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/SelectionLayer.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/SelectionLayer.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/SelectionMouseHandler.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/SelectionMouseHandler.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/SelectionMouseHandler.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/SelectionMouseHandler.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextArea.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextArea.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextAreaDefaultInputHandlers.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextAreaDefaultInputHandlers.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextAreaDefaultInputHandlers.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextAreaDefaultInputHandlers.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextAreaInputHandler.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextAreaInputHandler.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextAreaInputHandler.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextAreaInputHandler.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextSegmentReadOnlySectionProvider.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextSegmentReadOnlySectionProvider.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextSegmentReadOnlySectionProvider.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextSegmentReadOnlySectionProvider.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
index e833bc8d46..af56599f5f 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
@@ -118,120 +118,49 @@
     <Compile Include="Document\WeakLineTracker.cs">
       <DependentUpon>ILineTracker.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\AbstractMargin.cs" />
-    <Compile Include="Gui\Caret.cs" />
-    <Compile Include="Gui\CaretLayer.cs">
+    <Compile Include="Editing\AbstractMargin.cs" />
+    <Compile Include="Editing\Caret.cs" />
+    <Compile Include="Editing\CaretLayer.cs">
       <DependentUpon>Caret.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\CaretNavigationCommandHandler.cs">
-      <DependentUpon>Caret.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\BackgroundGeometryBuilder.cs">
-      <DependentUpon>IBackgroundRenderer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\DocumentColorizingTransformer.cs">
-      <DependentUpon>IVisualLineTransformer.cs</DependentUpon>
+    <Compile Include="Editing\CaretNavigationCommandHandler.cs">
     </Compile>
-    <Compile Include="Gui\DragDropException.cs" />
-    <Compile Include="Gui\EditingCommandHandler.cs" />
-    <Compile Include="Gui\FoldingSection.cs">
+    <Compile Include="Editing\DragDropException.cs" />
+    <Compile Include="Editing\EditingCommandHandler.cs" />
+    <Compile Include="Editing\FoldingElementGenerator.cs">
       <DependentUpon>FoldingManager.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\IBackgroundRenderer.cs" />
-    <Compile Include="Gui\TextAreaDefaultInputHandlers.cs" />
-    <Compile Include="Gui\TextAreaInputHandler.cs" />
-    <Compile Include="Gui\IReadOnlySectionProvider.cs" />
-    <Compile Include="Gui\ITextViewConnect.cs">
-      <DependentUpon>TextView.cs</DependentUpon>
+    <Compile Include="Editing\FoldingManager.cs" />
+    <Compile Include="Editing\FoldingMargin.cs">
+      <DependentUpon>FoldingManager.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\Layer.cs">
-      <DependentUpon>TextView.cs</DependentUpon>
+    <Compile Include="Editing\FoldingMarginMarker.cs">
+      <DependentUpon>FoldingManager.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\LayerPosition.cs">
-      <DependentUpon>TextView.cs</DependentUpon>
+    <Compile Include="Editing\FoldingSection.cs">
+      <DependentUpon>FoldingManager.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\NoReadOnlySections.cs">
+    <Compile Include="Editing\IReadOnlySectionProvider.cs" />
+    <Compile Include="Editing\LineNumberMargin.cs" />
+    <Compile Include="Editing\NoReadOnlySections.cs">
       <DependentUpon>IReadOnlySectionProvider.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\Selection.cs" />
-    <Compile Include="Gui\SelectionColorizer.cs">
+    <Compile Include="Editing\Selection.cs" />
+    <Compile Include="Editing\SelectionColorizer.cs">
       <DependentUpon>Selection.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\SelectionLayer.cs">
+    <Compile Include="Editing\SelectionLayer.cs">
       <DependentUpon>Selection.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\SelectionMouseHandler.cs">
+    <Compile Include="Editing\SelectionMouseHandler.cs">
       <DependentUpon>Selection.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\TextEditorWeakEventManager.cs">
-      <DependentUpon>TextEditor.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\TextLayer.cs">
-      <DependentUpon>TextView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\TextSegmentReadOnlySectionProvider.cs">
+    <Compile Include="Editing\TextArea.cs" />
+    <Compile Include="Editing\TextAreaDefaultInputHandlers.cs" />
+    <Compile Include="Editing\TextAreaInputHandler.cs" />
+    <Compile Include="Editing\TextSegmentReadOnlySectionProvider.cs">
       <DependentUpon>IReadOnlySectionProvider.cs</DependentUpon>
     </Compile>
-    <Compile Include="Gui\TextViewPosition.cs" />
-    <Compile Include="Gui\CollapsedLineSection.cs">
-      <DependentUpon>HeightTree.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\ColorizingTransformer.cs">
-      <DependentUpon>IVisualLineTransformer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\FoldingElementGenerator.cs">
-      <DependentUpon>FoldingManager.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\FoldingMargin.cs">
-      <DependentUpon>FoldingManager.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\FoldingMarginMarker.cs">
-      <DependentUpon>FoldingManager.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\FormattedTextElement.cs" />
-    <Compile Include="Gui\GlobalTextRunProperties.cs">
-      <DependentUpon>TextView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\ITextRunConstructionContext.cs">
-      <DependentUpon>VisualLineElementGenerator.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\LineNumberMargin.cs" />
-    <Compile Include="Gui\IVisualLineTransformer.cs" />
-    <Compile Include="Gui\TextViewWeakEventManager.cs">
-      <DependentUpon>TextView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\VisualLineElement.cs" />
-    <Compile Include="Gui\VisualLineElementGenerator.cs">
-    </Compile>
-    <Compile Include="Gui\VisualLinesInvalidException.cs" />
-    <Compile Include="Gui\VisualLineText.cs" />
-    <Compile Include="Gui\VisualLineTextParagraphProperties.cs">
-      <DependentUpon>VisualLine.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\VisualLineElementTextRunProperties.cs">
-      <DependentUpon>VisualLine.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\VisualLineTextSource.cs">
-      <DependentUpon>VisualLineElementGenerator.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\FoldingManager.cs" />
-    <Compile Include="Gui\HeightTree.cs" />
-    <Compile Include="Gui\HeightTreeLineNode.cs">
-      <DependentUpon>HeightTree.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\HeightTreeNode.cs">
-      <DependentUpon>HeightTree.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\InlineObjectRun.cs" />
-    <Compile Include="Gui\NewLineElementGenerator.cs" />
-    <Compile Include="Gui\TextArea.cs" />
-    <Compile Include="Gui\TextEditor.cs" />
-    <Compile Include="Gui\TextView.cs" />
-    <Compile Include="Gui\VisualLine.cs" />
-    <Compile Include="Gui\VisualYPosition.cs">
-      <DependentUpon>VisualLine.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Gui\SingleCharacterElementGenerator.cs" />
     <Compile Include="Highlighting\DocumentHighlighter.cs" />
     <Compile Include="Highlighting\HighlightedLine.cs" />
     <Compile Include="Highlighting\HighlightedSection.cs" />
@@ -264,6 +193,72 @@
     <Compile Include="Highlighting\Xshd\XshdSyntaxDefinition.cs" />
     <Compile Include="Indentation\DefaultIndentationStrategy.cs" />
     <Compile Include="Indentation\IIndentationStrategy.cs" />
+    <Compile Include="Rendering\BackgroundGeometryBuilder.cs">
+      <DependentUpon>IBackgroundRenderer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\CollapsedLineSection.cs">
+      <DependentUpon>HeightTree.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\ColorizingTransformer.cs">
+      <DependentUpon>IVisualLineTransformer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\DocumentColorizingTransformer.cs">
+      <DependentUpon>IVisualLineTransformer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\FormattedTextElement.cs" />
+    <Compile Include="Rendering\GlobalTextRunProperties.cs">
+      <DependentUpon>TextView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\HeightTree.cs" />
+    <Compile Include="Rendering\HeightTreeLineNode.cs">
+      <DependentUpon>HeightTree.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\HeightTreeNode.cs">
+      <DependentUpon>HeightTree.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\IBackgroundRenderer.cs" />
+    <Compile Include="Rendering\InlineObjectRun.cs" />
+    <Compile Include="Rendering\ITextRunConstructionContext.cs">
+      <DependentUpon>VisualLineElementGenerator.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\ITextViewConnect.cs">
+      <DependentUpon>TextView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\IVisualLineTransformer.cs" />
+    <Compile Include="Rendering\Layer.cs">
+      <DependentUpon>TextView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\LayerPosition.cs">
+      <DependentUpon>TextView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\NewLineElementGenerator.cs" />
+    <Compile Include="Rendering\SingleCharacterElementGenerator.cs" />
+    <Compile Include="Rendering\TextLayer.cs">
+      <DependentUpon>TextView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\TextView.cs" />
+    <Compile Include="Rendering\TextViewPosition.cs" />
+    <Compile Include="Rendering\TextViewWeakEventManager.cs">
+      <DependentUpon>TextView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\VisualLine.cs" />
+    <Compile Include="Rendering\VisualLineElement.cs" />
+    <Compile Include="Rendering\VisualLineElementGenerator.cs" />
+    <Compile Include="Rendering\VisualLineElementTextRunProperties.cs">
+      <DependentUpon>VisualLine.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\VisualLinesInvalidException.cs" />
+    <Compile Include="Rendering\VisualLineText.cs" />
+    <Compile Include="Rendering\VisualLineTextParagraphProperties.cs">
+      <DependentUpon>VisualLine.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\VisualLineTextSource.cs">
+      <DependentUpon>VisualLineElementGenerator.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\VisualYPosition.cs">
+      <DependentUpon>VisualLine.cs</DependentUpon>
+    </Compile>
+    <Compile Include="TextEditor.cs" />
     <Compile Include="TextEditorComponent.cs">
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -280,6 +275,9 @@
     </Compile>
     <Compile Include="Document\TextDocument.cs" />
     <Compile Include="TextEditorOptions.cs" />
+    <Compile Include="TextEditorWeakEventManager.cs">
+      <DependentUpon>TextEditor.cs</DependentUpon>
+    </Compile>
     <Compile Include="Utils\Boxes.cs" />
     <Compile Include="Utils\CompressingTreeList.cs" />
     <Compile Include="Utils\Constants.cs" />
@@ -329,17 +327,18 @@
   <ItemGroup>
     <Folder Include="Document" />
     <Folder Include="documentation" />
-    <Folder Include="Gui" />
     <Folder Include="Highlighting" />
     <Folder Include="Highlighting\Xshd" />
     <Folder Include="Highlighting\Resources" />
     <Folder Include="CodeCompletion" />
     <Folder Include="Indentation" />
+    <Folder Include="Editing" />
+    <Folder Include="Rendering" />
     <Folder Include="Utils" />
     <Folder Include="themes" />
     <Page Include="CodeCompletion\CompletionList.xaml" />
     <Page Include="CodeCompletion\InsightWindow.xaml" />
-    <Page Include="Gui\TextEditor.xaml" />
+    <Page Include="TextEditor.xaml" />
     <Page Include="themes\generic.xaml" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/BackgroundGeometryBuilder.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/BackgroundGeometryBuilder.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/BackgroundGeometryBuilder.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/BackgroundGeometryBuilder.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/CollapsedLineSection.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/CollapsedLineSection.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/CollapsedLineSection.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/CollapsedLineSection.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/ColorizingTransformer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/ColorizingTransformer.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/ColorizingTransformer.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/ColorizingTransformer.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/DocumentColorizingTransformer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/DocumentColorizingTransformer.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/DocumentColorizingTransformer.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/DocumentColorizingTransformer.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/FormattedTextElement.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/FormattedTextElement.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/FormattedTextElement.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/FormattedTextElement.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/GlobalTextRunProperties.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/GlobalTextRunProperties.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/GlobalTextRunProperties.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/GlobalTextRunProperties.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/HeightTree.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/HeightTree.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/HeightTree.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/HeightTree.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/HeightTreeLineNode.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/HeightTreeLineNode.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/HeightTreeLineNode.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/HeightTreeLineNode.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/HeightTreeNode.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/HeightTreeNode.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/HeightTreeNode.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/HeightTreeNode.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/IBackgroundRenderer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/IBackgroundRenderer.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/IBackgroundRenderer.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/IBackgroundRenderer.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/ITextRunConstructionContext.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/ITextRunConstructionContext.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/ITextRunConstructionContext.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/ITextRunConstructionContext.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/ITextViewConnect.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/ITextViewConnect.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/ITextViewConnect.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/ITextViewConnect.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/IVisualLineTransformer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/IVisualLineTransformer.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/IVisualLineTransformer.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/IVisualLineTransformer.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/InlineObjectRun.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/InlineObjectRun.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/InlineObjectRun.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/InlineObjectRun.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/Layer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/Layer.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/Layer.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/Layer.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/LayerPosition.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/LayerPosition.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/LayerPosition.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/LayerPosition.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/NewLineElementGenerator.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/NewLineElementGenerator.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/NewLineElementGenerator.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/NewLineElementGenerator.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/SingleCharacterElementGenerator.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/SingleCharacterElementGenerator.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/SingleCharacterElementGenerator.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/SingleCharacterElementGenerator.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextLayer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextLayer.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextLayer.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextLayer.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextView.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextView.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextViewPosition.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextViewPosition.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextViewPosition.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextViewPosition.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextViewWeakEventManager.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextViewWeakEventManager.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextViewWeakEventManager.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextViewWeakEventManager.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLine.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLine.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLine.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLine.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLineElement.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineElement.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLineElement.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineElement.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLineElementGenerator.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineElementGenerator.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLineElementGenerator.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineElementGenerator.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLineElementTextRunProperties.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineElementTextRunProperties.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLineElementTextRunProperties.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineElementTextRunProperties.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLineText.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineText.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLineText.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineText.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLineTextParagraphProperties.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineTextParagraphProperties.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLineTextParagraphProperties.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineTextParagraphProperties.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLineTextSource.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineTextSource.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLineTextSource.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLineTextSource.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLinesInvalidException.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLinesInvalidException.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualLinesInvalidException.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualLinesInvalidException.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualYPosition.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualYPosition.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/VisualYPosition.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/VisualYPosition.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextEditor.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditor.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextEditor.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditor.cs
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextEditor.xaml b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditor.xaml
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextEditor.xaml
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditor.xaml
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextEditorWeakEventManager.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorWeakEventManager.cs
similarity index 100%
rename from src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Gui/TextEditorWeakEventManager.cs
rename to src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorWeakEventManager.cs
diff --git a/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs b/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs
index 6a73b8a497..b0f7403433 100644
--- a/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs
+++ b/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs
@@ -172,8 +172,8 @@ namespace ICSharpCode.SharpDevelop.Commands
 		{
 			RecentOpen recentOpen = FileService.RecentOpen;
 			
-			if (recentOpen.RecentFile.Count > 0) {
-				var items = new System.Windows.Controls.MenuItem[recentOpen.RecentFile.Count];
+			if (recentOpen.RecentProject.Count > 0) {
+				var items = new System.Windows.Controls.MenuItem[recentOpen.RecentProject.Count];
 				
 				for (int i = 0; i < recentOpen.RecentProject.Count; ++i) {
 					// variable inside loop, so that anonymous method refers to correct recent file