Index: code/branches/gui/src/orxonox/gamestates/GSClient.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSClient.cc	(revision 2847)
+++ code/branches/gui/src/orxonox/gamestates/GSClient.cc	(revision 2848)
@@ -33,7 +33,7 @@
 #include "core/Clock.h"
 #include "core/CommandLine.h"
-#include "core/Core.h"
+#include "core/Game.h"
+#include "core/GameMode.h"
 #include "network/Client.h"
-#include "core/Game.h"
 
 namespace orxonox
@@ -55,5 +55,5 @@
     void GSClient::activate()
     {
-        Core::setIsClient(true);
+        GameMode::setIsClient(true);
 
         this->client_ = new Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
@@ -72,5 +72,5 @@
         delete this->client_;
 
-        Core::setIsClient(false);
+        GameMode::setIsClient(false);
     }
 
Index: code/branches/gui/src/orxonox/gamestates/GSDedicated.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSDedicated.cc	(revision 2847)
+++ code/branches/gui/src/orxonox/gamestates/GSDedicated.cc	(revision 2848)
@@ -32,10 +32,10 @@
 #include "core/Clock.h"
 #include "core/CommandLine.h"
-#include "core/Core.h"
+#include "core/Game.h"
+#include "core/GameMode.h"
 #include "core/Iterator.h"
 #include "network/Server.h"
 #include "objects/Tickable.h"
 #include "util/Sleep.h"
-#include "core/Game.h"
 
 namespace orxonox
@@ -56,5 +56,5 @@
     void GSDedicated::activate()
     {
-        Core::setHasServer(true);
+        GameMode::setHasServer(true);
 
         this->server_ = new Server(CommandLine::getValue("port"));
@@ -69,5 +69,5 @@
         delete this->server_;
 
-        Core::setHasServer(false);
+        GameMode::setHasServer(false);
     }
 
Index: code/branches/gui/src/orxonox/gamestates/GSGUI.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSGUI.cc	(revision 2847)
+++ code/branches/gui/src/orxonox/gamestates/GSGUI.cc	(revision 2848)
@@ -33,9 +33,9 @@
 #include "core/Clock.h"
 #include "core/ConsoleCommand.h"
+#include "core/Game.h"
 #include "core/input/InputManager.h"
 #include "core/input/SimpleInputState.h"
 #include "gui/GUIManager.h"
 #include "GraphicsManager.h"
-#include "core/Game.h"
 
 namespace orxonox
Index: code/branches/gui/src/orxonox/gamestates/GSGraphics.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSGraphics.cc	(revision 2847)
+++ code/branches/gui/src/orxonox/gamestates/GSGraphics.cc	(revision 2848)
@@ -38,4 +38,5 @@
 #include "core/CoreIncludes.h"
 #include "core/Game.h"
+#include "core/GameMode.h"
 #include "core/input/InputManager.h"
 #include "core/input/KeyBinder.h"
@@ -74,5 +75,5 @@
     void GSGraphics::activate()
     {
-        Core::setShowsGraphics(true);
+        GameMode::setShowsGraphics(true);
 
         setConfigValues();
@@ -128,5 +129,5 @@
         delete graphicsManager_;
 
-        Core::setShowsGraphics(false);
+        GameMode::setShowsGraphics(false);
     }
 
Index: code/branches/gui/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSLevel.cc	(revision 2847)
+++ code/branches/gui/src/orxonox/gamestates/GSLevel.cc	(revision 2848)
@@ -39,6 +39,8 @@
 #include "core/CommandLine.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
-#include "core/Core.h"
+#include "core/Game.h"
+#include "core/GameMode.h"
 #include "objects/Tickable.h"
 #include "objects/Radar.h"
@@ -47,5 +49,4 @@
 #include "LevelManager.h"
 #include "PlayerManager.h"
-#include "core/Game.h"
 
 namespace orxonox
@@ -83,5 +84,5 @@
         setConfigValues();
 
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
         {
             inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("game");
@@ -99,5 +100,5 @@
         this->playerManager_ = new PlayerManager();
 
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             // create the global LevelManager
@@ -107,5 +108,5 @@
         }
 
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
         {
             // TODO: insert slomo console command with
@@ -149,8 +150,8 @@
         //Loader::close();
 
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
             InputManager::getInstance().requestLeaveState("game");
 
-        if (Core::isMaster())
+        if (GameMode::isMaster())
             this->unloadLevel();
 
@@ -179,5 +180,5 @@
         }
 
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
         {
             inputState_->setHandler(0);
@@ -240,5 +241,5 @@
     void GSLevel::keybindInternal(const std::string& command, bool bTemporary)
     {
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
         {
             static std::string bindingString = "";
Index: code/branches/gui/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSRoot.cc	(revision 2847)
+++ code/branches/gui/src/orxonox/gamestates/GSRoot.cc	(revision 2848)
@@ -33,5 +33,6 @@
 #include "util/Debug.h"
 #include "core/Clock.h"
-#include "core/Core.h"
+#include "core/Game.h"
+#include "core/GameMode.h"
 #include "core/CommandLine.h"
 #include "core/ConsoleCommand.h"
@@ -39,5 +40,4 @@
 #include "tools/Timer.h"
 #include "objects/Tickable.h"
-#include "core/Game.h"
 
 namespace orxonox
@@ -142,5 +142,5 @@
     void GSRoot::setTimeFactor(float factor)
     {
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             if (!this->bPaused_)
@@ -160,5 +160,5 @@
     void GSRoot::pause()
     {
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             if (!this->bPaused_)
Index: code/branches/gui/src/orxonox/gamestates/GSServer.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSServer.cc	(revision 2847)
+++ code/branches/gui/src/orxonox/gamestates/GSServer.cc	(revision 2848)
@@ -31,7 +31,7 @@
 
 #include "core/CommandLine.h"
-#include "core/Core.h"
+#include "core/Game.h"
+#include "core/GameMode.h"
 #include "network/Server.h"
-#include "core/Game.h"
 
 namespace orxonox
@@ -53,5 +53,5 @@
     void GSServer::activate()
     {
-        Core::setHasServer(true);
+        GameMode::setHasServer(true);
 
         this->server_ = new Server(CommandLine::getValue("port"));
@@ -66,5 +66,5 @@
         delete this->server_;
 
-        Core::setHasServer(false);
+        GameMode::setHasServer(false);
     }
 
Index: code/branches/gui/src/orxonox/gamestates/GSStandalone.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSStandalone.cc	(revision 2847)
+++ code/branches/gui/src/orxonox/gamestates/GSStandalone.cc	(revision 2848)
@@ -32,9 +32,9 @@
 #include <OgreViewport.h>
 #include <OgreCamera.h>
-#include "core/Core.h"
+#include "core/Game.h"
+#include "core/GameMode.h"
 #include "core/ConsoleCommand.h"
 #include "gui/GUIManager.h"
 #include "GraphicsManager.h"
-#include "core/Game.h"
 
 namespace orxonox
@@ -54,5 +54,5 @@
     void GSStandalone::activate()
     {
-        Core::setIsStandalone(true);
+        GameMode::setIsStandalone(true);
 
         guiManager_ = GUIManager::getInstancePtr();
@@ -63,5 +63,5 @@
     void GSStandalone::deactivate()
     {
-        Core::setIsStandalone(false);
+        GameMode::setIsStandalone(false);
     }
 
