diff --git a/build.cake b/build.cake
index 9223259..f458e14 100644
--- a/build.cake
+++ b/build.cake
@@ -19,7 +19,13 @@ Task("Test")
     .IsDependentOn("Build")
     .Does(context => 
 {
-    DotNetCoreTest("./src/Spectre.Console.Tests/Spectre.Console.Tests.csproj", new DotNetCoreTestSettings {
+    DotNetCoreTest("./test/Spectre.Console.Tests/Spectre.Console.Tests.csproj", new DotNetCoreTestSettings {
+        Configuration = configuration,
+        NoRestore = true,
+        NoBuild = true,
+    });
+
+    DotNetCoreTest("./test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj", new DotNetCoreTestSettings {
         Configuration = configuration,
         NoRestore = true,
         NoBuild = true,
diff --git a/global.json b/global.json
index 7953fa6..341e047 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
-  "projects": [ "src" ],
+  "projects": [ "src", "tests" ],
   "sdk": {
     "version": "5.0.202",
     "rollForward": "latestPatch"
diff --git a/src/Spectre.Console.Analyzer.Sandbox/Program.cs b/src/Spectre.Console.Analyzer.Sandbox/Program.cs
index 621140c..2d0cd25 100644
--- a/src/Spectre.Console.Analyzer.Sandbox/Program.cs
+++ b/src/Spectre.Console.Analyzer.Sandbox/Program.cs
@@ -6,7 +6,7 @@ namespace Spectre.Console.Analyzer.Sandbox
     public static class Program
     {
         /// <summary>
-        /// Main.
+        /// The program's entry point.
         /// </summary>
         public static void Main()
         {
diff --git a/src/Spectre.Console.Analyzer/Spectre.Console.Analyzer.csproj b/src/Spectre.Console.Analyzer/Spectre.Console.Analyzer.csproj
index aa845f1..e97d094 100644
--- a/src/Spectre.Console.Analyzer/Spectre.Console.Analyzer.csproj
+++ b/src/Spectre.Console.Analyzer/Spectre.Console.Analyzer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <Description>Best practice analyzers for Spectre.Console.</Description>
@@ -8,6 +8,7 @@
         <Nullable>enable</Nullable>
         <NoPackageAnalysis>true</NoPackageAnalysis>
     </PropertyGroup>
+  
     <ItemGroup>
         <AdditionalFiles Include="..\stylecop.json" Link="Properties/stylecop.json" />
         <None Include="../../resources/gfx/small-logo.png" Pack="true" PackagePath="\" Link="Properties/small-logo.png" />
@@ -18,6 +19,10 @@
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.6.1" PrivateAssets="all" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.6.1" PrivateAssets="all" />
     </ItemGroup>
+    
+    <ItemGroup>
+      <None Remove="bin\Debug\netstandard2.0\\Spectre.Console.Analyzer.dll" />
+    </ItemGroup>
 
     <ItemGroup>
         <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
diff --git a/src/Spectre.Console.sln b/src/Spectre.Console.sln
index 0f4b924..ab904a3 100644
--- a/src/Spectre.Console.sln
+++ b/src/Spectre.Console.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30225.117
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console", "Spectre.Console\Spectre.Console.csproj", "{80DCBEF3-99D6-46C0-9C5B-42B4534D9113}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Tests", "Spectre.Console.Tests\Spectre.Console.Tests.csproj", "{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{20595AD4-8D75-4AF8-B6BC-9C38C160423F}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -90,9 +88,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "..\examples\Share
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Live", "..\examples\Console\Live\Live.csproj", "{E607AA2A-A4A6-48E4-8AAB-B0EB74EACAA1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spectre.Console.Analyzer", "Spectre.Console.Analyzer\Spectre.Console.Analyzer.csproj", "{26006ACD-F19D-4C2A-8864-FE0D6C15B58C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Analyzer", "Spectre.Console.Analyzer\Spectre.Console.Analyzer.csproj", "{26006ACD-F19D-4C2A-8864-FE0D6C15B58C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spectre.Console.Analyzer.Sandbox", "Spectre.Console.Analyzer.Sandbox\Spectre.Console.Analyzer.Sandbox.csproj", "{241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Analyzer.Sandbox", "Spectre.Console.Analyzer.Sandbox\Spectre.Console.Analyzer.Sandbox.csproj", "{241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analyzer", "Analyzer", "{EEB25BA6-F77C-41A8-9464-64BB621D1019}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Tests", "..\test\Spectre.Console.Tests\Spectre.Console.Tests.csproj", "{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spectre.Console.Analyzer.Tests", "..\test\Spectre.Console.Analyzer.Tests\Spectre.Console.Analyzer.Tests.csproj", "{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -116,18 +120,6 @@ Global
 		{80DCBEF3-99D6-46C0-9C5B-42B4534D9113}.Release|x64.Build.0 = Release|Any CPU
 		{80DCBEF3-99D6-46C0-9C5B-42B4534D9113}.Release|x86.ActiveCfg = Release|Any CPU
 		{80DCBEF3-99D6-46C0-9C5B-42B4534D9113}.Release|x86.Build.0 = Release|Any CPU
-		{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}.Debug|x64.Build.0 = Debug|Any CPU
-		{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}.Debug|x86.Build.0 = Debug|Any CPU
-		{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}.Release|x64.ActiveCfg = Release|Any CPU
-		{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}.Release|x64.Build.0 = Release|Any CPU
-		{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}.Release|x86.ActiveCfg = Release|Any CPU
-		{9F1AC4C1-766E-4421-8A78-B28F5BCDD94F}.Release|x86.Build.0 = Release|Any CPU
 		{94ECCBA8-7EBF-4B53-8379-52EB2327417E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{94ECCBA8-7EBF-4B53-8379-52EB2327417E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{94ECCBA8-7EBF-4B53-8379-52EB2327417E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -500,6 +492,30 @@ Global
 		{241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Release|x64.Build.0 = Release|Any CPU
 		{241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Release|x86.ActiveCfg = Release|Any CPU
 		{241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11}.Release|x86.Build.0 = Release|Any CPU
+		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Debug|x64.Build.0 = Debug|Any CPU
+		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Debug|x86.Build.0 = Debug|Any CPU
+		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Release|x64.ActiveCfg = Release|Any CPU
+		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Release|x64.Build.0 = Release|Any CPU
+		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Release|x86.ActiveCfg = Release|Any CPU
+		{60A4CADD-2B3D-48ED-89C0-1637A1F111AE}.Release|x86.Build.0 = Release|Any CPU
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Debug|x64.Build.0 = Debug|Any CPU
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Debug|x86.Build.0 = Debug|Any CPU
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Release|x64.ActiveCfg = Release|Any CPU
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Release|x64.Build.0 = Release|Any CPU
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Release|x86.ActiveCfg = Release|Any CPU
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -536,6 +552,9 @@ Global
 		{A0C772BA-C5F4-451D-AA7A-4045F2FA0201} = {F0575243-121F-4DEE-9F6B-246E26DC0844}
 		{8428A7DD-29FC-4417-9CA0-B90D34B26AB2} = {A0C772BA-C5F4-451D-AA7A-4045F2FA0201}
 		{E607AA2A-A4A6-48E4-8AAB-B0EB74EACAA1} = {F0575243-121F-4DEE-9F6B-246E26DC0844}
+		{26006ACD-F19D-4C2A-8864-FE0D6C15B58C} = {EEB25BA6-F77C-41A8-9464-64BB621D1019}
+		{241D2B07-FFE8-476E-A9C3-0A0E8E8A0E11} = {EEB25BA6-F77C-41A8-9464-64BB621D1019}
+		{F78E47DF-8235-4EAC-9A01-C513AB7C7D13} = {EEB25BA6-F77C-41A8-9464-64BB621D1019}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5729B071-67A0-48FB-8B1B-275E6822086C}
diff --git a/src/Spectre.Console/Internal/Backends/Ansi/AnsiConsoleBackend.cs b/src/Spectre.Console/Internal/Backends/Ansi/AnsiConsoleBackend.cs
index 071db9a..6de40f3 100644
--- a/src/Spectre.Console/Internal/Backends/Ansi/AnsiConsoleBackend.cs
+++ b/src/Spectre.Console/Internal/Backends/Ansi/AnsiConsoleBackend.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using Spectre.Console.Rendering;
 using static Spectre.Console.AnsiSequences;
 
diff --git a/src/Spectre.Console/Widgets/Paragraph.cs b/src/Spectre.Console/Widgets/Paragraph.cs
index 78f4bb1..5b29f0c 100644
--- a/src/Spectre.Console/Widgets/Paragraph.cs
+++ b/src/Spectre.Console/Widgets/Paragraph.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using Spectre.Console.Rendering;
 
 namespace Spectre.Console
diff --git a/src/Spectre.Console.Tests/.editorconfig b/test/.editorconfig
similarity index 100%
rename from src/Spectre.Console.Tests/.editorconfig
rename to test/.editorconfig
diff --git a/src/Spectre.Console.Tests/CodeAnalyzer/CodeFixProviderDiscovery.cs b/test/Spectre.Console.Analyzer.Tests/CodeFixProviderDiscovery.cs
similarity index 97%
rename from src/Spectre.Console.Tests/CodeAnalyzer/CodeFixProviderDiscovery.cs
rename to test/Spectre.Console.Analyzer.Tests/CodeFixProviderDiscovery.cs
index d115699..1ac69f5 100644
--- a/src/Spectre.Console.Tests/CodeAnalyzer/CodeFixProviderDiscovery.cs
+++ b/test/Spectre.Console.Analyzer.Tests/CodeFixProviderDiscovery.cs
@@ -8,7 +8,7 @@ using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.VisualStudio.Composition;
 using Spectre.Console.Analyzer.FixProviders;
 
-namespace Spectre.Console.Tests.CodeAnalyzers
+namespace Spectre.Console.Analyzer.Tests
 {
     internal static class CodeFixProviderDiscovery
     {
diff --git a/test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj b/test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj
new file mode 100644
index 0000000..987bebd
--- /dev/null
+++ b/test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.0.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Spectre.Console.Analyzer\Spectre.Console.Analyzer.csproj" />
+    <ProjectReference Include="..\..\src\Spectre.Console\Spectre.Console.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Spectre.Console.Tests/CodeAnalyzer/SpectreAnalyzerVerifier.cs b/test/Spectre.Console.Analyzer.Tests/SpectreAnalyzerVerifier.cs
similarity index 94%
rename from src/Spectre.Console.Tests/CodeAnalyzer/SpectreAnalyzerVerifier.cs
rename to test/Spectre.Console.Analyzer.Tests/SpectreAnalyzerVerifier.cs
index cbf696c..fb8132b 100644
--- a/src/Spectre.Console.Tests/CodeAnalyzer/SpectreAnalyzerVerifier.cs
+++ b/test/Spectre.Console.Analyzer.Tests/SpectreAnalyzerVerifier.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
@@ -9,7 +9,7 @@ using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.CodeAnalysis.Testing.Verifiers;
 
-namespace Spectre.Console.Tests.CodeAnalyzers
+namespace Spectre.Console.Analyzer.Tests
 {
     public static class SpectreAnalyzerVerifier<TAnalyzer>
         where TAnalyzer : DiagnosticAnalyzer, new()
@@ -79,7 +79,8 @@ namespace Spectre.Console.Tests.CodeAnalyzers
 
         static CodeAnalyzerHelper()
         {
-            CurrentSpectre = ReferenceAssemblies.Net.Net50.AddAssemblies(ImmutableArray.Create(typeof(AnsiConsole).Assembly.Location.Replace(".dll", string.Empty)));
+            CurrentSpectre = ReferenceAssemblies.Net.Net50.AddAssemblies(
+                ImmutableArray.Create(typeof(AnsiConsole).Assembly.Location.Replace(".dll", string.Empty)));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Spectre.Console.Tests/CodeAnalyzer/Analyzers/NoConcurrentLiveRenderablesTests.cs b/test/Spectre.Console.Analyzer.Tests/Unit/Analyzers/NoConcurrentLiveRenderablesTests.cs
similarity index 83%
rename from src/Spectre.Console.Tests/CodeAnalyzer/Analyzers/NoConcurrentLiveRenderablesTests.cs
rename to test/Spectre.Console.Analyzer.Tests/Unit/Analyzers/NoConcurrentLiveRenderablesTests.cs
index 494a2f5..6c2a692 100644
--- a/src/Spectre.Console.Tests/CodeAnalyzer/Analyzers/NoConcurrentLiveRenderablesTests.cs
+++ b/test/Spectre.Console.Analyzer.Tests/Unit/Analyzers/NoConcurrentLiveRenderablesTests.cs
@@ -1,12 +1,8 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Testing;
-using Spectre.Console.Analyzer;
 using Xunit;
-using AnalyzerVerify =
-    Spectre.Console.Tests.CodeAnalyzers.SpectreAnalyzerVerifier<
-        Spectre.Console.Analyzer.NoConcurrentLiveRenderablesAnalyzer>;
 
-namespace Spectre.Console.Tests.CodeAnalyzers.Analyzers
+namespace Spectre.Console.Analyzer.Tests.Unit.Analyzers
 {
     public class NoCurrentLiveRenderablesTests
     {
@@ -31,7 +27,7 @@ class TestClass
     }
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<NoConcurrentLiveRenderablesAnalyzer>
                 .VerifyAnalyzerAsync(Source, _expectedDiagnostics.WithLocation(10, 13))
                 .ConfigureAwait(false);
         }
@@ -55,7 +51,7 @@ class Child
     }
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<NoConcurrentLiveRenderablesAnalyzer>
                 .VerifyAnalyzerAsync(Source, _expectedDiagnostics.WithLocation(12, 13))
                 .ConfigureAwait(false);
         }
@@ -76,7 +72,7 @@ class Program
     static void Start() =>  AnsiConsole.WriteLine(""Starting..."");
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<NoConcurrentLiveRenderablesAnalyzer>
                 .VerifyAnalyzerAsync(Source)
                 .ConfigureAwait(false);
         }
diff --git a/src/Spectre.Console.Tests/CodeAnalyzer/Analyzers/NoPromptsDuringLiveRenderablesTests.cs b/test/Spectre.Console.Analyzer.Tests/Unit/Analyzers/NoPromptsDuringLiveRenderablesTests.cs
similarity index 85%
rename from src/Spectre.Console.Tests/CodeAnalyzer/Analyzers/NoPromptsDuringLiveRenderablesTests.cs
rename to test/Spectre.Console.Analyzer.Tests/Unit/Analyzers/NoPromptsDuringLiveRenderablesTests.cs
index 7e040ea..835aae3 100644
--- a/src/Spectre.Console.Tests/CodeAnalyzer/Analyzers/NoPromptsDuringLiveRenderablesTests.cs
+++ b/test/Spectre.Console.Analyzer.Tests/Unit/Analyzers/NoPromptsDuringLiveRenderablesTests.cs
@@ -1,13 +1,9 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Testing;
-using Spectre.Console.Analyzer;
 using Xunit;
-using AnalyzerVerify =
-    Spectre.Console.Tests.CodeAnalyzers.SpectreAnalyzerVerifier<
-        Spectre.Console.Analyzer.NoPromptsDuringLiveRenderablesAnalyzer>;
 
-namespace Spectre.Console.Tests.CodeAnalyzers.Analyzers
+namespace Spectre.Console.Analyzer.Tests.Unit.Analyzers
 {
     public class NoPromptsDuringLiveRenderablesTests
     {
@@ -29,7 +25,7 @@ class TestClass
     }
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<NoPromptsDuringLiveRenderablesAnalyzer>
                 .VerifyAnalyzerAsync(Source)
                 .ConfigureAwait(false);
         }
@@ -53,7 +49,7 @@ class TestClass
     }
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<NoPromptsDuringLiveRenderablesAnalyzer>
                 .VerifyAnalyzerAsync(Source, _expectedDiagnostics.WithLocation(12, 26))
                 .ConfigureAwait(false);
         }
@@ -75,7 +71,7 @@ class TestClass
     }
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<NoPromptsDuringLiveRenderablesAnalyzer>
                 .VerifyAnalyzerAsync(Source, _expectedDiagnostics.WithLocation(10, 13))
                 .ConfigureAwait(false);
         }
@@ -100,7 +96,7 @@ class Program
     static string Confirm() => string.Empty;
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<NoPromptsDuringLiveRenderablesAnalyzer>
                 .VerifyAnalyzerAsync(Source)
                 .ConfigureAwait(false);
         }
diff --git a/src/Spectre.Console.Tests/CodeAnalyzer/Analyzers/UseInstanceAnsiConsoleTests.cs b/test/Spectre.Console.Analyzer.Tests/Unit/Analyzers/UseInstanceAnsiConsoleTests.cs
similarity index 82%
rename from src/Spectre.Console.Tests/CodeAnalyzer/Analyzers/UseInstanceAnsiConsoleTests.cs
rename to test/Spectre.Console.Analyzer.Tests/Unit/Analyzers/UseInstanceAnsiConsoleTests.cs
index a54600f..fd714c8 100644
--- a/src/Spectre.Console.Tests/CodeAnalyzer/Analyzers/UseInstanceAnsiConsoleTests.cs
+++ b/test/Spectre.Console.Analyzer.Tests/Unit/Analyzers/UseInstanceAnsiConsoleTests.cs
@@ -1,12 +1,8 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Testing;
-using Spectre.Console.Analyzer;
 using Xunit;
-using AnalyzerVerify =
-    Spectre.Console.Tests.CodeAnalyzers.SpectreAnalyzerVerifier<
-        Spectre.Console.Analyzer.FavorInstanceAnsiConsoleOverStaticAnalyzer>;
 
-namespace Spectre.Console.Tests.CodeAnalyzers.Analyzers
+namespace Spectre.Console.Analyzer.Tests.Unit.Analyzers
 {
     public class FavorInstanceAnsiConsoleOverStaticAnalyzerTests
     {
@@ -30,7 +26,7 @@ class TestClass
     } 
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<FavorInstanceAnsiConsoleOverStaticAnalyzer>
                 .VerifyAnalyzerAsync(Source)
                 .ConfigureAwait(false);
         }
@@ -49,7 +45,7 @@ class TestClass
     } 
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<FavorInstanceAnsiConsoleOverStaticAnalyzer>
                 .VerifyAnalyzerAsync(Source)
                 .ConfigureAwait(false);
         }
@@ -71,7 +67,7 @@ class TestClass
     } 
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<FavorInstanceAnsiConsoleOverStaticAnalyzer>
                 .VerifyAnalyzerAsync(Source, _expectedDiagnostics.WithLocation(11, 9))
                 .ConfigureAwait(false);
         }
diff --git a/src/Spectre.Console.Tests/CodeAnalyzer/Analyzers/UseSpectreInsteadOfSystemConsoleAnalyzerTests.cs b/test/Spectre.Console.Analyzer.Tests/Unit/Analyzers/UseSpectreInsteadOfSystemConsoleAnalyzerTests.cs
similarity index 80%
rename from src/Spectre.Console.Tests/CodeAnalyzer/Analyzers/UseSpectreInsteadOfSystemConsoleAnalyzerTests.cs
rename to test/Spectre.Console.Analyzer.Tests/Unit/Analyzers/UseSpectreInsteadOfSystemConsoleAnalyzerTests.cs
index df57881..cdd996c 100644
--- a/src/Spectre.Console.Tests/CodeAnalyzer/Analyzers/UseSpectreInsteadOfSystemConsoleAnalyzerTests.cs
+++ b/test/Spectre.Console.Analyzer.Tests/Unit/Analyzers/UseSpectreInsteadOfSystemConsoleAnalyzerTests.cs
@@ -1,12 +1,8 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Testing;
-using Spectre.Console.Analyzer;
 using Xunit;
-using AnalyzerVerify =
-    Spectre.Console.Tests.CodeAnalyzers.SpectreAnalyzerVerifier<
-        Spectre.Console.Analyzer.UseSpectreInsteadOfSystemConsoleAnalyzer>;
 
-namespace Spectre.Console.Tests.CodeAnalyzers.Analyzers
+namespace Spectre.Console.Analyzer.Tests.Unit.Analyzers
 {
     public class UseSpectreInsteadOfSystemConsoleAnalyzerTests
     {
@@ -27,7 +23,7 @@ class TestClass {
     } 
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<UseSpectreInsteadOfSystemConsoleAnalyzer>
                 .VerifyAnalyzerAsync(Source)
                 .ConfigureAwait(false);
         }
@@ -45,7 +41,7 @@ class TestClass {
     } 
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<UseSpectreInsteadOfSystemConsoleAnalyzer>
                 .VerifyAnalyzerAsync(Source, _expectedDiagnostics.WithLocation(7, 9))
                 .ConfigureAwait(false);
         }
@@ -63,7 +59,7 @@ class TestClass
     }
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<UseSpectreInsteadOfSystemConsoleAnalyzer>
                 .VerifyAnalyzerAsync(Source, _expectedDiagnostics.WithLocation(7, 9))
                 .ConfigureAwait(false);
         }
diff --git a/src/Spectre.Console.Tests/CodeAnalyzer/Fixes/UseInstanceOfStaticAnsiConsoleTests.cs b/test/Spectre.Console.Analyzer.Tests/Unit/Fixes/UseInstanceOfStaticAnsiConsoleTests.cs
similarity index 87%
rename from src/Spectre.Console.Tests/CodeAnalyzer/Fixes/UseInstanceOfStaticAnsiConsoleTests.cs
rename to test/Spectre.Console.Analyzer.Tests/Unit/Fixes/UseInstanceOfStaticAnsiConsoleTests.cs
index 6a4abd1..16730e2 100644
--- a/src/Spectre.Console.Tests/CodeAnalyzer/Fixes/UseInstanceOfStaticAnsiConsoleTests.cs
+++ b/test/Spectre.Console.Analyzer.Tests/Unit/Fixes/UseInstanceOfStaticAnsiConsoleTests.cs
@@ -1,13 +1,9 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Testing;
-using Spectre.Console.Analyzer;
 using Xunit;
-using AnalyzerVerify =
-    Spectre.Console.Tests.CodeAnalyzers.SpectreAnalyzerVerifier<
-        Spectre.Console.Analyzer.FavorInstanceAnsiConsoleOverStaticAnalyzer>;
 
-namespace Spectre.Console.Tests.CodeAnalyzers.Fixes
+namespace Spectre.Console.Analyzer.Tests.Unit.Fixes
 {
     public class UseInstanceOfStaticAnsiConsoleTests
     {
@@ -46,7 +42,7 @@ class TestClass
     } 
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<FavorInstanceAnsiConsoleOverStaticAnalyzer>
                 .VerifyCodeFixAsync(Source, _expectedDiagnostic.WithLocation(11, 9), FixedSource)
                 .ConfigureAwait(false);
         }
@@ -76,7 +72,7 @@ class TestClass
     } 
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<FavorInstanceAnsiConsoleOverStaticAnalyzer>
                 .VerifyCodeFixAsync(Source, _expectedDiagnostic.WithLocation(8, 9), FixedSource)
                 .ConfigureAwait(false);
         }
@@ -112,7 +108,7 @@ class TestClass
     } 
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<FavorInstanceAnsiConsoleOverStaticAnalyzer>
                 .VerifyCodeFixAsync(Source, _expectedDiagnostic.WithLocation(11, 9), FixedSource)
                 .ConfigureAwait(false);
         }
diff --git a/src/Spectre.Console.Tests/CodeAnalyzer/Fixes/UseSpectreInsteadOfSystemConsoleFixTests.cs b/test/Spectre.Console.Analyzer.Tests/Unit/Fixes/UseSpectreInsteadOfSystemConsoleFixTests.cs
similarity index 88%
rename from src/Spectre.Console.Tests/CodeAnalyzer/Fixes/UseSpectreInsteadOfSystemConsoleFixTests.cs
rename to test/Spectre.Console.Analyzer.Tests/Unit/Fixes/UseSpectreInsteadOfSystemConsoleFixTests.cs
index 0524313..3719b60 100644
--- a/src/Spectre.Console.Tests/CodeAnalyzer/Fixes/UseSpectreInsteadOfSystemConsoleFixTests.cs
+++ b/test/Spectre.Console.Analyzer.Tests/Unit/Fixes/UseSpectreInsteadOfSystemConsoleFixTests.cs
@@ -1,13 +1,9 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Testing;
-using Spectre.Console.Analyzer;
 using Xunit;
-using AnalyzerVerify =
-    Spectre.Console.Tests.CodeAnalyzers.SpectreAnalyzerVerifier<
-        Spectre.Console.Analyzer.UseSpectreInsteadOfSystemConsoleAnalyzer>;
 
-namespace Spectre.Console.Tests.CodeAnalyzers.Fixes
+namespace Spectre.Console.Analyzer.Tests.Unit.Fixes
 {
     public class UseSpectreInsteadOfSystemConsoleFixTests
     {
@@ -41,7 +37,7 @@ class TestClass
     }
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<UseSpectreInsteadOfSystemConsoleAnalyzer>
                 .VerifyCodeFixAsync(Source, _expectedDiagnostic.WithLocation(8, 9), FixedSource)
                 .ConfigureAwait(false);
         }
@@ -72,7 +68,7 @@ class TestClass
     }
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<UseSpectreInsteadOfSystemConsoleAnalyzer>
                 .VerifyCodeFixAsync(Source, _expectedDiagnostic.WithLocation(8, 9), FixedSource)
                 .ConfigureAwait(false);
         }
@@ -108,7 +104,7 @@ class TestClass
     }
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<UseSpectreInsteadOfSystemConsoleAnalyzer>
                 .VerifyCodeFixAsync(Source, _expectedDiagnostic.WithLocation(11, 9), FixedSource)
                 .ConfigureAwait(false);
         }
@@ -144,7 +140,7 @@ class TestClass
     }
 }";
 
-            await AnalyzerVerify
+            await SpectreAnalyzerVerifier<UseSpectreInsteadOfSystemConsoleAnalyzer>
                 .VerifyCodeFixAsync(Source, _expectedDiagnostic.WithLocation(11, 9), FixedSource)
                 .ConfigureAwait(false);
         }
diff --git a/src/Spectre.Console.Tests/Constants.cs b/test/Spectre.Console.Tests/Constants.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Constants.cs
rename to test/Spectre.Console.Tests/Constants.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/AnimalCommand.cs b/test/Spectre.Console.Tests/Data/Commands/AnimalCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/AnimalCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/AnimalCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/CatCommand.cs b/test/Spectre.Console.Tests/Data/Commands/CatCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/CatCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/CatCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/DogCommand.cs b/test/Spectre.Console.Tests/Data/Commands/DogCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/DogCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/DogCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/DumpRemainingCommand.cs b/test/Spectre.Console.Tests/Data/Commands/DumpRemainingCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/DumpRemainingCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/DumpRemainingCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/EmptyCommand.cs b/test/Spectre.Console.Tests/Data/Commands/EmptyCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/EmptyCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/EmptyCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/GenericCommand.cs b/test/Spectre.Console.Tests/Data/Commands/GenericCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/GenericCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/GenericCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/GiraffeCommand.cs b/test/Spectre.Console.Tests/Data/Commands/GiraffeCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/GiraffeCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/GiraffeCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/HorseCommand.cs b/test/Spectre.Console.Tests/Data/Commands/HorseCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/HorseCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/HorseCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/InvalidCommand.cs b/test/Spectre.Console.Tests/Data/Commands/InvalidCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/InvalidCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/InvalidCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/LionCommand.cs b/test/Spectre.Console.Tests/Data/Commands/LionCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/LionCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/LionCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/NoDescriptionCommand.cs b/test/Spectre.Console.Tests/Data/Commands/NoDescriptionCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/NoDescriptionCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/NoDescriptionCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/OptionVectorCommand.cs b/test/Spectre.Console.Tests/Data/Commands/OptionVectorCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/OptionVectorCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/OptionVectorCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Commands/ThrowingCommand.cs b/test/Spectre.Console.Tests/Data/Commands/ThrowingCommand.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Commands/ThrowingCommand.cs
rename to test/Spectre.Console.Tests/Data/Commands/ThrowingCommand.cs
diff --git a/src/Spectre.Console.Tests/Data/Converters/CatAgilityConverter.cs b/test/Spectre.Console.Tests/Data/Converters/CatAgilityConverter.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Converters/CatAgilityConverter.cs
rename to test/Spectre.Console.Tests/Data/Converters/CatAgilityConverter.cs
diff --git a/src/Spectre.Console.Tests/Data/Converters/StringToIntegerConverter.cs b/test/Spectre.Console.Tests/Data/Converters/StringToIntegerConverter.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Converters/StringToIntegerConverter.cs
rename to test/Spectre.Console.Tests/Data/Converters/StringToIntegerConverter.cs
diff --git a/src/Spectre.Console.Tests/Data/Exceptions.cs b/test/Spectre.Console.Tests/Data/Exceptions.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Exceptions.cs
rename to test/Spectre.Console.Tests/Data/Exceptions.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/AnimalSettings.cs b/test/Spectre.Console.Tests/Data/Settings/AnimalSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/AnimalSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/AnimalSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/ArgumentOrderSettings.cs b/test/Spectre.Console.Tests/Data/Settings/ArgumentOrderSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/ArgumentOrderSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/ArgumentOrderSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/ArgumentVectorSettings.cs b/test/Spectre.Console.Tests/Data/Settings/ArgumentVectorSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/ArgumentVectorSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/ArgumentVectorSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/BarCommandSettings.cs b/test/Spectre.Console.Tests/Data/Settings/BarCommandSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/BarCommandSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/BarCommandSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/CatSettings.cs b/test/Spectre.Console.Tests/Data/Settings/CatSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/CatSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/CatSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/DogSettings.cs b/test/Spectre.Console.Tests/Data/Settings/DogSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/DogSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/DogSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/EmptySettings.cs b/test/Spectre.Console.Tests/Data/Settings/EmptySettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/EmptySettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/EmptySettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/FooSettings.cs b/test/Spectre.Console.Tests/Data/Settings/FooSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/FooSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/FooSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/GiraffeSettings.cs b/test/Spectre.Console.Tests/Data/Settings/GiraffeSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/GiraffeSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/GiraffeSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/InvalidSettings.cs b/test/Spectre.Console.Tests/Data/Settings/InvalidSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/InvalidSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/InvalidSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/LionSettings.cs b/test/Spectre.Console.Tests/Data/Settings/LionSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/LionSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/LionSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/MammalSettings.cs b/test/Spectre.Console.Tests/Data/Settings/MammalSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/MammalSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/MammalSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/MultipleArgumentVectorSettings.cs b/test/Spectre.Console.Tests/Data/Settings/MultipleArgumentVectorSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/MultipleArgumentVectorSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/MultipleArgumentVectorSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/OptionVectorSettings.cs b/test/Spectre.Console.Tests/Data/Settings/OptionVectorSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/OptionVectorSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/OptionVectorSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/OptionalArgumentWithDefaultValueSettings.cs b/test/Spectre.Console.Tests/Data/Settings/OptionalArgumentWithDefaultValueSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/OptionalArgumentWithDefaultValueSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/OptionalArgumentWithDefaultValueSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Settings/StringOptionSettings.cs b/test/Spectre.Console.Tests/Data/Settings/StringOptionSettings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Settings/StringOptionSettings.cs
rename to test/Spectre.Console.Tests/Data/Settings/StringOptionSettings.cs
diff --git a/src/Spectre.Console.Tests/Data/Validators/EvenNumberValidatorAttribute.cs b/test/Spectre.Console.Tests/Data/Validators/EvenNumberValidatorAttribute.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Validators/EvenNumberValidatorAttribute.cs
rename to test/Spectre.Console.Tests/Data/Validators/EvenNumberValidatorAttribute.cs
diff --git a/src/Spectre.Console.Tests/Data/Validators/PositiveNumberValidatorAttribute.cs b/test/Spectre.Console.Tests/Data/Validators/PositiveNumberValidatorAttribute.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Data/Validators/PositiveNumberValidatorAttribute.cs
rename to test/Spectre.Console.Tests/Data/Validators/PositiveNumberValidatorAttribute.cs
diff --git a/src/Spectre.Console.Tests/Data/starwars.flf b/test/Spectre.Console.Tests/Data/starwars.flf
similarity index 100%
rename from src/Spectre.Console.Tests/Data/starwars.flf
rename to test/Spectre.Console.Tests/Data/starwars.flf
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Box/AsciiBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Box/AsciiBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Box/AsciiBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Box/AsciiBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Box/DoubleBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Box/DoubleBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Box/DoubleBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Box/DoubleBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Box/HeavyBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Box/HeavyBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Box/HeavyBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Box/HeavyBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Box/NoBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Box/NoBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Box/NoBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Box/NoBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Box/RoundedBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Box/RoundedBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Box/RoundedBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Box/RoundedBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Box/SquareBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Box/SquareBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Box/SquareBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Box/SquareBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/Ascii2Border.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/Ascii2Border.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/Ascii2Border.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/Ascii2Border.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/AsciiBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/AsciiBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/AsciiBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/AsciiBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/AsciiDoubleHeadBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/AsciiDoubleHeadBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/AsciiDoubleHeadBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/AsciiDoubleHeadBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/DoubleBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/DoubleBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/DoubleBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/DoubleBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/DoubleEdgeBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/DoubleEdgeBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/DoubleEdgeBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/DoubleEdgeBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/HeavyBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/HeavyBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/HeavyBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/HeavyBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/HeavyEdgeBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/HeavyEdgeBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/HeavyEdgeBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/HeavyEdgeBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/HeavyHeadBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/HeavyHeadBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/HeavyHeadBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/HeavyHeadBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/HorizontalBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/HorizontalBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/HorizontalBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/HorizontalBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_Centered.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_Centered.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_Centered.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_Centered.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_LeftAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_LeftAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_LeftAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_LeftAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_RightAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_RightAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_RightAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/MarkdownBorder_RightAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/MinimalBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/MinimalBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/MinimalBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/MinimalBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/MinimalDoubleHeadBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/MinimalDoubleHeadBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/MinimalDoubleHeadBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/MinimalDoubleHeadBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/MinimalHeavyHeadBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/MinimalHeavyHeadBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/MinimalHeavyHeadBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/MinimalHeavyHeadBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/NoBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/NoBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/NoBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/NoBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/RoundedBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/RoundedBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/RoundedBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/RoundedBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/SimpleBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/SimpleBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/SimpleBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/SimpleBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/SimpleHeavyBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/SimpleHeavyBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/SimpleHeavyBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/SimpleHeavyBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Borders/Table/SquareBorder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Borders/Table/SquareBorder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Borders/Table/SquareBorder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Borders/Table/SquareBorder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/ArgumentCannotContainOptions.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/ArgumentCannotContainOptions.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/ArgumentCannotContainOptions.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/ArgumentCannotContainOptions.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/InvalidCharacterInOptionName.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/InvalidCharacterInOptionName.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/InvalidCharacterInOptionName.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/InvalidCharacterInOptionName.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/InvalidCharacterInValueName.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/InvalidCharacterInValueName.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/InvalidCharacterInValueName.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/InvalidCharacterInValueName.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/LongOptionMustHaveMoreThanOneCharacter.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/LongOptionMustHaveMoreThanOneCharacter.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/LongOptionMustHaveMoreThanOneCharacter.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/LongOptionMustHaveMoreThanOneCharacter.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/MissingLongAndShortName.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/MissingLongAndShortName.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/MissingLongAndShortName.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/MissingLongAndShortName.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/MultipleOptionValuesAreNotSupported.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/MultipleOptionValuesAreNotSupported.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/MultipleOptionValuesAreNotSupported.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/MultipleOptionValuesAreNotSupported.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/MultipleValuesAreNotSupported.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/MultipleValuesAreNotSupported.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/MultipleValuesAreNotSupported.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/MultipleValuesAreNotSupported.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/OptionNamesCannotStartWithDigit.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/OptionNamesCannotStartWithDigit.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/OptionNamesCannotStartWithDigit.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/OptionNamesCannotStartWithDigit.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/OptionsMustHaveName.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/OptionsMustHaveName.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/OptionsMustHaveName.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/OptionsMustHaveName.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/ShortOptionMustOnlyBeOneCharacter.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/ShortOptionMustOnlyBeOneCharacter.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/ShortOptionMustOnlyBeOneCharacter.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/ShortOptionMustOnlyBeOneCharacter.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/UnexpectedCharacter.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/UnexpectedCharacter.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/UnexpectedCharacter.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/UnexpectedCharacter.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/UnterminatedValueName.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/UnterminatedValueName.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/UnterminatedValueName.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/UnterminatedValueName.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Arguments/ValuesMustHaveName.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Arguments/ValuesMustHaveName.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Arguments/ValuesMustHaveName.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Arguments/ValuesMustHaveName.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Help/ArgumentOrder.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Help/ArgumentOrder.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Help/ArgumentOrder.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Help/ArgumentOrder.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Help/Command.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Help/Command.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Help/Command.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Help/Command.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Help/CommandExamples.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Help/CommandExamples.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Help/CommandExamples.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Help/CommandExamples.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Help/Default.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Help/Default.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Help/Default.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Help/Default.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Help/DefaultExamples.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Help/DefaultExamples.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Help/DefaultExamples.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Help/DefaultExamples.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Help/Hidden_Commands.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Help/Hidden_Commands.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Help/Hidden_Commands.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Help/Hidden_Commands.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Help/Leaf.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Help/Leaf.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Help/Leaf.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Help/Leaf.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Help/NoDescription.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Help/NoDescription.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Help/NoDescription.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Help/NoDescription.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Help/Root.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Help/Root.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Help/Root.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Help/Root.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Help/RootExamples.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Help/RootExamples.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Help/RootExamples.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Help/RootExamples.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Help/RootExamples_Children.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Help/RootExamples_Children.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Help/RootExamples_Children.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Help/RootExamples_Children.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Help/RootExamples_Leafs.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Help/RootExamples_Leafs.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Help/RootExamples_Leafs.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Help/RootExamples_Leafs.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/CannotAssignValueToFlag/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/CannotAssignValueToFlag/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/CannotAssignValueToFlag/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/CannotAssignValueToFlag/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/CannotAssignValueToFlag/Test_2.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/CannotAssignValueToFlag/Test_2.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/CannotAssignValueToFlag/Test_2.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/CannotAssignValueToFlag/Test_2.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/InvalidShortOptionName/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/InvalidShortOptionName/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/InvalidShortOptionName/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/InvalidShortOptionName/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameContainSymbol/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameContainSymbol/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameContainSymbol/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameContainSymbol/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameIsMissing/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameIsMissing/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameIsMissing/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameIsMissing/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameIsOneCharacter/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameIsOneCharacter/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameIsOneCharacter/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameIsOneCharacter/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameStartWithDigit/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameStartWithDigit/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameStartWithDigit/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/LongOptionNameStartWithDigit/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/NoMatchingArgument/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/NoMatchingArgument/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/NoMatchingArgument/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/NoMatchingArgument/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/NoValueForOption/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/NoValueForOption/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/NoValueForOption/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/NoValueForOption/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/NoValueForOption/Test_2.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/NoValueForOption/Test_2.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/NoValueForOption/Test_2.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/NoValueForOption/Test_2.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_2.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_2.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_2.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_2.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_3.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_3.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_3.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_3.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_4.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_4.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_4.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_4.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_5.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_5.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_5.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/OptionWithoutName/Test_5.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/Quoted_Strings.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/Quoted_Strings.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/Quoted_Strings.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/Quoted_Strings.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnexpectedOption/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnexpectedOption/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnexpectedOption/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnexpectedOption/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnexpectedOption/Test_2.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnexpectedOption/Test_2.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnexpectedOption/Test_2.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnexpectedOption/Test_2.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_2.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_2.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_2.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_2.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_3.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_3.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_3.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_3.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_4.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_4.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_4.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_4.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_5.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_5.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_5.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_5.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_6.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_6.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_6.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_6.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_7.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_7.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_7.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_7.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_8.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_8.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_8.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownCommand/Test_8.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownOption/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownOption/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownOption/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownOption/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownOption/Test_2.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownOption/Test_2.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownOption/Test_2.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnknownOption/Test_2.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnterminatedQuote/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnterminatedQuote/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Parsing/UnterminatedQuote/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Parsing/UnterminatedQuote/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Xml/Test_1.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Xml/Test_1.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Xml/Test_1.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Xml/Test_1.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Xml/Test_2.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Xml/Test_2.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Xml/Test_2.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Xml/Test_2.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Xml/Test_3.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Xml/Test_3.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Xml/Test_3.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Xml/Test_3.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Xml/Test_4.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Xml/Test_4.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Xml/Test_4.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Xml/Test_4.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Xml/Test_5.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Xml/Test_5.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Xml/Test_5.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Xml/Test_5.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Cli/Xml/Test_6.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Cli/Xml/Test_6.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Cli/Xml/Test_6.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Cli/Xml/Test_6.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Exception/CallSite.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Exception/CallSite.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Exception/CallSite.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Exception/CallSite.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Exception/Default.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Exception/Default.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Exception/Default.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Exception/Default.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Exception/InnerException.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Exception/InnerException.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Exception/InnerException.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Exception/InnerException.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Exception/ShortenedMethods.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Exception/ShortenedMethods.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Exception/ShortenedMethods.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Exception/ShortenedMethods.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Exception/ShortenedTypes.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Exception/ShortenedTypes.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Exception/ShortenedTypes.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Exception/ShortenedTypes.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/BarChart/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/BarChart/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/BarChart/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/BarChart/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/BarChart/Zero_Value.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/BarChart/Zero_Value.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/BarChart/Zero_Value.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/BarChart/Zero_Value.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Ansi.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Ansi.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Ansi.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Ansi.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Culture.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Culture.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Culture.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Culture.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Default.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Default.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Default.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Default.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/FullSize.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/FullSize.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/FullSize.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/FullSize.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/HideTagValues.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/HideTagValues.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/HideTagValues.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/HideTagValues.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/HideTags.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/HideTags.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/HideTags.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/HideTags.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/TagFormat.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/TagFormat.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/TagFormat.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/TagFormat.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Width.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Width.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Width.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/BreakdownChart/Width.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Calendar/Centered.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Calendar/Centered.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Calendar/Centered.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Calendar/Centered.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Calendar/Culture.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Calendar/Culture.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Calendar/Culture.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Calendar/Culture.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Calendar/LeftAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Calendar/LeftAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Calendar/LeftAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Calendar/LeftAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Calendar/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Calendar/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Calendar/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Calendar/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Calendar/RightAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Calendar/RightAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Calendar/RightAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Calendar/RightAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render_MaxWidth.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render_MaxWidth.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render_MaxWidth.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render_MaxWidth.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render_NarrowTerminal.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render_NarrowTerminal.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render_NarrowTerminal.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render_NarrowTerminal.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render_Nested.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render_Nested.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render_Nested.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Canvas/Render_Nested.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Columns/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Columns/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Columns/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Columns/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Figlet/Load_Stream.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Figlet/Load_Stream.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Figlet/Load_Stream.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Figlet/Load_Stream.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_Centered.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_Centered.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_Centered.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_Centered.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_LeftAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_LeftAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_LeftAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_LeftAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_RightAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_RightAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_RightAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_RightAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_Wrapped.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_Wrapped.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_Wrapped.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Figlet/Render_Wrapped.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Grid/AddEmptyRow/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Grid/AddEmptyRow/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Grid/AddEmptyRow/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Grid/AddEmptyRow/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Grid/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Grid/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Grid/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Grid/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_2.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_2.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_2.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_2.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_Alignment.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_Alignment.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_Alignment.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_Alignment.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_ExplicitPadding.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_ExplicitPadding.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_ExplicitPadding.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_ExplicitPadding.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_Padding.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_Padding.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_Padding.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Grid/Render_Padding.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Padder/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Padder/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Padder/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Padder/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Padder/Render_Expanded.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Padder/Render_Expanded.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Padder/Render_Expanded.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Padder/Render_Expanded.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Padder/Render_Nested.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Padder/Render_Nested.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Padder/Render_Nested.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Padder/Render_Nested.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_CJK.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_CJK.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_CJK.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_CJK.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Child_Centered.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Child_Centered.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Child_Centered.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Child_Centered.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Child_Panel.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Child_Panel.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Child_Panel.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Child_Panel.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Child_RightAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Child_RightAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Child_RightAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Child_RightAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Expand.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Expand.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Expand.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Expand.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_Centered.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_Centered.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_Centered.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_Centered.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_Collapse.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_Collapse.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_Collapse.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_Collapse.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_LeftAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_LeftAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_LeftAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_LeftAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_RightAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_RightAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_RightAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Header_RightAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_LineEndings.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_LineEndings.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_LineEndings.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_LineEndings.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Multiline.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Multiline.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Multiline.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Multiline.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Padding.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Padding.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Padding.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Padding.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Unicode.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Unicode.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Unicode.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Unicode.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Wrap.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Wrap.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Wrap.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_Wrap.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_ZeroPadding.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_ZeroPadding.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_ZeroPadding.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Panel/Render_ZeroPadding.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Progress/Render_ReduceWidth.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Progress/Render_ReduceWidth.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Progress/Render_ReduceWidth.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Progress/Render_ReduceWidth.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AcceptChoice.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AcceptChoice.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AcceptChoice.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AcceptChoice.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_BestMatch.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_BestMatch.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_BestMatch.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_BestMatch.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_Empty.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_Empty.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_Empty.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_Empty.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_NextChoice.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_NextChoice.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_NextChoice.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/AutoComplete_NextChoice.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/ConversionError.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/ConversionError.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/ConversionError.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/ConversionError.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomConverter.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomConverter.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomConverter.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomConverter.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomValidation.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomValidation.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomValidation.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/CustomValidation.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/DefaultValue.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/DefaultValue.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/DefaultValue.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/DefaultValue.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/InvalidChoice.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/InvalidChoice.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/InvalidChoice.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/InvalidChoice.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/SecretDefaultValue.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/SecretDefaultValue.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/SecretDefaultValue.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Prompt/Text/SecretDefaultValue.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Recorder/Html.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Recorder/Html.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Recorder/Html.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Recorder/Html.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Recorder/Text.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Recorder/Text.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Recorder/Text.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Recorder/Text.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Rows/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Rows/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Rows/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Rows/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Rows/Render_Expanded_And_Nested.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Rows/Render_Expanded_And_Nested.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Rows/Render_Expanded_And_Nested.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Rows/Render_Expanded_And_Nested.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Rows/Render_Nested.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Rows/Render_Nested.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Rows/Render_Nested.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Rows/Render_Nested.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Border_Header.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Border_Header.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Border_Header.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Border_Header.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Border_NoHeader.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Border_NoHeader.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Border_NoHeader.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Border_NoHeader.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Header_DefaultAlignment.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Header_DefaultAlignment.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Header_DefaultAlignment.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Header_DefaultAlignment.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Header_LeftAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Header_LeftAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Header_LeftAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Header_LeftAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Header_RightAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Header_RightAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Header_RightAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Header_RightAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Linebreaks.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Linebreaks.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Linebreaks.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Linebreaks.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Truncate.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Truncate.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Truncate.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Rule/Render_Truncate.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Status/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Status/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Status/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Status/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/AddEmptyRow.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/AddEmptyRow.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/AddEmptyRow.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/AddEmptyRow.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_CellPadding.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_CellPadding.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_CellPadding.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_CellPadding.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Centered.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Centered.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Centered.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Centered.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_ColumnJustification.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_ColumnJustification.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_ColumnJustification.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_ColumnJustification.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Expand.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Expand.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Expand.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Expand.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Fold.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Fold.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Fold.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Fold.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Footers.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Footers.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Footers.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Footers.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Impossible.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Impossible.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Impossible.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Impossible.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_LeftAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_LeftAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_LeftAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_LeftAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Multiline.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Multiline.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Multiline.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Multiline.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Nested.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Nested.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Nested.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Nested.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_NoRows.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_NoRows.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_NoRows.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_NoRows.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_RightAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_RightAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_RightAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_RightAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption_Centered.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption_Centered.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption_Centered.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption_Centered.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption_LeftAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption_LeftAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption_LeftAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption_LeftAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption_RightAligned.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption_RightAligned.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption_RightAligned.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Table/Render_Title_Caption_RightAligned.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Tree/Render.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Tree/Render.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Tree/Render.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Tree/Render.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Expectations/Widgets/Tree/Render_NoChildren.Output.verified.txt b/test/Spectre.Console.Tests/Expectations/Widgets/Tree/Render_NoChildren.Output.verified.txt
similarity index 100%
rename from src/Spectre.Console.Tests/Expectations/Widgets/Tree/Render_NoChildren.Output.verified.txt
rename to test/Spectre.Console.Tests/Expectations/Widgets/Tree/Render_NoChildren.Output.verified.txt
diff --git a/src/Spectre.Console.Tests/Spectre.Console.Tests.csproj b/test/Spectre.Console.Tests/Spectre.Console.Tests.csproj
similarity index 77%
rename from src/Spectre.Console.Tests/Spectre.Console.Tests.csproj
rename to test/Spectre.Console.Tests/Spectre.Console.Tests.csproj
index 49f69fc..99780b9 100644
--- a/src/Spectre.Console.Tests/Spectre.Console.Tests.csproj
+++ b/test/Spectre.Console.Tests/Spectre.Console.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Spectre.Console\Cli\Internal\Constants.cs" Link="Imported\Constants.cs" />
+    <Compile Include="..\..\src\Spectre.Console\Cli\Internal\Constants.cs" Link="Imported\Constants.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -32,9 +32,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Spectre.Console.Analyzer\Spectre.Console.Analyzer.csproj" />
-    <ProjectReference Include="..\Spectre.Console.Testing\Spectre.Console.Testing.csproj" />
-    <ProjectReference Include="..\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\src\Spectre.Console.Analyzer\Spectre.Console.Analyzer.csproj" />
+    <ProjectReference Include="..\..\src\Spectre.Console.Testing\Spectre.Console.Testing.csproj" />
+    <ProjectReference Include="..\..\src\Spectre.Console\Spectre.Console.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Spectre.Console.Tests/Spectre.Console.Tests.v3.ncrunchproject b/test/Spectre.Console.Tests/Spectre.Console.Tests.v3.ncrunchproject
similarity index 100%
rename from src/Spectre.Console.Tests/Spectre.Console.Tests.v3.ncrunchproject
rename to test/Spectre.Console.Tests/Spectre.Console.Tests.v3.ncrunchproject
diff --git a/src/Spectre.Console.Tests/Unit/AnsiConsoleTests.Advanced.cs b/test/Spectre.Console.Tests/Unit/AnsiConsoleTests.Advanced.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/AnsiConsoleTests.Advanced.cs
rename to test/Spectre.Console.Tests/Unit/AnsiConsoleTests.Advanced.cs
diff --git a/src/Spectre.Console.Tests/Unit/AnsiConsoleTests.Colors.cs b/test/Spectre.Console.Tests/Unit/AnsiConsoleTests.Colors.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/AnsiConsoleTests.Colors.cs
rename to test/Spectre.Console.Tests/Unit/AnsiConsoleTests.Colors.cs
diff --git a/src/Spectre.Console.Tests/Unit/AnsiConsoleTests.Cursor.cs b/test/Spectre.Console.Tests/Unit/AnsiConsoleTests.Cursor.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/AnsiConsoleTests.Cursor.cs
rename to test/Spectre.Console.Tests/Unit/AnsiConsoleTests.Cursor.cs
diff --git a/src/Spectre.Console.Tests/Unit/AnsiConsoleTests.Markup.cs b/test/Spectre.Console.Tests/Unit/AnsiConsoleTests.Markup.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/AnsiConsoleTests.Markup.cs
rename to test/Spectre.Console.Tests/Unit/AnsiConsoleTests.Markup.cs
diff --git a/src/Spectre.Console.Tests/Unit/AnsiConsoleTests.Style.cs b/test/Spectre.Console.Tests/Unit/AnsiConsoleTests.Style.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/AnsiConsoleTests.Style.cs
rename to test/Spectre.Console.Tests/Unit/AnsiConsoleTests.Style.cs
diff --git a/src/Spectre.Console.Tests/Unit/AnsiConsoleTests.cs b/test/Spectre.Console.Tests/Unit/AnsiConsoleTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/AnsiConsoleTests.cs
rename to test/Spectre.Console.Tests/Unit/AnsiConsoleTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/BarChartTests.cs b/test/Spectre.Console.Tests/Unit/BarChartTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/BarChartTests.cs
rename to test/Spectre.Console.Tests/Unit/BarChartTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/BoxBorderTests.cs b/test/Spectre.Console.Tests/Unit/BoxBorderTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/BoxBorderTests.cs
rename to test/Spectre.Console.Tests/Unit/BoxBorderTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/BreakdownChartTests.cs b/test/Spectre.Console.Tests/Unit/BreakdownChartTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/BreakdownChartTests.cs
rename to test/Spectre.Console.Tests/Unit/BreakdownChartTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/CalendarTests.cs b/test/Spectre.Console.Tests/Unit/CalendarTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/CalendarTests.cs
rename to test/Spectre.Console.Tests/Unit/CalendarTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/CanvasTests.cs b/test/Spectre.Console.Tests/Unit/CanvasTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/CanvasTests.cs
rename to test/Spectre.Console.Tests/Unit/CanvasTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/Annotations/CommandArgumentAttributeTests.Rendering.cs b/test/Spectre.Console.Tests/Unit/Cli/Annotations/CommandArgumentAttributeTests.Rendering.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/Annotations/CommandArgumentAttributeTests.Rendering.cs
rename to test/Spectre.Console.Tests/Unit/Cli/Annotations/CommandArgumentAttributeTests.Rendering.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/Annotations/CommandArgumentAttributeTests.cs b/test/Spectre.Console.Tests/Unit/Cli/Annotations/CommandArgumentAttributeTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/Annotations/CommandArgumentAttributeTests.cs
rename to test/Spectre.Console.Tests/Unit/Cli/Annotations/CommandArgumentAttributeTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/Annotations/CommandOptionAttributeTests.Rendering.cs b/test/Spectre.Console.Tests/Unit/Cli/Annotations/CommandOptionAttributeTests.Rendering.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/Annotations/CommandOptionAttributeTests.Rendering.cs
rename to test/Spectre.Console.Tests/Unit/Cli/Annotations/CommandOptionAttributeTests.Rendering.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/Annotations/CommandOptionAttributeTests.cs b/test/Spectre.Console.Tests/Unit/Cli/Annotations/CommandOptionAttributeTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/Annotations/CommandOptionAttributeTests.cs
rename to test/Spectre.Console.Tests/Unit/Cli/Annotations/CommandOptionAttributeTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Constructor.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Constructor.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Constructor.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Constructor.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.FlagValues.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.FlagValues.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.FlagValues.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.FlagValues.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Help.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Help.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Help.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Help.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Injection.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Injection.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Injection.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Injection.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Pairs.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Pairs.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Pairs.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Pairs.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Parsing.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Parsing.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Parsing.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Parsing.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Remaining.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Remaining.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Remaining.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Remaining.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Sensitivity.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Sensitivity.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Sensitivity.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Sensitivity.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Settings.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Settings.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Settings.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Settings.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.TypeConverters.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.TypeConverters.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.TypeConverters.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.TypeConverters.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Unsafe.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Unsafe.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Unsafe.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Unsafe.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Validation.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Validation.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Validation.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Validation.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.ValueProviders.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.ValueProviders.cs
similarity index 98%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.ValueProviders.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.ValueProviders.cs
index 8862d82..c663933 100644
--- a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.ValueProviders.cs
+++ b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.ValueProviders.cs
@@ -1,7 +1,5 @@
-using System;
 using System.ComponentModel;
 using System.Globalization;
-using System.Linq;
 using Shouldly;
 using Spectre.Console.Cli;
 using Spectre.Console.Testing;
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Vectors.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Vectors.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Vectors.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Vectors.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Version.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Version.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Version.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Version.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Xml.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Xml.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Xml.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Xml.cs
diff --git a/src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.cs
rename to test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/ColorSystemTests.cs b/test/Spectre.Console.Tests/Unit/ColorSystemTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/ColorSystemTests.cs
rename to test/Spectre.Console.Tests/Unit/ColorSystemTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/ColorTests.cs b/test/Spectre.Console.Tests/Unit/ColorTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/ColorTests.cs
rename to test/Spectre.Console.Tests/Unit/ColorTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/ColumnsTests.cs b/test/Spectre.Console.Tests/Unit/ColumnsTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/ColumnsTests.cs
rename to test/Spectre.Console.Tests/Unit/ColumnsTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/EmojiTests.cs b/test/Spectre.Console.Tests/Unit/EmojiTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/EmojiTests.cs
rename to test/Spectre.Console.Tests/Unit/EmojiTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/ExceptionTests.cs b/test/Spectre.Console.Tests/Unit/ExceptionTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/ExceptionTests.cs
rename to test/Spectre.Console.Tests/Unit/ExceptionTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/FigletTests.cs b/test/Spectre.Console.Tests/Unit/FigletTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/FigletTests.cs
rename to test/Spectre.Console.Tests/Unit/FigletTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/GridTests.cs b/test/Spectre.Console.Tests/Unit/GridTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/GridTests.cs
rename to test/Spectre.Console.Tests/Unit/GridTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/MarkupTests.cs b/test/Spectre.Console.Tests/Unit/MarkupTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/MarkupTests.cs
rename to test/Spectre.Console.Tests/Unit/MarkupTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/PadderTests.cs b/test/Spectre.Console.Tests/Unit/PadderTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/PadderTests.cs
rename to test/Spectre.Console.Tests/Unit/PadderTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/PanelTests.cs b/test/Spectre.Console.Tests/Unit/PanelTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/PanelTests.cs
rename to test/Spectre.Console.Tests/Unit/PanelTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/Progress/DownloadedColumnTests.cs b/test/Spectre.Console.Tests/Unit/Progress/DownloadedColumnTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Progress/DownloadedColumnTests.cs
rename to test/Spectre.Console.Tests/Unit/Progress/DownloadedColumnTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/Progress/ProgressColumnFixture.cs b/test/Spectre.Console.Tests/Unit/Progress/ProgressColumnFixture.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Progress/ProgressColumnFixture.cs
rename to test/Spectre.Console.Tests/Unit/Progress/ProgressColumnFixture.cs
diff --git a/src/Spectre.Console.Tests/Unit/Progress/ProgressTests.cs b/test/Spectre.Console.Tests/Unit/Progress/ProgressTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/Progress/ProgressTests.cs
rename to test/Spectre.Console.Tests/Unit/Progress/ProgressTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/RecorderTests.cs b/test/Spectre.Console.Tests/Unit/RecorderTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/RecorderTests.cs
rename to test/Spectre.Console.Tests/Unit/RecorderTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/RenderHookTests.cs b/test/Spectre.Console.Tests/Unit/RenderHookTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/RenderHookTests.cs
rename to test/Spectre.Console.Tests/Unit/RenderHookTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/RowsTests.cs b/test/Spectre.Console.Tests/Unit/RowsTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/RowsTests.cs
rename to test/Spectre.Console.Tests/Unit/RowsTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/RuleTests.cs b/test/Spectre.Console.Tests/Unit/RuleTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/RuleTests.cs
rename to test/Spectre.Console.Tests/Unit/RuleTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/SegmentTests.cs b/test/Spectre.Console.Tests/Unit/SegmentTests.cs
similarity index 98%
rename from src/Spectre.Console.Tests/Unit/SegmentTests.cs
rename to test/Spectre.Console.Tests/Unit/SegmentTests.cs
index 554e738..c158689 100644
--- a/src/Spectre.Console.Tests/Unit/SegmentTests.cs
+++ b/test/Spectre.Console.Tests/Unit/SegmentTests.cs
@@ -1,7 +1,5 @@
-using System.Threading.Tasks;
 using Shouldly;
 using Spectre.Console.Rendering;
-using Spectre.Verify.Extensions;
 using VerifyXunit;
 using Xunit;
 
diff --git a/src/Spectre.Console.Tests/Unit/StatusTests.cs b/test/Spectre.Console.Tests/Unit/StatusTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/StatusTests.cs
rename to test/Spectre.Console.Tests/Unit/StatusTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/StyleTests.cs b/test/Spectre.Console.Tests/Unit/StyleTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/StyleTests.cs
rename to test/Spectre.Console.Tests/Unit/StyleTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/TableBorderTests.cs b/test/Spectre.Console.Tests/Unit/TableBorderTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/TableBorderTests.cs
rename to test/Spectre.Console.Tests/Unit/TableBorderTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/TableTests.cs b/test/Spectre.Console.Tests/Unit/TableTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/TableTests.cs
rename to test/Spectre.Console.Tests/Unit/TableTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/TextPromptTests.cs b/test/Spectre.Console.Tests/Unit/TextPromptTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/TextPromptTests.cs
rename to test/Spectre.Console.Tests/Unit/TextPromptTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/TextTests.cs b/test/Spectre.Console.Tests/Unit/TextTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/TextTests.cs
rename to test/Spectre.Console.Tests/Unit/TextTests.cs
diff --git a/src/Spectre.Console.Tests/Unit/TreeTests.cs b/test/Spectre.Console.Tests/Unit/TreeTests.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Unit/TreeTests.cs
rename to test/Spectre.Console.Tests/Unit/TreeTests.cs
diff --git a/src/Spectre.Console.Tests/Utilities/EmbeddedResourceReader.cs b/test/Spectre.Console.Tests/Utilities/EmbeddedResourceReader.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Utilities/EmbeddedResourceReader.cs
rename to test/Spectre.Console.Tests/Utilities/EmbeddedResourceReader.cs
diff --git a/src/Spectre.Console.Tests/Utilities/Extensions/CommandContextExtensions.cs b/test/Spectre.Console.Tests/Utilities/Extensions/CommandContextExtensions.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Utilities/Extensions/CommandContextExtensions.cs
rename to test/Spectre.Console.Tests/Utilities/Extensions/CommandContextExtensions.cs
diff --git a/src/Spectre.Console.Tests/Utilities/Extensions/ShouldlyExtensions.cs b/test/Spectre.Console.Tests/Utilities/Extensions/ShouldlyExtensions.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Utilities/Extensions/ShouldlyExtensions.cs
rename to test/Spectre.Console.Tests/Utilities/Extensions/ShouldlyExtensions.cs
diff --git a/src/Spectre.Console.Tests/Utilities/Extensions/TestConsoleExtensions.cs b/test/Spectre.Console.Tests/Utilities/Extensions/TestConsoleExtensions.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Utilities/Extensions/TestConsoleExtensions.cs
rename to test/Spectre.Console.Tests/Utilities/Extensions/TestConsoleExtensions.cs
diff --git a/src/Spectre.Console.Tests/Utilities/FakeTypeRegistrar.cs b/test/Spectre.Console.Tests/Utilities/FakeTypeRegistrar.cs
similarity index 100%
rename from src/Spectre.Console.Tests/Utilities/FakeTypeRegistrar.cs
rename to test/Spectre.Console.Tests/Utilities/FakeTypeRegistrar.cs
diff --git a/src/Spectre.Console.Tests/VerifyConfiguration.cs b/test/Spectre.Console.Tests/VerifyConfiguration.cs
similarity index 100%
rename from src/Spectre.Console.Tests/VerifyConfiguration.cs
rename to test/Spectre.Console.Tests/VerifyConfiguration.cs