diff --git a/17_Bullfight/csharp/src/Action.cs b/17_Bullfight/csharp/Action.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/Action.cs
rename to 17_Bullfight/csharp/Action.cs
diff --git a/17_Bullfight/csharp/src/ActionResult.cs b/17_Bullfight/csharp/ActionResult.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/ActionResult.cs
rename to 17_Bullfight/csharp/ActionResult.cs
diff --git a/17_Bullfight/csharp/src/BullFight.cs b/17_Bullfight/csharp/BullFight.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/BullFight.cs
rename to 17_Bullfight/csharp/BullFight.cs
diff --git a/17_Bullfight/csharp/Game.csproj b/17_Bullfight/csharp/Bullfight.csproj
similarity index 100%
rename from 17_Bullfight/csharp/Game.csproj
rename to 17_Bullfight/csharp/Bullfight.csproj
diff --git a/17_Bullfight/csharp/Bullfight.sln b/17_Bullfight/csharp/Bullfight.sln
index 29f5276f..8c819db1 100644
--- a/17_Bullfight/csharp/Bullfight.sln
+++ b/17_Bullfight/csharp/Bullfight.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31321.278
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game", "Game.csproj", "{8F7C450E-5F3A-45BA-9DB9-329744214931}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bullfight", "Bullfight.csproj", "{502A672C-F7D7-4A85-973A-B5EA8761008A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,10 +11,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8F7C450E-5F3A-45BA-9DB9-329744214931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F7C450E-5F3A-45BA-9DB9-329744214931}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F7C450E-5F3A-45BA-9DB9-329744214931}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F7C450E-5F3A-45BA-9DB9-329744214931}.Release|Any CPU.Build.0 = Release|Any CPU
+		{502A672C-F7D7-4A85-973A-B5EA8761008A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{502A672C-F7D7-4A85-973A-B5EA8761008A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{502A672C-F7D7-4A85-973A-B5EA8761008A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{502A672C-F7D7-4A85-973A-B5EA8761008A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/17_Bullfight/csharp/src/Controller.cs b/17_Bullfight/csharp/Controller.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/Controller.cs
rename to 17_Bullfight/csharp/Controller.cs
diff --git a/17_Bullfight/csharp/src/Events/BullCharging.cs b/17_Bullfight/csharp/Events/BullCharging.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/Events/BullCharging.cs
rename to 17_Bullfight/csharp/Events/BullCharging.cs
diff --git a/17_Bullfight/csharp/src/Events/Event.cs b/17_Bullfight/csharp/Events/Event.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/Events/Event.cs
rename to 17_Bullfight/csharp/Events/Event.cs
diff --git a/17_Bullfight/csharp/src/Events/MatchCompleted.cs b/17_Bullfight/csharp/Events/MatchCompleted.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/Events/MatchCompleted.cs
rename to 17_Bullfight/csharp/Events/MatchCompleted.cs
diff --git a/17_Bullfight/csharp/src/Events/MatchStarted.cs b/17_Bullfight/csharp/Events/MatchStarted.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/Events/MatchStarted.cs
rename to 17_Bullfight/csharp/Events/MatchStarted.cs
diff --git a/17_Bullfight/csharp/src/Events/PlayerGored.cs b/17_Bullfight/csharp/Events/PlayerGored.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/Events/PlayerGored.cs
rename to 17_Bullfight/csharp/Events/PlayerGored.cs
diff --git a/17_Bullfight/csharp/src/Events/PlayerSurvived.cs b/17_Bullfight/csharp/Events/PlayerSurvived.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/Events/PlayerSurvived.cs
rename to 17_Bullfight/csharp/Events/PlayerSurvived.cs
diff --git a/17_Bullfight/csharp/src/Mediator.cs b/17_Bullfight/csharp/Mediator.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/Mediator.cs
rename to 17_Bullfight/csharp/Mediator.cs
diff --git a/17_Bullfight/csharp/src/Program.cs b/17_Bullfight/csharp/Program.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/Program.cs
rename to 17_Bullfight/csharp/Program.cs
diff --git a/17_Bullfight/csharp/src/Quality.cs b/17_Bullfight/csharp/Quality.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/Quality.cs
rename to 17_Bullfight/csharp/Quality.cs
diff --git a/17_Bullfight/csharp/src/Reward.cs b/17_Bullfight/csharp/Reward.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/Reward.cs
rename to 17_Bullfight/csharp/Reward.cs
diff --git a/17_Bullfight/csharp/src/RiskLevel.cs b/17_Bullfight/csharp/RiskLevel.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/RiskLevel.cs
rename to 17_Bullfight/csharp/RiskLevel.cs
diff --git a/17_Bullfight/csharp/src/View.cs b/17_Bullfight/csharp/View.cs
similarity index 100%
rename from 17_Bullfight/csharp/src/View.cs
rename to 17_Bullfight/csharp/View.cs