diff --git a/Start.sln b/Start.sln
index cc25f89..c8d7320 100644
--- a/Start.sln
+++ b/Start.sln
@@ -16,7 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Start_Tests", "Start_Tests\Start_Tests.csproj", "{74F33155-6FE2-409B-A5AC-52BC7433CE65}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Start.Tests", "Start\Tests\Start.Tests.csproj", "{74F33155-6FE2-409B-A5AC-52BC7433CE65}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Start_Tests/Client/MockApis/MockBookmarkContainersApi.cs b/Start/Tests/Client/MockApis/MockBookmarkContainersApi.cs
similarity index 100%
rename from Start_Tests/Client/MockApis/MockBookmarkContainersApi.cs
rename to Start/Tests/Client/MockApis/MockBookmarkContainersApi.cs
diff --git a/Start_Tests/Client/MockApis/MockBookmarkGroupsApi.cs b/Start/Tests/Client/MockApis/MockBookmarkGroupsApi.cs
similarity index 100%
rename from Start_Tests/Client/MockApis/MockBookmarkGroupsApi.cs
rename to Start/Tests/Client/MockApis/MockBookmarkGroupsApi.cs
diff --git a/Start_Tests/Client/MockApis/MockBookmarksApi.cs b/Start/Tests/Client/MockApis/MockBookmarksApi.cs
similarity index 100%
rename from Start_Tests/Client/MockApis/MockBookmarksApi.cs
rename to Start/Tests/Client/MockApis/MockBookmarksApi.cs
diff --git a/Start_Tests/Client/Store/ContainerListTests.cs b/Start/Tests/Client/Store/ContainerListTests.cs
similarity index 100%
rename from Start_Tests/Client/Store/ContainerListTests.cs
rename to Start/Tests/Client/Store/ContainerListTests.cs
diff --git a/Start_Tests/Client/Store/UnitTestWithFluxor.cs b/Start/Tests/Client/Store/UnitTestWithFluxor.cs
similarity index 100%
rename from Start_Tests/Client/Store/UnitTestWithFluxor.cs
rename to Start/Tests/Client/Store/UnitTestWithFluxor.cs
diff --git a/Start_Tests/Server/BookmarkServiceTests.cs b/Start/Tests/Server/BookmarkServiceTests.cs
similarity index 100%
rename from Start_Tests/Server/BookmarkServiceTests.cs
rename to Start/Tests/Server/BookmarkServiceTests.cs
diff --git a/Start_Tests/Server/UnitTestWithDb.cs b/Start/Tests/Server/UnitTestWithDb.cs
similarity index 100%
rename from Start_Tests/Server/UnitTestWithDb.cs
rename to Start/Tests/Server/UnitTestWithDb.cs
diff --git a/Start_Tests/Start_Tests.csproj b/Start/Tests/Start.Tests.csproj
similarity index 87%
rename from Start_Tests/Start_Tests.csproj
rename to Start/Tests/Start.Tests.csproj
index a4e273f..015e2b0 100644
--- a/Start_Tests/Start_Tests.csproj
+++ b/Start/Tests/Start.Tests.csproj
@@ -19,8 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Start\Server\Start.Server.csproj" />
-    <ProjectReference Include="..\Start\Shared\Start.Shared.csproj" />
+    <ProjectReference Include="..\Server\Start.Server.csproj" />
+    <ProjectReference Include="..\Shared\Start.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="Server\" />