Fixes #2469 - Revamp file structure and namespace (#2471)

* initial commit

* All tests pass

* Updated readme

* Revert "All tests pass"

This reverts commit 94ac462350194307112d9ae0f32a7846299e3d3a.

* Revert "initial commit"

This reverts commit 36d92cc4e58792d8a2e90f974d2ca8c0463071ff.

* Moved Terminal.Gui files around

* Nuked .Graphs namespace

* Nuked .Graphs namespace

* Nuked .Trees namespace

* Nuked .Configuration namespace

* Nuked .Configuration namespace

* All tests pass

* tweaked tests

* removed unneeded usings

* re-enabled scrollview tests

* move scrollview test to ScrollViewTests

* Moved view navigation related tests to separate cs file

* Moved view scrollbarview related tests ScrollBarTestse

* Refactored View tests into smaller files

* Refactored driver tests

* Fixed a ton of BUGBUGs

README.md

@@ -48,7 +48,7 @@ _The Documentation matches the most recent Nuget release from the `main` branch
 * **[Flexible Layout](https://gui-cs.github.io/Terminal.Gui/articles/overview.html#layout)** - Supports both *Absolute layout* and an innovative *Computed Layout* system. *Computed Layout* makes it easy to layout controls relative to each other and enables dynamic terminal UIs.
 * **[Configuration & Themes](https://gui-cs.github.io/Terminal.Gui/articles/config.html)** - Terminal.Gui supports a rich configuration system that allows end-user customization of how the UI looks (e.g. colors) and behaves (e.g. key-bindings).
 * **Clipboard support** - Cut, Copy, and Paste of text provided through the [`Clipboard`](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui/Terminal.Gui.Clipboard.html) class.
-* **[Arbitrary Views](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui/Terminal.Gui.View.html)** - All visible UI elements are subclasses of the `View` class, and these in turn can contain an arbitrary number of sub-views.
+* **[Arbitrary Views](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui/Terminal.Gui.ViewTests.html)** - All visible UI elements are subclasses of the `View` class, and these in turn can contain an arbitrary number of sub-views.
 * **Advanced App Features** - The [Mainloop](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui/Terminal.Gui.MainLoop.html) supports processing events, idle handlers, timers, and monitoring file
 descriptors. Most classes are safe for threading.
 * **Reactive Extensions** - Use [reactive extensions](https://github.com/dotnet/reactive) and benefit from increased code readability, and the ability to apply the MVVM pattern and [ReactiveUI](https://www.reactiveui.net/) data bindings. See the [source code](https://github.com/gui-cs/Terminal.Gui/tree/master/ReactiveExample) of a sample app in order to learn how to achieve this.

Terminal.Gui/Core/Application.cs → Terminal.Gui/Application.cs

@@ -20,9 +20,9 @@ using System.ComponentModel;
 using System.Globalization;
 using System.Reflection;
 using System.IO;
-using Terminal.Gui.Configuration;
+using Terminal.Gui;
 using System.Text.Json.Serialization;
-using static Terminal.Gui.Configuration.ConfigurationManager;
+using static Terminal.Gui.ConfigurationManager;
 
 namespace Terminal.Gui {
 

Terminal.Gui/ClassDiagram1.cd

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ClassDiagram /> 

Terminal.Gui/Configuration/AppScope.cs

@@ -5,11 +5,11 @@ using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Text.Json.Serialization;
-using static Terminal.Gui.Configuration.ConfigurationManager;
+using static Terminal.Gui.ConfigurationManager;
 
 #nullable enable
 
-namespace Terminal.Gui.Configuration {
+namespace Terminal.Gui {
 
 	public static partial class ConfigurationManager {
 		/// <summary>

Terminal.Gui/Configuration/AttributeJsonConverter.cs

@@ -3,7 +3,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using Terminal.Gui;
 
-namespace Terminal.Gui.Configuration {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Json converter fro the <see cref="Attribute"/> class.
 	/// </summary>

Terminal.Gui/Configuration/ColorJsonConverter.cs

@@ -3,7 +3,7 @@ using System.Text.Json.Serialization;
 using System.Text.Json;
 using System.Text.RegularExpressions;
 
-namespace Terminal.Gui.Configuration {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Json converter for the <see cref="Color"/> class.
 	/// </summary>

Terminal.Gui/Configuration/ColorSchemeJsonConverter.cs

@@ -2,7 +2,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Terminal.Gui.Configuration {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Implements a JSON converter for <see cref="ColorScheme"/>. 
 	/// </summary>

Terminal.Gui/Configuration/ConfigurationManager.cs

@@ -9,11 +9,11 @@ using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
-using static Terminal.Gui.Configuration.ConfigurationManager;
+using static Terminal.Gui.ConfigurationManager;
 
 #nullable enable
 
-namespace Terminal.Gui.Configuration {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Provides settings and configuration management for Terminal.Gui applications. 
 	/// <para>

Terminal.Gui/Configuration/ConfigurationManagerEventArgs.cs

@@ -2,7 +2,7 @@
 
 #nullable enable
 
-namespace Terminal.Gui.Configuration {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Event arguments for the <see cref="ConfigurationManager"/> events.
 	/// </summary>

Terminal.Gui/Configuration/DictionaryJsonConverter.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Text.Json;
 
-namespace Terminal.Gui.Configuration {
+namespace Terminal.Gui {
 
 	class DictionaryJsonConverter<T> : JsonConverter<Dictionary<string, T>> {
 		public override Dictionary<string, T> Read (ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)

Terminal.Gui/Configuration/KeyJsonConverter.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Terminal.Gui.Configuration {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Json converter for the <see cref="Key"/> class.
 	/// </summary>

Terminal.Gui/Configuration/Scope.cs

@@ -5,12 +5,12 @@ using System.Linq;
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using static Terminal.Gui.Configuration.ConfigurationManager;
+using static Terminal.Gui.ConfigurationManager;
 
 
 #nullable enable
 
-namespace Terminal.Gui.Configuration {
+namespace Terminal.Gui {
 	public static partial class ConfigurationManager {
 
 		/// <summary>

Terminal.Gui/Configuration/SettingsScope.cs

@@ -9,7 +9,7 @@ using System.Text.Json.Serialization;
 
 #nullable enable
 
-namespace Terminal.Gui.Configuration {
+namespace Terminal.Gui {
 	public static partial class ConfigurationManager {
 		/// <summary>
 		/// The root object of Terminal.Gui configuration settings / JSON schema. Contains only properties 

Terminal.Gui/Configuration/ThemeScope.cs

@@ -5,11 +5,11 @@ using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Text.Json.Serialization;
-using static Terminal.Gui.Configuration.ConfigurationManager;
+using static Terminal.Gui.ConfigurationManager;
 
 #nullable enable
 
-namespace Terminal.Gui.Configuration {
+namespace Terminal.Gui {
 
 	public static partial class ConfigurationManager {
 		/// <summary>

Terminal.Gui/Core/ConsoleDriver.cs → Terminal.Gui/ConsoleDrivers/ConsoleDriver.cs

@@ -10,8 +10,8 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
-using Terminal.Gui.Configuration;
-using static Terminal.Gui.Configuration.ConfigurationManager;
+using Terminal.Gui;
+using static Terminal.Gui.ConfigurationManager;
 
 namespace Terminal.Gui {
 	/// <summary>
@@ -187,13 +187,13 @@ namespace Terminal.Gui {
 		/// <summary>
 		/// The foreground color.
 		/// </summary>
-		[JsonConverter (typeof (Configuration.ColorJsonConverter))]
+		[JsonConverter (typeof (ColorJsonConverter))]
 		public Color Foreground { get; }
 
 		/// <summary>
 		/// The background color.
 		/// </summary>
-		[JsonConverter (typeof (Configuration.ColorJsonConverter))]
+		[JsonConverter (typeof (ColorJsonConverter))]
 		public Color Background { get; }
 
 		/// <summary>

Terminal.Gui/Core/Graphs/LineCanvas.cs → Terminal.Gui/Drawing/LineCanvas.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Terminal.Gui.Graphs {
+namespace Terminal.Gui {
 
 
 	/// <summary>

Terminal.Gui/Drawing/Ruler.cs

@@ -4,8 +4,6 @@ using System.Collections.Generic;
 using System.Data;
 using System.Text;
 using System.Text.Json.Serialization;
-using Terminal.Gui.Configuration;
-using Terminal.Gui.Graphs;
 
 namespace Terminal.Gui {
 	/// <summary>

Terminal.Gui/Core/Thickness.cs → Terminal.Gui/Drawing/Thickness.cs

@@ -3,8 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Text.Json.Serialization;
-using Terminal.Gui.Configuration;
-using Terminal.Gui.Graphs;
+using Terminal.Gui;
 
 namespace Terminal.Gui {
 	/// <summary>

Terminal.Gui/README.md

@@ -4,21 +4,42 @@ All files required to build the **Terminal.Gui** library (and NuGet package).
 
 ## Project Folder Structure
 
-- `Terminal.Gui.sln` - The Visual Studio solution
-- `Core/` - Source files for all types that comprise the core building blocks of **Terminal-Gui** 
-    - `Application` - A `static` class that provides the base 'application driver'. Given it defines a **Terminal.Gui** application it is both logically and literally (because `static`) a singleton. It has direct dependencies on `MainLoop`, `Events.cs` `NetDriver`, `CursesDriver`, `WindowsDriver`, `Responder`, `View`, and `TopLevel` (and nothing else).
-    - `MainLoop` - Defines `IMainLoopDriver` and implements the `MainLoop` class.
-    - `ConsoleDriver` - Definition for the Console Driver API.
-    - `Events.cs` - Defines keyboard and mouse-related structs & classes. 
-    - `PosDim.cs` - Implements *Computed Layout* system. These classes have deep dependencies on `View`.
-    - `Responder` - Base class for the windowing class hierarchy. Implements support for keyboard & mouse input.
-    - `View` - Derived from `Responder`, the base class for non-modal visual elements such as controls.
-    - `Toplevel` - Derived from `View`, the base class for modal visual elements such as top-level windows and dialogs. Supports the concept of `MenuBar` and `StatusBar`.
-    - `Window` - Derived from `TopLevel`; implements toplevel views with a visible frame and Title.
+- `\` - The root folder contains the source code for the library.
+	- `Terminal.Gui.sln` - The Visual Studio solution
+	- `Application.cs` - A `static` class that provides the base 'application driver'. Given it defines a **Terminal.Gui** application it is both logically and literally (because `static`) a singleton. It has direct dependencies on `MainLoop`, `Events.cs` `NetDriver`, `CursesDriver`, `WindowsDriver`, `Responder`, `View`, and `TopLevel` (and nothing else).
+	- `MainLoop.cs` - Defines `IMainLoopDriver` and implements the `MainLoop` class.
+	- A few supporting class files
+
+- `ConsoleDrivers\`
+	- `ConsoleDriver.cs` - Definition for the Console Driver API.
+	- Source files for the three `ConsoleDriver`-based drivers: .NET: `NetDriver`, Unix & Mac: `UnixDriver`, and Windows: `WindowsDriver`.
+
+- `Configuration\` - Classes related the `ConfigurationManager`.
+
+- `Clipboard\` - Classes related to clipboard access.
+
+- `Input\` - Classes relating to keyboard and mouse input. Includes `Responder`, which is the base class for `View`
+	- `Events.cs` - Defines keyboard and mouse-related structs & classes. 
+	- `Responder` - Base class for the windowing class hierarchy. Implements support for keyboard & mouse input.
+	- etc...
+
+- `Text\` - Classes related to text processing
+
+- `Drawing\` - Classes related to drawing 
+
+- `View\` - The `View` class heirarchy, not including any sub-classes
+	- `View.cs` - Derived from `Responder`, the base class for non-modal visual elements such as controls.
+	- `Layout\`	
+		- `PosDim.cs` - Implements *Computed Layout* system. These classes have deep dependencies on `View`.
+
+- `Views\` - Sub-classes of `View` 
+	- `Toplevel` - Derived from `View`, the base class for modal visual elements such as top-level windows and dialogs. Supports the concept of `MenuBar` and `StatusBar`.
+	- `Window` - Derived from `TopLevel`; implements toplevel views with a visible frame and Title.
+	- `Dialog` -
+	- etc...
+
 - `Types/` - A folder (not namespace) containing implementations of `Point`, `Rect`, and `Size` which are ancient versions of the modern `System.Drawing.Point`, `System.Drawing.Size`, and `System.Drawning.Rectangle`.
-- `ConsoleDrivers/` - Source files for the three `ConsoleDriver`-based drivers: .NET: `NetDriver`, Unix & Mac: `UnixDriver`, and Windows: `WindowsDriver`.
-- `Views/` - A folder (not namespace) containing the source for all built-in classes that drive from `View` (non-modals). 
-- `Windows/` - A folder (not namespace) containing the source of all built-in classes that derive from `Window`.
+
 
 ## Version numbers
 

Terminal.Gui/Core/Border.cs → Terminal.Gui/View/Border.cs

@@ -1,6 +1,5 @@
 using NStack;
 using System;
-using Terminal.Gui.Graphs;
 using System.Text.Json.Serialization;
 using System.Data;
 using System.Text;
@@ -63,7 +62,7 @@ namespace Terminal.Gui {
 		/// <summary>
 		/// Gets or sets the <see cref="Color"/> that draws the outer border color.
 		/// </summary>
-		[JsonInclude, JsonConverter (typeof (Configuration.ColorJsonConverter))]
+		[JsonInclude, JsonConverter (typeof (ColorJsonConverter))]
 		public Color ForgroundColor {
 			get => _forgroundColor;
 			set {
@@ -75,7 +74,7 @@ namespace Terminal.Gui {
 		/// <summary>
 		/// Gets or sets the <see cref="Color"/> that fills the area between the bounds of a <see cref="Border"/>.
 		/// </summary>
-		[JsonInclude, JsonConverter (typeof (Configuration.ColorJsonConverter))]
+		[JsonInclude, JsonConverter (typeof (ColorJsonConverter))]
 		public Color BackgroundColor {
 			get => _backgroundColor;
 			set {

Terminal.Gui/Core/Frame.cs → Terminal.Gui/View/Frame.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Xml.Linq;
-using Terminal.Gui.Graphs;
 
 namespace Terminal.Gui {
 

Terminal.Gui/Windows/Dialog.cs → Terminal.Gui/Views/Dialog.cs

@@ -9,8 +9,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;
 using NStack;
-using Terminal.Gui.Configuration;
-using static Terminal.Gui.Configuration.ConfigurationManager;
+using Terminal.Gui;
+using static Terminal.Gui.ConfigurationManager;
 
 namespace Terminal.Gui {
 	/// <summary>

Terminal.Gui/Views/FrameView.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Text.Json.Serialization;
 using NStack;
-using static Terminal.Gui.Configuration.ConfigurationManager;
+using static Terminal.Gui.ConfigurationManager;
 
 namespace Terminal.Gui {
 	/// <summary>

Terminal.Gui/Core/Graphs/Annotations.cs → Terminal.Gui/Views/GraphView/Annotations.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Terminal.Gui.Graphs {
+namespace Terminal.Gui {
 	/// <summary>
 	/// <para>Describes an overlay element that is rendered either before or
 	/// after a series.</para>

Terminal.Gui/Core/Graphs/Axis.cs → Terminal.Gui/Views/GraphView/Axis.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Terminal.Gui.Graphs {
+namespace Terminal.Gui {
 
 	/// <summary>
 	/// Renders a continuous line with grid line ticks and labels

Terminal.Gui/Core/Graphs/GraphCellToRender.cs → Terminal.Gui/Views/GraphView/GraphCellToRender.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Terminal.Gui.Graphs {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Describes how to render a single row/column of a <see cref="GraphView"/> based
 	/// on the value(s) in <see cref="ISeries"/> at that location

Terminal.Gui/Views/GraphView.cs → Terminal.Gui/Views/GraphView/GraphView.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Terminal.Gui.Graphs;
 
 namespace Terminal.Gui {
 

Terminal.Gui/Core/Graphs/Orientation.cs → Terminal.Gui/Views/GraphView/Orientation.cs

@@ -1,4 +1,4 @@
-namespace Terminal.Gui.Graphs {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Direction of an element (horizontal or vertical)
 	/// </summary>

Terminal.Gui/Core/Graphs/Series.cs → Terminal.Gui/Views/GraphView/Series.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 
-namespace Terminal.Gui.Graphs {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Describes a series of data that can be rendered into a <see cref="GraphView"/>>
 	/// </summary>

Terminal.Gui/Views/LineView.cs

@@ -1,5 +1,4 @@
 using System;
-using Terminal.Gui.Graphs;
 
 namespace Terminal.Gui {
 	

Terminal.Gui/Windows/MessageBox.cs → Terminal.Gui/Views/MessageBox.cs

@@ -1,8 +1,8 @@
 using NStack;
 using System;
 using System.Collections.Generic;
-using Terminal.Gui.Configuration;
-using static Terminal.Gui.Configuration.ConfigurationManager;
+using Terminal.Gui;
+using static Terminal.Gui.ConfigurationManager;
 
 namespace Terminal.Gui {
 	/// <summary>

Terminal.Gui/Views/TextView.cs

@@ -9,7 +9,6 @@ using System.Text;
 using System.Threading;
 using NStack;
 using Terminal.Gui.Resources;
-using static Terminal.Gui.Graphs.PathAnnotation;
 using Rune = System.Rune;
 
 namespace Terminal.Gui {

Terminal.Gui/Views/TileView.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Terminal.Gui.Graphs;
 
 namespace Terminal.Gui {
 

Terminal.Gui/Core/Trees/AspectGetterDelegate.cs → Terminal.Gui/Views/TreeView/AspectGetterDelegate.cs

@@ -1,5 +1,5 @@
 
-namespace Terminal.Gui.Trees {
+namespace Terminal.Gui {
 
 	/// <summary>
 	/// Delegates of this type are used to fetch string representations of user's model objects

Terminal.Gui/Core/Trees/Branch.cs → Terminal.Gui/Views/TreeView/Branch.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Terminal.Gui.Trees {
+namespace Terminal.Gui {
 	class Branch<T> where T : class {
 		/// <summary>
 		/// True if the branch is expanded to reveal child branches.

Terminal.Gui/Core/Trees/DelegateTreeBuilder.cs → Terminal.Gui/Views/TreeView/DelegateTreeBuilder.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Terminal.Gui.Trees {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Implementation of <see cref="ITreeBuilder{T}"/> that uses user defined functions
 	/// </summary>

Terminal.Gui/Core/Trees/ITreeBuilder.cs → Terminal.Gui/Views/TreeView/ITreeBuilder.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Terminal.Gui.Trees {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Interface for supplying data to a <see cref="TreeView{T}"/> on demand as root level nodes
 	/// are expanded by the user

Terminal.Gui/Core/Trees/ObjectActivatedEventArgs.cs → Terminal.Gui/Views/TreeView/ObjectActivatedEventArgs.cs

@@ -1,4 +1,4 @@
-namespace Terminal.Gui.Trees {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Event args for the <see cref="TreeView{T}.ObjectActivated"/> event
 	/// </summary>

Terminal.Gui/Core/Trees/SelectionChangedEventArgs.cs → Terminal.Gui/Views/TreeView/SelectionChangedEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Terminal.Gui.Trees {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Event arguments describing a change in selected object in a tree view
 	/// </summary>

Terminal.Gui/Core/Trees/TreeBuilder.cs → Terminal.Gui/Views/TreeView/TreeBuilder.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Terminal.Gui.Trees {
+namespace Terminal.Gui {
 
 	/// <summary>
 	/// Abstract implementation of <see cref="ITreeBuilder{T}"/>.

Terminal.Gui/Core/Trees/TreeNode.cs → Terminal.Gui/Views/TreeView/TreeNode.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Terminal.Gui.Trees {
+namespace Terminal.Gui {
 		
 	/// <summary>
 	/// Interface to implement when you want the regular (non generic) <see cref="TreeView"/>

Terminal.Gui/Core/Trees/TreeNodeBuilder.cs → Terminal.Gui/Views/TreeView/TreeNodeBuilder.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Terminal.Gui.Trees {
+namespace Terminal.Gui {
 	/// <summary>
 	/// <see cref="ITreeBuilder{T}"/> implementation for <see cref="ITreeNode"/> objects
 	/// </summary>

Terminal.Gui/Core/Trees/TreeStyle.cs → Terminal.Gui/Views/TreeView/TreeStyle.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Terminal.Gui.Trees {
+namespace Terminal.Gui {
 	/// <summary>
 	/// Defines rendering options that affect how the tree is displayed.
 	/// </summary>

Terminal.Gui/Views/TreeView.cs → Terminal.Gui/Views/TreeView/TreeView.cs

@@ -7,7 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using Terminal.Gui.Trees;
+using Terminal.Gui;
 
 namespace Terminal.Gui {
 

Terminal.Gui/Core/Window.cs → Terminal.Gui/Views/Window.cs

@@ -2,8 +2,8 @@
 using System.Collections;
 using System.Text.Json.Serialization;
 using NStack;
-using Terminal.Gui.Configuration;
-using static Terminal.Gui.Configuration.ConfigurationManager;
+using Terminal.Gui;
+using static Terminal.Gui.ConfigurationManager;
 
 namespace Terminal.Gui {
 

UICatalog/Scenario.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Terminal.Gui;
-using Terminal.Gui.Configuration;
 
 namespace UICatalog {
 	/// <summary>

UICatalog/Scenarios/AllViewsTester.cs

@@ -7,7 +7,6 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using Terminal.Gui;
-using Terminal.Gui.Configuration;
 
 namespace UICatalog.Scenarios {
 	[ScenarioMetadata (Name: "All Views Tester", Description: "Provides a test UI for all classes derived from View.")]

UICatalog/Scenarios/ClassExplorer.cs

@@ -5,7 +5,6 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Terminal.Gui;
-using Terminal.Gui.Trees;
 
 namespace UICatalog.Scenarios {
 

UICatalog/Scenarios/CollectionNavigatorTester.cs

@@ -1,8 +1,6 @@
 using System;
-using System.IO;
 using System.Linq;
 using Terminal.Gui;
-using Terminal.Gui.Trees;
 
 namespace UICatalog.Scenarios {
 
@@ -107,7 +105,7 @@ namespace UICatalog.Scenarios {
 			_items.Sort (StringComparer.OrdinalIgnoreCase);
 
 			CreateListView ();
-			var vsep = new LineView (Terminal.Gui.Graphs.Orientation.Vertical) {
+			var vsep = new LineView (Orientation.Vertical) {
 				X = Pos.Right (_listView),
 				Y = 1,
 				Height = Dim.Fill ()

UICatalog/Scenarios/ComputedLayout.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using Terminal.Gui;
-using Terminal.Gui.Configuration;
 
 namespace UICatalog.Scenarios {
 	/// <summary>