diff --git a/60_Mastermind/csharp/Game/src/Code.cs b/60_Mastermind/csharp/Code.cs
similarity index 100%
rename from 60_Mastermind/csharp/Game/src/Code.cs
rename to 60_Mastermind/csharp/Code.cs
diff --git a/60_Mastermind/csharp/Game/src/CodeFactory.cs b/60_Mastermind/csharp/CodeFactory.cs
similarity index 100%
rename from 60_Mastermind/csharp/Game/src/CodeFactory.cs
rename to 60_Mastermind/csharp/CodeFactory.cs
diff --git a/60_Mastermind/csharp/Game/src/ColorInfo.cs b/60_Mastermind/csharp/ColorInfo.cs
similarity index 100%
rename from 60_Mastermind/csharp/Game/src/ColorInfo.cs
rename to 60_Mastermind/csharp/ColorInfo.cs
diff --git a/60_Mastermind/csharp/Game/src/Colors.cs b/60_Mastermind/csharp/Colors.cs
similarity index 100%
rename from 60_Mastermind/csharp/Game/src/Colors.cs
rename to 60_Mastermind/csharp/Colors.cs
diff --git a/60_Mastermind/csharp/Game/src/Command.cs b/60_Mastermind/csharp/Command.cs
similarity index 100%
rename from 60_Mastermind/csharp/Game/src/Command.cs
rename to 60_Mastermind/csharp/Command.cs
diff --git a/60_Mastermind/csharp/Game/src/Controller.cs b/60_Mastermind/csharp/Controller.cs
similarity index 100%
rename from 60_Mastermind/csharp/Game/src/Controller.cs
rename to 60_Mastermind/csharp/Controller.cs
diff --git a/60_Mastermind/csharp/Game/src/EnumerableExtensions.cs b/60_Mastermind/csharp/EnumerableExtensions.cs
similarity index 100%
rename from 60_Mastermind/csharp/Game/src/EnumerableExtensions.cs
rename to 60_Mastermind/csharp/EnumerableExtensions.cs
diff --git a/60_Mastermind/csharp/Game/Game.csproj b/60_Mastermind/csharp/Mastermind.csproj
similarity index 100%
rename from 60_Mastermind/csharp/Game/Game.csproj
rename to 60_Mastermind/csharp/Mastermind.csproj
diff --git a/60_Mastermind/csharp/Mastermind.sln b/60_Mastermind/csharp/Mastermind.sln
index c3827fb7..0da53b6d 100644
--- a/60_Mastermind/csharp/Mastermind.sln
+++ b/60_Mastermind/csharp/Mastermind.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31321.278
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game", "Game\Game.csproj", "{E8D63140-971D-4FBF-8138-964E54CCB7DD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mastermind", "Mastermind.csproj", "{AEC839CD-C6D3-4476-AA85-79B160AF78BE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E8D63140-971D-4FBF-8138-964E54CCB7DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8D63140-971D-4FBF-8138-964E54CCB7DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E8D63140-971D-4FBF-8138-964E54CCB7DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E8D63140-971D-4FBF-8138-964E54CCB7DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AEC839CD-C6D3-4476-AA85-79B160AF78BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEC839CD-C6D3-4476-AA85-79B160AF78BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AEC839CD-C6D3-4476-AA85-79B160AF78BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AEC839CD-C6D3-4476-AA85-79B160AF78BE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/60_Mastermind/csharp/Game/src/Program.cs b/60_Mastermind/csharp/Program.cs
similarity index 100%
rename from 60_Mastermind/csharp/Game/src/Program.cs
rename to 60_Mastermind/csharp/Program.cs
diff --git a/60_Mastermind/csharp/Game/src/TurnResult.cs b/60_Mastermind/csharp/TurnResult.cs
similarity index 100%
rename from 60_Mastermind/csharp/Game/src/TurnResult.cs
rename to 60_Mastermind/csharp/TurnResult.cs
diff --git a/60_Mastermind/csharp/Game/src/View.cs b/60_Mastermind/csharp/View.cs
similarity index 100%
rename from 60_Mastermind/csharp/Game/src/View.cs
rename to 60_Mastermind/csharp/View.cs