Changed folder structure.

src/Game.cpp

@@ -10,8 +10,8 @@
 #include <Thor/Vectors.hpp>
 
 #include "generator/Generator.h"
-#include "items/Heal.h"
-#include "items/Shield.h"
+#include "sprites/items/Heal.h"
+#include "sprites/items/Shield.h"
 #include "sprites/Enemy.h"
 #include "sprites/Player.h"
 #include "util/Loader.h"

src/World.h

@@ -8,8 +8,8 @@
 #ifndef DG_WORLD_H_
 #define DG_WORLD_H_
 
-#include "abstract/Character.h"
-#include "abstract/Sprite.h"
+#include "sprites/abstract/Character.h"
+#include "sprites/abstract/Sprite.h"
 
 class Character;
 class Sprite;

src/sprites/Corpse.h

@@ -8,7 +8,7 @@
 #ifndef DG_CORPSE_H_
 #define DG_CORPSE_H_
 
-#include "../abstract/Circle.h"
+#include "abstract/Circle.h"
 
 class Corpse : public Circle {
 public:

src/sprites/Enemy.h

@@ -8,7 +8,7 @@
 #ifndef DG_ENEMY_H_
 #define DG_ENEMY_H
 
-#include "../abstract/Character.h"
+#include "../sprites/abstract/Character.h"
 
 class World;
 

src/sprites/Player.h

@@ -8,7 +8,7 @@
 #ifndef DG_PLAYER_H_
 #define DG_PLAYER_H_
 
-#include "../abstract/Character.h"
+#include "abstract/Character.h"
 
 class World;
 

src/sprites/RotatingShield.h

@@ -8,7 +8,7 @@
 #ifndef DG_ROTATINGSHIELD_H_
 #define DG_ROTATINGSHIELD_H_
 
-#include "../abstract/Rectangle.h"
+#include "abstract/Rectangle.h"
 
 class RotatingShield : public Rectangle {
 public:

src/sprites/Tile.h

@@ -8,7 +8,7 @@
 #ifndef DG_TILE_H_
 #define DG_TILE_H_
 
-#include "../abstract/Rectangle.h"
+#include "abstract/Rectangle.h"
 
 class World;
 

src/sprites/abstract/Character.cpp

@@ -10,11 +10,11 @@
 #include <Thor/Vectors.hpp>
 
 #include "../items/Weapon.h"
-#include "../sprites/Corpse.h"
-#include "../util/Log.h"
-#include "../util/Yaml.h"
-#include "../World.h"
-#include "../Pathfinder.h"
+#include "../Corpse.h"
+#include "../../util/Log.h"
+#include "../../util/Yaml.h"
+#include "../../World.h"
+#include "../../Pathfinder.h"
 
 const float Character::VISION_DISTANCE = 500.0f;
 const float Character::POINT_REACHED_DISTANCE = 1.0f;

src/sprites/abstract/Circle.cpp

@@ -8,7 +8,7 @@
 #include "Circle.h"
 
 #include "Rectangle.h"
-#include "../util/Yaml.h"
+#include "../../util/Yaml.h"
 
 Circle::Circle(const Vector2f& position, Category category,
 			unsigned short mask, const Yaml& config,

src/sprites/abstract/CollisionModel.cpp

@@ -13,7 +13,7 @@
 
 #include "Circle.h"
 #include "Rectangle.h"
-#include "../util/Interval.h"
+#include "../../util/Interval.h"
 
 CollisionModel::~CollisionModel() {
 }

src/sprites/abstract/CollisionModel.h

@@ -11,7 +11,7 @@
 class Circle;
 class Rectangle;
 
-#include "../util/Vector.h"
+#include "../../util/Vector.h"
 
 /**
  * Abstract class providing helper functions to test for collisions between shapes.

src/sprites/abstract/Rectangle.cpp

@@ -8,7 +8,7 @@
 #include "Rectangle.h"
 
 #include "Circle.h"
-#include "../util/Yaml.h"
+#include "../../util/Yaml.h"
 
 Rectangle::Rectangle(const Vector2f& position, Category category,
 		unsigned short mask, const Yaml& config,

src/sprites/abstract/Sprite.cpp

@@ -9,9 +9,9 @@
 
 #include <Thor/Vectors.hpp>
 
-#include "../util/Loader.h"
-#include "../util/Log.h"
-#include "../util/ResourceManager.h"
+#include "../../util/Loader.h"
+#include "../../util/Log.h"
+#include "../../util/ResourceManager.h"
 
 Sprite::Sprite(const Vector2f& position, Category category,
 			unsigned short mask, const Vector2f& size,

src/sprites/abstract/Sprite.h

@@ -12,7 +12,7 @@
 
 #include <SFML/Graphics.hpp>
 
-#include "../util/Vector.h"
+#include "../../util/Vector.h"
 
 /**
  * An sprite that is rendered in the world.

src/sprites/effects/Bullet.cpp

@@ -10,7 +10,7 @@
 #include <Thor/Vectors.hpp>
 
 #include "../abstract/Character.h"
-#include "../util/Yaml.h"
+#include "../../util/Yaml.h"
 
 
 /**

src/sprites/items/Item.cpp

@@ -7,7 +7,7 @@
 
 #include "Item.h"
 
-#include "../World.h"
+#include "../../World.h"
 
 Item::Item(const Vector2f& size, const std::string& texture) :
 		Sprite(Vector2f(), CATEGORY_NONSOLID, MASK_NONE, size, texture,

src/sprites/items/Shield.cpp

@@ -8,8 +8,8 @@
 #include "Shield.h"
 
 #include "../abstract/Character.h"
-#include "../sprites/RotatingShield.h"
-#include "../World.h"
+#include "../RotatingShield.h"
+#include "../../World.h"
 
 Shield::Shield() :
 		Gadget("Shield") {

src/sprites/items/Weapon.cpp

@@ -9,9 +9,9 @@
 
 #include <Thor/Vectors.hpp>
 
-#include "../World.h"
+#include "../../World.h"
 #include "../effects/Bullet.h"
-#include "../util/Yaml.h"
+#include "../../util/Yaml.h"
 
 Weapon::Weapon(World& world, Character& holder, const Yaml& config) :
 		Item(Vector2f(32, 32), "item.png"),

src/sprites/items/Weapon.h

@@ -16,7 +16,7 @@
 #include <Thor/Time.hpp>
 
 #include "Item.h"
-#include "../util/Yaml.h"
+#include "../../util/Yaml.h"
 
 class Character;
 class World;

src/util/Loader.h

@@ -10,7 +10,7 @@
 
 #include <Thor/Resources.hpp>
 
-#include "../abstract/Singleton.h"
+#include "../util/Singleton.h"
 
 /**
  * This class allows to set default resource folders and subfolders, which means that these

src/util/ResourceManager.h

@@ -8,7 +8,7 @@
 #ifndef DG_RESOURCEMANAGER_H_
 #define DG_RESOURCEMANAGER_H_
 
-#include "../abstract/Singleton.h"
+#include "../util/Singleton.h"
 
 /**
  * Loads and manages all resources by providing Singleton access to