diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 8d7a771f..40a35d5d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -55,7 +55,7 @@ jobs:
       with:
         architecture: x64
 
-    - run: msbuild WinStd.sln -t:Build -p:Configuration=Release -p:Platform=x64
+    - run: msbuild UnitTests\UnitTests.sln -t:Build -p:Configuration=Release -p:Platform=x64
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/.gitignore b/.gitignore
index daf2aa02..5df58667 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/.vs
-/Debug
 /doc
-/Release
-/x64
diff --git a/UnitTests/.gitignore b/UnitTests/.gitignore
index e9a4a85d..aead46e2 100644
--- a/UnitTests/.gitignore
+++ b/UnitTests/.gitignore
@@ -1,3 +1,4 @@
+/.vs
 /*.user
 /Debug
 /Release
diff --git a/WinStd.sln b/UnitTests/UnitTests.sln
similarity index 94%
rename from WinStd.sln
rename to UnitTests/UnitTests.sln
index 1f26b31f..36bb406a 100644
--- a/WinStd.sln
+++ b/UnitTests/UnitTests.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.32126.315
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{9AFC377D-C32D-4D42-82C2-09FC818020A2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests.vcxproj", "{9AFC377D-C32D-4D42-82C2-09FC818020A2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution