diff --git a/new-cli/GitVersion.Common/GitVersion.Common.csproj b/new-cli/GitVersion.Common/GitVersion.Common.csproj
index 6b7ac37412..3ad6df8285 100644
--- a/new-cli/GitVersion.Common/GitVersion.Common.csproj
+++ b/new-cli/GitVersion.Common/GitVersion.Common.csproj
@@ -64,23 +64,23 @@
     <Compile Include="..\..\src\GitVersion.Core\Git\RefSpecDirection.cs">
       <Link>Git\RefSpecDirection.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\GitVersion.Core\Git\SemanticVersion.cs">
-        <Link>Git\SemanticVersion.cs</Link>
+    <Compile Include="..\..\src\GitVersion.Core\SemVer\SemanticVersion.cs">
+        <Link>SemVer\SemanticVersion.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\GitVersion.Core\Git\SemanticVersionBuildMetaData.cs">
-        <Link>Git\SemanticVersionBuildMetaData.cs</Link>
+    <Compile Include="..\..\src\GitVersion.Core\SemVer\SemanticVersionBuildMetaData.cs">
+        <Link>SemVer\SemanticVersionBuildMetaData.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\GitVersion.Core\Git\SemanticVersionFormat.cs">
-        <Link>Git\SemanticVersionFormat.cs</Link>
+    <Compile Include="..\..\src\GitVersion.Core\SemVer\SemanticVersionFormat.cs">
+        <Link>SemVer\SemanticVersionFormat.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\GitVersion.Core\Git\SemanticVersionPreReleaseTag.cs">
-        <Link>Git\SemanticVersionPreReleaseTag.cs</Link>
+    <Compile Include="..\..\src\GitVersion.Core\SemVer\SemanticVersionPreReleaseTag.cs">
+        <Link>SemVer\SemanticVersionPreReleaseTag.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\GitVersion.Core\Git\VersionField.cs">
-        <Link>Git\VersionField.cs</Link>
+    <Compile Include="..\..\src\GitVersion.Core\SemVer\VersionField.cs">
+        <Link>SemVer\VersionField.cs</Link>
     </Compile>
-    <Compile Include="..\..\src\GitVersion.Core\Git\WarningException.cs">
-        <Link>Git\WarningException.cs</Link>
+    <Compile Include="..\..\src\GitVersion.Core\Core\Exceptions\WarningException.cs">
+        <Link>Exceptions\WarningException.cs</Link>
     </Compile>
   </ItemGroup>
 </Project>
diff --git a/src/GitVersion.Core/Git/WarningException.cs b/src/GitVersion.Core/Core/Exceptions/WarningException.cs
similarity index 100%
rename from src/GitVersion.Core/Git/WarningException.cs
rename to src/GitVersion.Core/Core/Exceptions/WarningException.cs
diff --git a/src/GitVersion.Core/BranchCommit.cs b/src/GitVersion.Core/Git/BranchCommit.cs
similarity index 100%
rename from src/GitVersion.Core/BranchCommit.cs
rename to src/GitVersion.Core/Git/BranchCommit.cs
diff --git a/src/GitVersion.Core/Git/SemanticVersion.cs b/src/GitVersion.Core/SemVer/SemanticVersion.cs
similarity index 100%
rename from src/GitVersion.Core/Git/SemanticVersion.cs
rename to src/GitVersion.Core/SemVer/SemanticVersion.cs
diff --git a/src/GitVersion.Core/Git/SemanticVersionBuildMetaData.cs b/src/GitVersion.Core/SemVer/SemanticVersionBuildMetaData.cs
similarity index 100%
rename from src/GitVersion.Core/Git/SemanticVersionBuildMetaData.cs
rename to src/GitVersion.Core/SemVer/SemanticVersionBuildMetaData.cs
diff --git a/src/GitVersion.Core/Git/SemanticVersionFormat.cs b/src/GitVersion.Core/SemVer/SemanticVersionFormat.cs
similarity index 100%
rename from src/GitVersion.Core/Git/SemanticVersionFormat.cs
rename to src/GitVersion.Core/SemVer/SemanticVersionFormat.cs
diff --git a/src/GitVersion.Core/Git/SemanticVersionPreReleaseTag.cs b/src/GitVersion.Core/SemVer/SemanticVersionPreReleaseTag.cs
similarity index 100%
rename from src/GitVersion.Core/Git/SemanticVersionPreReleaseTag.cs
rename to src/GitVersion.Core/SemVer/SemanticVersionPreReleaseTag.cs
diff --git a/src/GitVersion.Core/Git/VersionField.cs b/src/GitVersion.Core/SemVer/VersionField.cs
similarity index 100%
rename from src/GitVersion.Core/Git/VersionField.cs
rename to src/GitVersion.Core/SemVer/VersionField.cs