diff --git a/Assets/MasterServer/MasterServer.exe b/Assets/MasterServer/MasterServer.exe
deleted file mode 100644
index cd04bf0..0000000
Binary files a/Assets/MasterServer/MasterServer.exe and /dev/null differ
diff --git a/Assets/MasterServer.meta b/Assets/Resources/MasterServer.meta
similarity index 63%
rename from Assets/MasterServer.meta
rename to Assets/Resources/MasterServer.meta
index 2a9822f..5fc07fe 100644
--- a/Assets/MasterServer.meta
+++ b/Assets/Resources/MasterServer.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 56daf244fca3a6f4bbe6d21e80c0b1e1
+guid: a253231ab9a80034b8e15a81e69916a4
 folderAsset: yes
 DefaultImporter:
   userData: 
diff --git a/Assets/MasterServer/MasterServer.exe.meta b/Assets/Resources/MasterServer/MasterServer.exe.meta
similarity index 56%
rename from Assets/MasterServer/MasterServer.exe.meta
rename to Assets/Resources/MasterServer/MasterServer.exe.meta
index c953890..18631ad 100644
--- a/Assets/MasterServer/MasterServer.exe.meta
+++ b/Assets/Resources/MasterServer/MasterServer.exe.meta
@@ -1,4 +1,4 @@
 fileFormatVersion: 2
-guid: 9fb25238bb44e3441b4d79d37e292384
+guid: 0b0d091d67a524447b3bd74066167557
 DefaultImporter:
   userData: 
diff --git a/Assets/Scripts/Game specific/SpaceInvader/AliensManager.cs b/Assets/Scripts/Game specific/SpaceInvader/AliensManager.cs
index 66c8690..221a546 100644
--- a/Assets/Scripts/Game specific/SpaceInvader/AliensManager.cs	
+++ b/Assets/Scripts/Game specific/SpaceInvader/AliensManager.cs	
@@ -163,7 +163,7 @@ public void onAlienDeath()
 		if (deathCount == alienCount)
         {
             EventManager<bool>.Raise(EnumEvent.RESTARTGAME, true);
-            victoryCount++;
+            victoryCount += 2;
         }
 	}
 
diff --git a/Assets/Scripts/Game/QuestionManager.cs b/Assets/Scripts/Game/QuestionManager.cs
index 2471656..45bf418 100644
--- a/Assets/Scripts/Game/QuestionManager.cs
+++ b/Assets/Scripts/Game/QuestionManager.cs
@@ -380,7 +380,7 @@ public void update()
     {
         if(waitForAnswers)
         {
-            if(Time.time - questionSendTime > 5)
+            if(Time.time - questionSendTime > 15)
             {
                 checkClientsAnswers();
                 sendResults();
diff --git a/Assets/Scripts/Network/C3PONetwork.cs b/Assets/Scripts/Network/C3PONetwork.cs
index 7a60147..148dd3f 100644
--- a/Assets/Scripts/Network/C3PONetwork.cs
+++ b/Assets/Scripts/Network/C3PONetwork.cs
@@ -212,7 +212,7 @@ public void broadCastSomething(string s)
 	public void createTeacherServer()
 	{
 		/* Launch MasterServer */
-        System.Diagnostics.Process.Start(Application.dataPath + @"\MasterServer\MasterServer.exe");
+        System.Diagnostics.Process.Start(Application.dataPath + @"\Resources\MasterServer\MasterServer.exe");
 
         /* Bind to it */
 		MasterServer.port = masterPort;
diff --git a/Assets/Scripts/UI/QuestionAnswerMenu.cs b/Assets/Scripts/UI/QuestionAnswerMenu.cs
index f7d23bb..2f80803 100644
--- a/Assets/Scripts/UI/QuestionAnswerMenu.cs
+++ b/Assets/Scripts/UI/QuestionAnswerMenu.cs
@@ -29,7 +29,7 @@ public class QuestionAnswerMenu : MonoBehaviour {
 
     bool answered;
     private float startTime;
-    private const float questionTime = 5;
+    private const float questionTime = 15;
 
     public void setQuestionText(string q)
     {