Index: code/branches/consolecommands3/src/libraries/core/BaseObject.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/BaseObject.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/BaseObject.cc	(revision 7204)
@@ -39,5 +39,4 @@
 #include "Event.h"
 #include "EventIncludes.h"
-#include "Functor.h"
 #include "Iterator.h"
 #include "Template.h"
@@ -45,4 +44,5 @@
 #include "XMLNameListener.h"
 #include "XMLPort.h"
+#include "command/Functor.h"
 
 namespace orxonox
Index: code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc	(revision 7204)
@@ -34,7 +34,7 @@
 #include "util/Math.h"
 #include "util/StringUtils.h"
-#include "ConsoleCommand.h"
 #include "ConfigValueContainer.h"
 #include "PathConfig.h"
+#include "command/ConsoleCommand.h"
 
 namespace orxonox
Index: code/branches/consolecommands3/src/libraries/core/Core.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/Core.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/Core.cc	(revision 7204)
@@ -54,5 +54,4 @@
 #include "util/SignalHandler.h"
 #include "PathConfig.h"
-#include "CommandExecutor.h"
 #include "CommandLineParser.h"
 #include "ConfigFileManager.h"
@@ -65,9 +64,10 @@
 #include "Identifier.h"
 #include "Language.h"
-#include "IOConsole.h"
 #include "LuaState.h"
 #include "ScopedSingletonManager.h"
-#include "TclBind.h"
-#include "TclThreadManager.h"
+#include "command/CommandExecutor.h"
+#include "command/IOConsole.h"
+#include "command/TclBind.h"
+#include "command/TclThreadManager.h"
 #include "input/InputManager.h"
 
Index: code/branches/consolecommands3/src/libraries/core/CorePrereqs.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/CorePrereqs.h	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/CorePrereqs.h	(revision 7204)
@@ -116,6 +116,4 @@
     typedef std::string LanguageEntryLabel;
 
-    class ArgumentCompleter;
-    class ArgumentCompletionListElement;
     class BaseObject;
     template <class T>
@@ -127,5 +125,4 @@
     class ClassTreeMaskNode;
     class ClassTreeMaskObjectIterator;
-    class CommandEvaluation;
     class CommandLineParser;
     class CommandLineArgument;
@@ -137,5 +134,4 @@
     class ConfigFileSection;
     class ConfigValueContainer;
-    class ConsoleCommand;
     class Core;
     class DynLib;
@@ -143,13 +139,5 @@
     struct Event;
     class EventState;
-    class Executor;
-    template <class T>
-    class ExecutorMember;
-    class ExecutorStatic;
     class Factory;
-    class Functor;
-    template <class T>
-    class FunctorMember;
-    class FunctorStatic;
     class Game;
     class GameState;
@@ -159,6 +147,4 @@
     class GUIManager;
     class Identifier;
-    class IOConsole;
-    class IRC;
     template <class T>
     class Iterator;
@@ -185,15 +171,8 @@
     struct ResourceInfo;
     class SettingsConfigFile;
-    class Shell;
-    class ShellListener;
     template <class T>
     class SmartPtr;
     template <class T>
     class SubclassIdentifier;
-    class TclBind;
-    struct TclInterpreterBundle;
-    template <class T>
-    class TclThreadList;
-    class TclThreadManager;
     class Template;
     class Thread;
@@ -210,4 +189,27 @@
     class XMLPortObjectContainer;
     class XMLPortParamContainer;
+
+    // Command
+    class ArgumentCompleter;
+    class ArgumentCompletionListElement;
+    class CommandEvaluation;
+    class ConsoleCommand;
+    class Executor;
+    template <class T>
+    class ExecutorMember;
+    class ExecutorStatic;
+    class Functor;
+    template <class T>
+    class FunctorMember;
+    class FunctorStatic;
+    class IOConsole;
+    class IRC;
+    class Shell;
+    class ShellListener;
+    class TclBind;
+    struct TclInterpreterBundle;
+    template <class T>
+    class TclThreadList;
+    class TclThreadManager;
 
     // Input
@@ -236,6 +238,6 @@
 }
 
-#include "FunctorPtr.h"
-#include "ExecutorPtr.h"
+#include "command/FunctorPtr.h"
+#include "command/ExecutorPtr.h"
 
 // CppTcl
Index: code/branches/consolecommands3/src/libraries/core/EventIncludes.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/EventIncludes.h	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/EventIncludes.h	(revision 7204)
@@ -31,6 +31,6 @@
 
 #include "CorePrereqs.h"
-#include "Executor.h"
 #include "XMLPort.h"
+#include "command/Executor.h"
 
 /**
Index: code/branches/consolecommands3/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/GUIManager.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/GUIManager.cc	(revision 7204)
@@ -57,5 +57,4 @@
 #include "util/Exception.h"
 #include "util/OrxAssert.h"
-#include "ConsoleCommand.h"
 #include "Core.h"
 #include "GraphicsManager.h"
@@ -63,4 +62,5 @@
 #include "PathConfig.h"
 #include "Resource.h"
+#include "command/ConsoleCommand.h"
 #include "input/InputManager.h"
 #include "input/InputState.h"
Index: code/branches/consolecommands3/src/libraries/core/Game.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/Game.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/Game.cc	(revision 7204)
@@ -45,5 +45,4 @@
 #include "util/SubString.h"
 #include "CommandLineParser.h"
-#include "ConsoleCommand.h"
 #include "Core.h"
 #include "CoreIncludes.h"
@@ -52,4 +51,5 @@
 #include "GameState.h"
 #include "GUIManager.h"
+#include "command/ConsoleCommand.h"
 
 namespace orxonox
Index: code/branches/consolecommands3/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/GraphicsManager.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/GraphicsManager.cc	(revision 7204)
@@ -52,5 +52,4 @@
 #include "util/StringUtils.h"
 #include "util/SubString.h"
-#include "ConsoleCommand.h"
 #include "ConfigValueIncludes.h"
 #include "CoreIncludes.h"
@@ -62,4 +61,5 @@
 #include "WindowEventListener.h"
 #include "XMLFile.h"
+#include "command/ConsoleCommand.h"
 
 namespace orxonox
Index: code/branches/consolecommands3/src/libraries/core/Identifier.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/Identifier.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/Identifier.cc	(revision 7204)
@@ -38,7 +38,7 @@
 #include "util/StringUtils.h"
 #include "ConfigValueContainer.h"
-#include "ConsoleCommand.h"
 #include "ClassFactory.h"
 #include "XMLPort.h"
+#include "command/ConsoleCommand.h"
 
 namespace orxonox
Index: code/branches/consolecommands3/src/libraries/core/LuaState.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/LuaState.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/LuaState.cc	(revision 7204)
@@ -39,7 +39,7 @@
 #include "util/Exception.h"
 #include "util/ScopeGuard.h"
-#include "IOConsole.h"
 #include "Resource.h"
 #include "ToluaBindCore.h"
+#include "command/IOConsole.h"
 
 namespace orxonox
Index: code/branches/consolecommands3/src/libraries/core/Thread.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/Thread.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/Thread.cc	(revision 7204)
@@ -36,5 +36,5 @@
 
 #include "util/Sleep.h"
-#include "Executor.h"
+#include "command/Executor.h"
 
 namespace orxonox
Index: code/branches/consolecommands3/src/libraries/core/WeakPtr.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/WeakPtr.h	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/WeakPtr.h	(revision 7204)
@@ -36,5 +36,5 @@
 #include <cassert>
 #include "OrxonoxClass.h"
-#include "Functor.h"
+#include "command/Functor.h"
 
 namespace orxonox
Index: code/branches/consolecommands3/src/libraries/core/XMLPort.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/XMLPort.h	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/XMLPort.h	(revision 7204)
@@ -53,6 +53,6 @@
 #include "util/StringUtils.h"
 #include "Identifier.h"
-#include "Executor.h"
 #include "BaseObject.h"
+#include "command/Executor.h"
 
 // ------------
Index: code/branches/consolecommands3/src/libraries/core/input/Button.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/Button.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/Button.cc	(revision 7204)
@@ -39,7 +39,7 @@
 #include "util/StringUtils.h"
 #include "util/Debug.h"
-#include "core/ConsoleCommand.h"
-#include "core/CommandEvaluation.h"
-#include "core/CommandExecutor.h"
+#include "core/command/ConsoleCommand.h"
+#include "core/command/CommandEvaluation.h"
+#include "core/command/CommandExecutor.h"
 #include "core/ConfigFileManager.h"
 
Index: code/branches/consolecommands3/src/libraries/core/input/HalfAxis.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/HalfAxis.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/HalfAxis.cc	(revision 7204)
@@ -34,5 +34,5 @@
 
 #include "HalfAxis.h"
-#include "core/CommandEvaluation.h"
+#include "core/command/CommandEvaluation.h"
 
 namespace orxonox
Index: code/branches/consolecommands3/src/libraries/core/input/InputCommands.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/InputCommands.h	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/InputCommands.h	(revision 7204)
@@ -37,5 +37,5 @@
 
 #include "InputPrereqs.h"
-#include "core/CommandEvaluation.h"
+#include "core/command/CommandEvaluation.h"
 
 namespace orxonox
Index: code/branches/consolecommands3/src/libraries/core/input/InputManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/InputManager.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/InputManager.cc	(revision 7204)
@@ -47,8 +47,8 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/ConsoleCommand.h"
 #include "core/CommandLineParser.h"
-#include "core/Functor.h"
 #include "core/GraphicsManager.h"
+#include "core/command/ConsoleCommand.h"
+#include "core/command/Functor.h"
 
 #include "InputBuffer.h"
Index: code/branches/consolecommands3/src/libraries/core/input/InputState.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/InputState.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/InputState.cc	(revision 7204)
@@ -28,5 +28,5 @@
 
 #include "InputState.h"
-#include "core/Functor.h"
+#include "core/command/Functor.h"
 
 namespace orxonox
Index: code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/KeyBinderManager.cc	(revision 7204)
@@ -32,8 +32,8 @@
 #include "util/Exception.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
 #include "core/LuaState.h"
 #include "core/ScopedSingletonManager.h"
+#include "core/command/ConsoleCommand.h"
 #include "InputManager.h"
 #include "KeyDetector.h"
Index: code/branches/consolecommands3/src/libraries/core/input/KeyDetector.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/KeyDetector.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/KeyDetector.cc	(revision 7204)
@@ -29,7 +29,7 @@
 #include "KeyDetector.h"
 
-#include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
 #include "core/ScopedSingletonManager.h"
+#include "core/command/ConsoleCommand.h"
 #include "Button.h"
 #include "InputManager.h"
Index: code/branches/consolecommands3/src/libraries/core/input/Mouse.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/input/Mouse.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/core/input/Mouse.cc	(revision 7204)
@@ -30,6 +30,6 @@
 
 #include <ois/OISMouse.h>
-#include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
+#include "core/command/ConsoleCommand.h"
 #include "InputState.h"
 
Index: code/branches/consolecommands3/src/libraries/network/GamestateManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/network/GamestateManager.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/network/GamestateManager.cc	(revision 7204)
@@ -47,6 +47,6 @@
 
 #include "util/Debug.h"
-#include "core/Executor.h"
 #include "core/ThreadPool.h"
+#include "core/command/Executor.h"
 #include "ClientInformation.h"
 #include "packet/Acknowledgement.h"
Index: code/branches/consolecommands3/src/libraries/network/Host.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/network/Host.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/network/Host.cc	(revision 7204)
@@ -32,6 +32,6 @@
 #include <string>
 
-#include "core/ConsoleCommand.h"
 #include "core/ObjectList.h"
+#include "core/command/ConsoleCommand.h"
 #include "ChatListener.h"
 
Index: code/branches/consolecommands3/src/libraries/network/NetworkFunction.h
===================================================================
--- code/branches/consolecommands3/src/libraries/network/NetworkFunction.h	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/network/NetworkFunction.h	(revision 7204)
@@ -39,6 +39,6 @@
 #include <boost/static_assert.hpp>
 
-#include "core/Functor.h"
 #include "core/Identifier.h"
+#include "core/command/Functor.h"
 #include "FunctionCallManager.h"
 #include "synchronisable/Synchronisable.h"
Index: code/branches/consolecommands3/src/libraries/network/Server.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/network/Server.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/network/Server.cc	(revision 7204)
@@ -49,5 +49,5 @@
 #include "util/Debug.h"
 #include "core/ObjectList.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
 #include "packet/Chat.h"
 #include "packet/ClassID.h"
Index: code/branches/consolecommands3/src/libraries/tools/Timer.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/tools/Timer.cc	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/tools/Timer.cc	(revision 7204)
@@ -33,7 +33,7 @@
 #include "util/Clock.h"
 #include "core/CoreIncludes.h"
-#include "core/ConsoleCommand.h"
-#include "core/CommandExecutor.h"
-#include "core/Functor.h"
+#include "core/command/ConsoleCommand.h"
+#include "core/command/CommandExecutor.h"
+#include "core/command/Functor.h"
 
 namespace orxonox
Index: code/branches/consolecommands3/src/libraries/tools/Timer.h
===================================================================
--- code/branches/consolecommands3/src/libraries/tools/Timer.h	(revision 7203)
+++ code/branches/consolecommands3/src/libraries/tools/Timer.h	(revision 7204)
@@ -44,5 +44,5 @@
 
     source.cc:
-        include "core/Executor.h"
+        #include "core/command/Executor.h"
 
         ClassName::ClassName()
@@ -63,6 +63,6 @@
 #include "tools/ToolsPrereqs.h"
 
-#include "core/Executor.h"
 #include "core/OrxonoxClass.h"
+#include "core/command/Executor.h"
 #include "tools/interfaces/TimeFactorListener.h"
 
