diff --git a/WpfMath.sln b/WpfMath.sln
index 419a670d..bb0bb3d8 100644
--- a/WpfMath.sln
+++ b/WpfMath.sln
@@ -48,7 +48,7 @@ ProjectSection(SolutionItems) = preProject
 	.github\workflows\nuget.yml = .github\workflows\nuget.yml
 EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfMath.Shared", "WpfMath.Shared\WpfMath.Shared.csproj", "{F47FD7D7-3BFA-42BA-BEC6-68280596EE08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfMath.Shared", "src\WpfMath.Shared\WpfMath.Shared.csproj", "{C9B5E02E-04FB-405F-9BEB-6CF4736939EB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -68,10 +68,10 @@ Global
 		{F19E5FB1-EE6B-4A48-A522-41F30676BE41}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F19E5FB1-EE6B-4A48-A522-41F30676BE41}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F19E5FB1-EE6B-4A48-A522-41F30676BE41}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F47FD7D7-3BFA-42BA-BEC6-68280596EE08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F47FD7D7-3BFA-42BA-BEC6-68280596EE08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F47FD7D7-3BFA-42BA-BEC6-68280596EE08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F47FD7D7-3BFA-42BA-BEC6-68280596EE08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9B5E02E-04FB-405F-9BEB-6CF4736939EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9B5E02E-04FB-405F-9BEB-6CF4736939EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9B5E02E-04FB-405F-9BEB-6CF4736939EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9B5E02E-04FB-405F-9BEB-6CF4736939EB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/WpfMath.Shared/Build/IsExternalInit.cs b/src/WpfMath.Shared/Build/IsExternalInit.cs
similarity index 100%
rename from WpfMath.Shared/Build/IsExternalInit.cs
rename to src/WpfMath.Shared/Build/IsExternalInit.cs
diff --git a/WpfMath.Shared/CharFont.cs b/src/WpfMath.Shared/CharFont.cs
similarity index 100%
rename from WpfMath.Shared/CharFont.cs
rename to src/WpfMath.Shared/CharFont.cs
diff --git a/WpfMath.Shared/Data/DefaultTexFont.xml b/src/WpfMath.Shared/Data/DefaultTexFont.xml
similarity index 100%
rename from WpfMath.Shared/Data/DefaultTexFont.xml
rename to src/WpfMath.Shared/Data/DefaultTexFont.xml
diff --git a/WpfMath.Shared/Data/GlueSettings.xml b/src/WpfMath.Shared/Data/GlueSettings.xml
similarity index 100%
rename from WpfMath.Shared/Data/GlueSettings.xml
rename to src/WpfMath.Shared/Data/GlueSettings.xml
diff --git a/WpfMath.Shared/Data/PredefinedColors.xml b/src/WpfMath.Shared/Data/PredefinedColors.xml
similarity index 100%
rename from WpfMath.Shared/Data/PredefinedColors.xml
rename to src/WpfMath.Shared/Data/PredefinedColors.xml
diff --git a/WpfMath.Shared/Data/PredefinedTexFormulas.xml b/src/WpfMath.Shared/Data/PredefinedTexFormulas.xml
similarity index 100%
rename from WpfMath.Shared/Data/PredefinedTexFormulas.xml
rename to src/WpfMath.Shared/Data/PredefinedTexFormulas.xml
diff --git a/WpfMath.Shared/Data/TexFormulaSettings.xml b/src/WpfMath.Shared/Data/TexFormulaSettings.xml
similarity index 100%
rename from WpfMath.Shared/Data/TexFormulaSettings.xml
rename to src/WpfMath.Shared/Data/TexFormulaSettings.xml
diff --git a/WpfMath.Shared/Data/TexSymbols.xml b/src/WpfMath.Shared/Data/TexSymbols.xml
similarity index 100%
rename from WpfMath.Shared/Data/TexSymbols.xml
rename to src/WpfMath.Shared/Data/TexSymbols.xml
diff --git a/WpfMath.Shared/Data/WpfMathResourceMarker.cs b/src/WpfMath.Shared/Data/WpfMathResourceMarker.cs
similarity index 100%
rename from WpfMath.Shared/Data/WpfMathResourceMarker.cs
rename to src/WpfMath.Shared/Data/WpfMathResourceMarker.cs
diff --git a/WpfMath.Shared/DelimiterMappingNotFoundException.cs b/src/WpfMath.Shared/DelimiterMappingNotFoundException.cs
similarity index 100%
rename from WpfMath.Shared/DelimiterMappingNotFoundException.cs
rename to src/WpfMath.Shared/DelimiterMappingNotFoundException.cs
diff --git a/WpfMath.Shared/Exceptions/TexCharacterMappingNotFoundException.cs b/src/WpfMath.Shared/Exceptions/TexCharacterMappingNotFoundException.cs
similarity index 100%
rename from WpfMath.Shared/Exceptions/TexCharacterMappingNotFoundException.cs
rename to src/WpfMath.Shared/Exceptions/TexCharacterMappingNotFoundException.cs
diff --git a/WpfMath.Shared/Exceptions/TexException.cs b/src/WpfMath.Shared/Exceptions/TexException.cs
similarity index 100%
rename from WpfMath.Shared/Exceptions/TexException.cs
rename to src/WpfMath.Shared/Exceptions/TexException.cs
diff --git a/WpfMath.Shared/Exceptions/TexNotSupportedException.cs b/src/WpfMath.Shared/Exceptions/TexNotSupportedException.cs
similarity index 100%
rename from WpfMath.Shared/Exceptions/TexNotSupportedException.cs
rename to src/WpfMath.Shared/Exceptions/TexNotSupportedException.cs
diff --git a/WpfMath.Shared/Exceptions/TexParseException.cs b/src/WpfMath.Shared/Exceptions/TexParseException.cs
similarity index 100%
rename from WpfMath.Shared/Exceptions/TexParseException.cs
rename to src/WpfMath.Shared/Exceptions/TexParseException.cs
diff --git a/WpfMath.Shared/Exceptions/TextStyleMappingNotFoundException.cs b/src/WpfMath.Shared/Exceptions/TextStyleMappingNotFoundException.cs
similarity index 100%
rename from WpfMath.Shared/Exceptions/TextStyleMappingNotFoundException.cs
rename to src/WpfMath.Shared/Exceptions/TextStyleMappingNotFoundException.cs
diff --git a/WpfMath.Shared/Exceptions/TypeFaceNotFoundException.cs b/src/WpfMath.Shared/Exceptions/TypeFaceNotFoundException.cs
similarity index 100%
rename from WpfMath.Shared/Exceptions/TypeFaceNotFoundException.cs
rename to src/WpfMath.Shared/Exceptions/TypeFaceNotFoundException.cs
diff --git a/WpfMath.Shared/FormulaNotFoundException.cs b/src/WpfMath.Shared/FormulaNotFoundException.cs
similarity index 100%
rename from WpfMath.Shared/FormulaNotFoundException.cs
rename to src/WpfMath.Shared/FormulaNotFoundException.cs
diff --git a/WpfMath.Shared/Parsers/AtomAppendMode.cs b/src/WpfMath.Shared/Parsers/AtomAppendMode.cs
similarity index 100%
rename from WpfMath.Shared/Parsers/AtomAppendMode.cs
rename to src/WpfMath.Shared/Parsers/AtomAppendMode.cs
diff --git a/WpfMath.Shared/Rendering/Transformations/Transformation.cs b/src/WpfMath.Shared/Rendering/Transformations/Transformation.cs
similarity index 100%
rename from WpfMath.Shared/Rendering/Transformations/Transformation.cs
rename to src/WpfMath.Shared/Rendering/Transformations/Transformation.cs
diff --git a/WpfMath.Shared/Rendering/Transformations/TransformationKind.cs b/src/WpfMath.Shared/Rendering/Transformations/TransformationKind.cs
similarity index 100%
rename from WpfMath.Shared/Rendering/Transformations/TransformationKind.cs
rename to src/WpfMath.Shared/Rendering/Transformations/TransformationKind.cs
diff --git a/WpfMath.Shared/SourceSpan.cs b/src/WpfMath.Shared/SourceSpan.cs
similarity index 100%
rename from WpfMath.Shared/SourceSpan.cs
rename to src/WpfMath.Shared/SourceSpan.cs
diff --git a/WpfMath.Shared/SymbolMappingNotFoundException.cs b/src/WpfMath.Shared/SymbolMappingNotFoundException.cs
similarity index 100%
rename from WpfMath.Shared/SymbolMappingNotFoundException.cs
rename to src/WpfMath.Shared/SymbolMappingNotFoundException.cs
diff --git a/WpfMath.Shared/SymbolNotFoundException.cs b/src/WpfMath.Shared/SymbolNotFoundException.cs
similarity index 100%
rename from WpfMath.Shared/SymbolNotFoundException.cs
rename to src/WpfMath.Shared/SymbolNotFoundException.cs
diff --git a/WpfMath.Shared/TexEnums.cs b/src/WpfMath.Shared/TexEnums.cs
similarity index 100%
rename from WpfMath.Shared/TexEnums.cs
rename to src/WpfMath.Shared/TexEnums.cs
diff --git a/WpfMath.Shared/TexFontMetrics.cs b/src/WpfMath.Shared/TexFontMetrics.cs
similarity index 100%
rename from WpfMath.Shared/TexFontMetrics.cs
rename to src/WpfMath.Shared/TexFontMetrics.cs
diff --git a/WpfMath.Shared/TexFontUtilities.cs b/src/WpfMath.Shared/TexFontUtilities.cs
similarity index 100%
rename from WpfMath.Shared/TexFontUtilities.cs
rename to src/WpfMath.Shared/TexFontUtilities.cs
diff --git a/WpfMath.Shared/TexUtilities.cs b/src/WpfMath.Shared/TexUtilities.cs
similarity index 100%
rename from WpfMath.Shared/TexUtilities.cs
rename to src/WpfMath.Shared/TexUtilities.cs
diff --git a/WpfMath.Shared/Utils/AssemblyEx.cs b/src/WpfMath.Shared/Utils/AssemblyEx.cs
similarity index 100%
rename from WpfMath.Shared/Utils/AssemblyEx.cs
rename to src/WpfMath.Shared/Utils/AssemblyEx.cs
diff --git a/WpfMath.Shared/Utils/Result.cs b/src/WpfMath.Shared/Utils/Result.cs
similarity index 100%
rename from WpfMath.Shared/Utils/Result.cs
rename to src/WpfMath.Shared/Utils/Result.cs
diff --git a/WpfMath.Shared/Utils/TupleExtensions.cs b/src/WpfMath.Shared/Utils/TupleExtensions.cs
similarity index 95%
rename from WpfMath.Shared/Utils/TupleExtensions.cs
rename to src/WpfMath.Shared/Utils/TupleExtensions.cs
index 5f33c6c1..f5dae37c 100644
--- a/WpfMath.Shared/Utils/TupleExtensions.cs
+++ b/src/WpfMath.Shared/Utils/TupleExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace WpfMath.Utils
 {
 #if NET452 // not needed for .NET Core 3.0+ because there are System.TupleExtensions
diff --git a/WpfMath.Shared/WpfMath.Shared.csproj b/src/WpfMath.Shared/WpfMath.Shared.csproj
similarity index 100%
rename from WpfMath.Shared/WpfMath.Shared.csproj
rename to src/WpfMath.Shared/WpfMath.Shared.csproj
diff --git a/WpfMath.Shared/XmlUtilities.cs b/src/WpfMath.Shared/XmlUtilities.cs
similarity index 100%
rename from WpfMath.Shared/XmlUtilities.cs
rename to src/WpfMath.Shared/XmlUtilities.cs
diff --git a/src/WpfMath/WpfMath.csproj b/src/WpfMath/WpfMath.csproj
index 0859b4ba..bd99139c 100644
--- a/src/WpfMath/WpfMath.csproj
+++ b/src/WpfMath/WpfMath.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-    
+
     <PropertyGroup>
         <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
         <UseWpf>true</UseWpf>
@@ -42,15 +42,15 @@ Fixed:
       <Resource Include="Fonts\cmr10.ttf" />
       <Resource Include="Fonts\cmsy10.ttf" />
     </ItemGroup>
-    
+
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\WpfMath.Shared\WpfMath.Shared.csproj" />
+        <ProjectReference Include="..\WpfMath.Shared\WpfMath.Shared.csproj" />
     </ItemGroup>
-    
+
     <ItemGroup>
         <InternalsVisibleTo Include="$(AssemblyName).Tests" />
     </ItemGroup>