Index: code/branches/libraries2/src/modules/pong/Pong.h
===================================================================
--- code/branches/libraries2/src/modules/pong/Pong.h	(revision 5725)
+++ code/branches/libraries2/src/modules/pong/Pong.h	(revision 5735)
@@ -33,5 +33,5 @@
 
 #include "tools/Timer.h"
-#include "objects/gametypes/Deathmatch.h"
+#include "gametypes/Deathmatch.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/pong/PongAI.cc
===================================================================
--- code/branches/libraries2/src/modules/pong/PongAI.cc	(revision 5725)
+++ code/branches/libraries2/src/modules/pong/PongAI.cc	(revision 5735)
@@ -32,5 +32,5 @@
 #include "core/ConfigValueIncludes.h"
 #include "tools/Timer.h"
-#include "objects/worldentities/ControllableEntity.h"
+#include "worldentities/ControllableEntity.h"
 #include "PongBall.h"
 
Index: code/branches/libraries2/src/modules/pong/PongAI.h
===================================================================
--- code/branches/libraries2/src/modules/pong/PongAI.h	(revision 5725)
+++ code/branches/libraries2/src/modules/pong/PongAI.h	(revision 5735)
@@ -35,5 +35,5 @@
 #include "util/Math.h"
 #include "tools/interfaces/Tickable.h"
-#include "objects/controllers/Controller.h"
+#include "controllers/Controller.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/pong/PongBall.cc
===================================================================
--- code/branches/libraries2/src/modules/pong/PongBall.cc	(revision 5725)
+++ code/branches/libraries2/src/modules/pong/PongBall.cc	(revision 5735)
@@ -31,5 +31,5 @@
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "objects/gametypes/Gametype.h"
+#include "gametypes/Gametype.h"
 #include "PongBat.h"
 #include "sound/SoundBase.h"
Index: code/branches/libraries2/src/modules/pong/PongBall.h
===================================================================
--- code/branches/libraries2/src/modules/pong/PongBall.h	(revision 5725)
+++ code/branches/libraries2/src/modules/pong/PongBall.h	(revision 5735)
@@ -33,5 +33,5 @@
 
 #include "util/Math.h"
-#include "objects/worldentities/MovableEntity.h"
+#include "worldentities/MovableEntity.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/pong/PongBat.h
===================================================================
--- code/branches/libraries2/src/modules/pong/PongBat.h	(revision 5725)
+++ code/branches/libraries2/src/modules/pong/PongBat.h	(revision 5735)
@@ -31,5 +31,5 @@
 
 #include "pong/PongPrereqs.h"
-#include "objects/worldentities/ControllableEntity.h"
+#include "worldentities/ControllableEntity.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/pong/PongBot.h
===================================================================
--- code/branches/libraries2/src/modules/pong/PongBot.h	(revision 5725)
+++ code/branches/libraries2/src/modules/pong/PongBot.h	(revision 5735)
@@ -31,5 +31,5 @@
 
 #include "pong/PongPrereqs.h"
-#include "objects/infos/Bot.h"
+#include "infos/Bot.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/pong/PongCenterpoint.h
===================================================================
--- code/branches/libraries2/src/modules/pong/PongCenterpoint.h	(revision 5725)
+++ code/branches/libraries2/src/modules/pong/PongCenterpoint.h	(revision 5735)
@@ -34,5 +34,5 @@
 #include <string>
 #include <util/Math.h>
-#include "objects/worldentities/StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox
Index: code/branches/libraries2/src/modules/pong/PongScore.cc
===================================================================
--- code/branches/libraries2/src/modules/pong/PongScore.cc	(revision 5725)
+++ code/branches/libraries2/src/modules/pong/PongScore.cc	(revision 5735)
@@ -33,5 +33,5 @@
 #include "core/XMLPort.h"
 #include "Pong.h"
-#include "objects/infos/PlayerInfo.h"
+#include "infos/PlayerInfo.h"
 
 namespace orxonox
