diff --git a/MfGames.Markdown.Gemtext.sln b/MfGames.Markdown.Gemtext.sln
index cddf53f..27d23ab 100644
--- a/MfGames.Markdown.Gemtext.sln
+++ b/MfGames.Markdown.Gemtext.sln
@@ -1,54 +1,54 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{954BA984-D50E-4D1C-880F-EAE678EF6945}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MfGames.Markdown.Gemtext", "src\MfGames.Markdown.Gemtext\MfGames.Markdown.Gemtext.csproj", "{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MfGames.Markdown.Gemtext.Tests", "src\MfGames.Markdown.Gemtext.Tests\MfGames.Markdown.Gemtext.Tests.csproj", "{D2703B25-9AF7-49FF-93A4-CB124560F2A9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Debug|x64.Build.0 = Debug|Any CPU
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Debug|x86.Build.0 = Debug|Any CPU
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Release|x64.ActiveCfg = Release|Any CPU
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Release|x64.Build.0 = Release|Any CPU
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Release|x86.ActiveCfg = Release|Any CPU
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Release|x86.Build.0 = Release|Any CPU
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Debug|x64.Build.0 = Debug|Any CPU
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Debug|x86.Build.0 = Debug|Any CPU
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Release|x64.ActiveCfg = Release|Any CPU
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Release|x64.Build.0 = Release|Any CPU
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Release|x86.ActiveCfg = Release|Any CPU
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA} = {954BA984-D50E-4D1C-880F-EAE678EF6945}
-		{D2703B25-9AF7-49FF-93A4-CB124560F2A9} = {954BA984-D50E-4D1C-880F-EAE678EF6945}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{954BA984-D50E-4D1C-880F-EAE678EF6945}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MfGames.Markdown.Gemtext", "src\MfGames.Markdown.Gemtext\MfGames.Markdown.Gemtext.csproj", "{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MfGames.Markdown.Gemtext.Tests", "tests\MfGames.Markdown.Gemtext.Tests\MfGames.Markdown.Gemtext.Tests.csproj", "{D2703B25-9AF7-49FF-93A4-CB124560F2A9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Debug|x64.Build.0 = Debug|Any CPU
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Debug|x86.Build.0 = Debug|Any CPU
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Release|x64.ActiveCfg = Release|Any CPU
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Release|x64.Build.0 = Release|Any CPU
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Release|x86.ActiveCfg = Release|Any CPU
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA}.Release|x86.Build.0 = Release|Any CPU
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Debug|x64.Build.0 = Debug|Any CPU
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Debug|x86.Build.0 = Debug|Any CPU
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Release|x64.ActiveCfg = Release|Any CPU
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Release|x64.Build.0 = Release|Any CPU
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Release|x86.ActiveCfg = Release|Any CPU
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{2A1DE43D-544D-4CE0-ACC8-D15497BBCECA} = {954BA984-D50E-4D1C-880F-EAE678EF6945}
+		{D2703B25-9AF7-49FF-93A4-CB124560F2A9} = {954BA984-D50E-4D1C-880F-EAE678EF6945}
+	EndGlobalSection
+EndGlobal
diff --git a/src/MfGames.Markdown.Gemtext/MfGames.Markdown.Gemtext.csproj b/src/MfGames.Markdown.Gemtext/MfGames.Markdown.Gemtext.csproj
index 0139a68..3df902a 100644
--- a/src/MfGames.Markdown.Gemtext/MfGames.Markdown.Gemtext.csproj
+++ b/src/MfGames.Markdown.Gemtext/MfGames.Markdown.Gemtext.csproj
@@ -18,8 +18,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="ConsoleTableExt" Version="3.1.9" />
-        <PackageReference Include="Markdig" Version="0.25.0" />
+        <PackageReference Include="ConsoleTableExt" Version="3.2.0" />
+        <PackageReference Include="Markdig" Version="0.30.3" />
     </ItemGroup>
 
 </Project>
diff --git a/src/MfGames.Markdown.Gemtext.Tests/CodeInlineTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/CodeInlineTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/CodeInlineTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/CodeInlineTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/HeaderTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/HeaderTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/HeaderTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/HeaderTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/ImageLinkTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/ImageLinkTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/ImageLinkTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/ImageLinkTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/IncreaseHeaderDepthsAfterFirstTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/IncreaseHeaderDepthsAfterFirstTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/IncreaseHeaderDepthsAfterFirstTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/IncreaseHeaderDepthsAfterFirstTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/LinkTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/LinkTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/LinkTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/LinkTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/ListTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/ListTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/ListTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/ListTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/MfGames.Markdown.Gemtext.Tests.csproj b/tests/MfGames.Markdown.Gemtext.Tests/MfGames.Markdown.Gemtext.Tests.csproj
similarity index 80%
rename from src/MfGames.Markdown.Gemtext.Tests/MfGames.Markdown.Gemtext.Tests.csproj
rename to tests/MfGames.Markdown.Gemtext.Tests/MfGames.Markdown.Gemtext.Tests.csproj
index 9720c17..0c0ca7b 100644
--- a/src/MfGames.Markdown.Gemtext.Tests/MfGames.Markdown.Gemtext.Tests.csproj
+++ b/tests/MfGames.Markdown.Gemtext.Tests/MfGames.Markdown.Gemtext.Tests.csproj
@@ -6,21 +6,21 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0"/>
-        <PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />
-        <PackageReference Include="xunit" Version="2.4.1"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+        <PackageReference Include="JunitXml.TestLogger" Version="3.0.114" />
+        <PackageReference Include="xunit" Version="2.4.2" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.0.3">
+        <PackageReference Include="coverlet.collector" Version="3.1.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\MfGames.Markdown.Gemtext\MfGames.Markdown.Gemtext.csproj"/>
+      <ProjectReference Include="..\..\src\MfGames.Markdown.Gemtext\MfGames.Markdown.Gemtext.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/MfGames.Markdown.Gemtext.Tests/ParagraphLinkHandlingTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/ParagraphLinkHandlingTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/ParagraphLinkHandlingTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/ParagraphLinkHandlingTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/PlainTextTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/PlainTextTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/PlainTextTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/PlainTextTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/PythonInspired/BaseUrlPythonTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/PythonInspired/BaseUrlPythonTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/PythonInspired/BaseUrlPythonTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/PythonInspired/BaseUrlPythonTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/PythonInspired/CodeBlockPythonTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/PythonInspired/CodeBlockPythonTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/PythonInspired/CodeBlockPythonTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/PythonInspired/CodeBlockPythonTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/PythonInspired/ListPythonTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/PythonInspired/ListPythonTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/PythonInspired/ListPythonTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/PythonInspired/ListPythonTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/PythonInspired/PlainTextPythonTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/PythonInspired/PlainTextPythonTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/PythonInspired/PlainTextPythonTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/PythonInspired/PlainTextPythonTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/PythonInspired/README.md b/tests/MfGames.Markdown.Gemtext.Tests/PythonInspired/README.md
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/PythonInspired/README.md
rename to tests/MfGames.Markdown.Gemtext.Tests/PythonInspired/README.md
diff --git a/src/MfGames.Markdown.Gemtext.Tests/PythonInspired/StripHtmlPythonTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/PythonInspired/StripHtmlPythonTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/PythonInspired/StripHtmlPythonTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/PythonInspired/StripHtmlPythonTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/QuoteTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/QuoteTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/QuoteTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/QuoteTests.cs
diff --git a/src/MfGames.Markdown.Gemtext.Tests/TableTests.cs b/tests/MfGames.Markdown.Gemtext.Tests/TableTests.cs
similarity index 100%
rename from src/MfGames.Markdown.Gemtext.Tests/TableTests.cs
rename to tests/MfGames.Markdown.Gemtext.Tests/TableTests.cs