diff --git a/common.mk b/common.mk
index adc0d46..389d062 100644
--- a/common.mk
+++ b/common.mk
@@ -4,21 +4,21 @@ LOCALE_MO = $(patsubst %.po,%.mo,$(wildcard locale/*.po))
 
 SEARCHPATH += src 
 SEARCHPATH += src/combat 
+SEARCHPATH += src/entities 
+SEARCHPATH += src/entities/blobs
+SEARCHPATH += src/entities/boss
+SEARCHPATH += src/entities/cannons
+SEARCHPATH += src/entities/decoration
+SEARCHPATH += src/entities/items
+SEARCHPATH += src/entities/misc
+SEARCHPATH += src/entities/structures
+SEARCHPATH += src/entities/traps
 SEARCHPATH += src/game 
 SEARCHPATH += src/hub 
 SEARCHPATH += src/system 
 SEARCHPATH += src/util 
 SEARCHPATH += src/widgets 
 SEARCHPATH += src/world
-SEARCHPATH += src/world/entities 
-SEARCHPATH += src/world/entities/blobs
-SEARCHPATH += src/world/entities/boss
-SEARCHPATH += src/world/entities/cannons
-SEARCHPATH += src/world/entities/decoration
-SEARCHPATH += src/world/entities/items
-SEARCHPATH += src/world/entities/misc
-SEARCHPATH += src/world/entities/structures
-SEARCHPATH += src/world/entities/traps
 
 vpath %.c $(SEARCHPATH)
 vpath %.h $(SEARCHPATH)
diff --git a/src/world/entities/blobs/bob.c b/src/entities/blobs/bob.c
similarity index 100%
rename from src/world/entities/blobs/bob.c
rename to src/entities/blobs/bob.c
diff --git a/src/world/entities/blobs/bob.h b/src/entities/blobs/bob.h
similarity index 96%
rename from src/world/entities/blobs/bob.h
rename to src/entities/blobs/bob.h
index d3ecca0..11cd213 100644
--- a/src/world/entities/blobs/bob.h
+++ b/src/entities/blobs/bob.h
@@ -18,4 +18,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
diff --git a/src/world/entities/blobs/mia.c b/src/entities/blobs/mia.c
similarity index 100%
rename from src/world/entities/blobs/mia.c
rename to src/entities/blobs/mia.c
diff --git a/src/world/entities/blobs/mia.h b/src/entities/blobs/mia.h
similarity index 97%
rename from src/world/entities/blobs/mia.h
rename to src/entities/blobs/mia.h
index 0d088c5..6071f69 100644
--- a/src/world/entities/blobs/mia.h
+++ b/src/entities/blobs/mia.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern int getSpriteIndex(char *name);
 extern void nothing(void);
diff --git a/src/world/entities/blobs/teeka.c b/src/entities/blobs/teeka.c
similarity index 100%
rename from src/world/entities/blobs/teeka.c
rename to src/entities/blobs/teeka.c
diff --git a/src/world/entities/blobs/teeka.h b/src/entities/blobs/teeka.h
similarity index 97%
rename from src/world/entities/blobs/teeka.h
rename to src/entities/blobs/teeka.h
index 3b178ea..78c3ba4 100644
--- a/src/world/entities/blobs/teeka.h
+++ b/src/entities/blobs/teeka.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initUnit(Entity *e);
 extern void unitTick(void);
diff --git a/src/world/entities/boss/blaze.c b/src/entities/boss/blaze.c
similarity index 100%
rename from src/world/entities/boss/blaze.c
rename to src/entities/boss/blaze.c
diff --git a/src/world/entities/boss/blaze.h b/src/entities/boss/blaze.h
similarity index 96%
rename from src/world/entities/boss/blaze.h
rename to src/entities/boss/blaze.h
index dbbb9f5..7229253 100644
--- a/src/world/entities/boss/blaze.h
+++ b/src/entities/boss/blaze.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initBlobBoss(Boss *b);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/boss/blobBoss.c b/src/entities/boss/blobBoss.c
similarity index 100%
rename from src/world/entities/boss/blobBoss.c
rename to src/entities/boss/blobBoss.c
diff --git a/src/world/entities/boss/blobBoss.h b/src/entities/boss/blobBoss.h
similarity index 98%
rename from src/world/entities/boss/blobBoss.h
rename to src/entities/boss/blobBoss.h
index 314d825..6616ff2 100644
--- a/src/world/entities/boss/blobBoss.h
+++ b/src/entities/boss/blobBoss.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initBoss(Entity *e);
 extern int rrnd(int low, int high);
diff --git a/src/world/entities/boss/boss.c b/src/entities/boss/boss.c
similarity index 100%
rename from src/world/entities/boss/boss.c
rename to src/entities/boss/boss.c
diff --git a/src/world/entities/boss/boss.h b/src/entities/boss/boss.h
similarity index 96%
rename from src/world/entities/boss/boss.h
rename to src/entities/boss/boss.h
index efd9b5f..b0b62e6 100644
--- a/src/world/entities/boss/boss.h
+++ b/src/entities/boss/boss.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 extern void lookForPlayer(void);
diff --git a/src/world/entities/boss/eyeDroidCommander.c b/src/entities/boss/eyeDroidCommander.c
similarity index 100%
rename from src/world/entities/boss/eyeDroidCommander.c
rename to src/entities/boss/eyeDroidCommander.c
diff --git a/src/world/entities/boss/eyeDroidCommander.h b/src/entities/boss/eyeDroidCommander.h
similarity index 98%
rename from src/world/entities/boss/eyeDroidCommander.h
rename to src/entities/boss/eyeDroidCommander.h
index c272917..51d2e77 100644
--- a/src/world/entities/boss/eyeDroidCommander.h
+++ b/src/entities/boss/eyeDroidCommander.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initBoss(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/boss/frost.c b/src/entities/boss/frost.c
similarity index 100%
rename from src/world/entities/boss/frost.c
rename to src/entities/boss/frost.c
diff --git a/src/world/entities/boss/frost.h b/src/entities/boss/frost.h
similarity index 96%
rename from src/world/entities/boss/frost.h
rename to src/entities/boss/frost.h
index 54f352c..ad32677 100644
--- a/src/world/entities/boss/frost.h
+++ b/src/entities/boss/frost.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initBlobBoss(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/boss/tankCommander.c b/src/entities/boss/tankCommander.c
similarity index 100%
rename from src/world/entities/boss/tankCommander.c
rename to src/entities/boss/tankCommander.c
diff --git a/src/world/entities/boss/tankCommander.h b/src/entities/boss/tankCommander.h
similarity index 98%
rename from src/world/entities/boss/tankCommander.h
rename to src/entities/boss/tankCommander.h
index 5e5ee10..f2a3240 100644
--- a/src/world/entities/boss/tankCommander.h
+++ b/src/entities/boss/tankCommander.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initBoss(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/boss/tankTrack.c b/src/entities/boss/tankTrack.c
similarity index 100%
rename from src/world/entities/boss/tankTrack.c
rename to src/entities/boss/tankTrack.c
diff --git a/src/world/entities/boss/tankTrack.h b/src/entities/boss/tankTrack.h
similarity index 96%
rename from src/world/entities/boss/tankTrack.h
rename to src/entities/boss/tankTrack.h
index 1876465..31ebc8a 100644
--- a/src/world/entities/boss/tankTrack.h
+++ b/src/entities/boss/tankTrack.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initBoss(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/cannons/cannon.c b/src/entities/cannons/cannon.c
similarity index 100%
rename from src/world/entities/cannons/cannon.c
rename to src/entities/cannons/cannon.c
diff --git a/src/world/entities/cannons/cannon.h b/src/entities/cannons/cannon.h
similarity index 97%
rename from src/world/entities/cannons/cannon.h
rename to src/entities/cannons/cannon.h
index 220d1e2..4ba3715 100644
--- a/src/world/entities/cannons/cannon.h
+++ b/src/entities/cannons/cannon.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initUnit(Entity *e);
 extern void addExplosion(float x, float y, int radius, Entity *owner);
diff --git a/src/world/entities/decoration/debris.c b/src/entities/decoration/debris.c
similarity index 100%
rename from src/world/entities/decoration/debris.c
rename to src/entities/decoration/debris.c
diff --git a/src/world/entities/decoration/debris.h b/src/entities/decoration/debris.h
similarity index 96%
rename from src/world/entities/decoration/debris.h
rename to src/entities/decoration/debris.h
index 0023aa4..84c5f70 100644
--- a/src/world/entities/decoration/debris.h
+++ b/src/entities/decoration/debris.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 extern void addFlameParticles(float x, float y);
diff --git a/src/world/entities/decoration/fleshChunk.c b/src/entities/decoration/fleshChunk.c
similarity index 100%
rename from src/world/entities/decoration/fleshChunk.c
rename to src/entities/decoration/fleshChunk.c
diff --git a/src/world/entities/decoration/fleshChunk.h b/src/entities/decoration/fleshChunk.h
similarity index 96%
rename from src/world/entities/decoration/fleshChunk.h
rename to src/entities/decoration/fleshChunk.h
index 6c9c266..74b11db 100644
--- a/src/world/entities/decoration/fleshChunk.h
+++ b/src/entities/decoration/fleshChunk.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 extern void addBlood(float x, float y);
diff --git a/src/world/entities/entities.c b/src/entities/entities.c
similarity index 100%
rename from src/world/entities/entities.c
rename to src/entities/entities.c
diff --git a/src/world/entities/entities.h b/src/entities/entities.h
similarity index 97%
rename from src/world/entities/entities.h
rename to src/entities/entities.h
index 27829ff..bc2d872 100644
--- a/src/world/entities/entities.h
+++ b/src/entities/entities.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../common.h"
+#include "../common.h"
 
 extern Sprite *getSpriteByIndex(int x);
 extern float wrap(float value, float low, float high);
diff --git a/src/world/entities/items/battery.c b/src/entities/items/battery.c
similarity index 100%
rename from src/world/entities/items/battery.c
rename to src/entities/items/battery.c
diff --git a/src/world/entities/items/battery.h b/src/entities/items/battery.h
similarity index 97%
rename from src/world/entities/items/battery.h
rename to src/entities/items/battery.h
index 11739e4..1a13b49 100644
--- a/src/world/entities/items/battery.h
+++ b/src/entities/items/battery.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void playSound(int snd, int ch);
 extern void pickupItem(void);
diff --git a/src/world/entities/items/cell.c b/src/entities/items/cell.c
similarity index 100%
rename from src/world/entities/items/cell.c
rename to src/entities/items/cell.c
diff --git a/src/world/entities/items/cell.h b/src/entities/items/cell.h
similarity index 97%
rename from src/world/entities/items/cell.h
rename to src/entities/items/cell.h
index be55ef5..3c7fc62 100644
--- a/src/world/entities/items/cell.h
+++ b/src/entities/items/cell.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initItem(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/items/cherry.c b/src/entities/items/cherry.c
similarity index 100%
rename from src/world/entities/items/cherry.c
rename to src/entities/items/cherry.c
diff --git a/src/world/entities/items/cherry.h b/src/entities/items/cherry.h
similarity index 97%
rename from src/world/entities/items/cherry.h
rename to src/entities/items/cherry.h
index 8b0c40a..0b13701 100644
--- a/src/world/entities/items/cherry.h
+++ b/src/entities/items/cherry.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initConsumable(Entity *e);
 extern void setGameplayMessage(int type, char *format, ...);
diff --git a/src/world/entities/items/consumable.c b/src/entities/items/consumable.c
similarity index 100%
rename from src/world/entities/items/consumable.c
rename to src/entities/items/consumable.c
diff --git a/src/world/entities/items/consumable.h b/src/entities/items/consumable.h
similarity index 96%
rename from src/world/entities/items/consumable.h
rename to src/entities/items/consumable.h
index 6047b3b..7da08cf 100644
--- a/src/world/entities/items/consumable.h
+++ b/src/entities/items/consumable.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 
diff --git a/src/world/entities/items/heart.c b/src/entities/items/heart.c
similarity index 100%
rename from src/world/entities/items/heart.c
rename to src/entities/items/heart.c
diff --git a/src/world/entities/items/heart.h b/src/entities/items/heart.h
similarity index 97%
rename from src/world/entities/items/heart.h
rename to src/entities/items/heart.h
index 1a1e804..d7c4d15 100644
--- a/src/world/entities/items/heart.h
+++ b/src/entities/items/heart.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void playSound(int snd, int ch);
 extern void setGameplayMessage(int type, char *format, ...);
diff --git a/src/world/entities/items/item.c b/src/entities/items/item.c
similarity index 100%
rename from src/world/entities/items/item.c
rename to src/entities/items/item.c
diff --git a/src/world/entities/items/item.h b/src/entities/items/item.h
similarity index 97%
rename from src/world/entities/items/item.h
rename to src/entities/items/item.h
index ee8761f..7687ee4 100644
--- a/src/world/entities/items/item.h
+++ b/src/entities/items/item.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void playSound(int snd, int ch);
 extern void setGameplayMessage(int type, char *format, ...);
diff --git a/src/world/entities/items/key.c b/src/entities/items/key.c
similarity index 100%
rename from src/world/entities/items/key.c
rename to src/entities/items/key.c
diff --git a/src/world/entities/items/key.h b/src/entities/items/key.h
similarity index 96%
rename from src/world/entities/items/key.h
rename to src/entities/items/key.h
index f061783..ffaf5f3 100644
--- a/src/world/entities/items/key.h
+++ b/src/entities/items/key.h
@@ -18,6 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initItem(Entity *e);
diff --git a/src/world/entities/items/keycard.c b/src/entities/items/keycard.c
similarity index 100%
rename from src/world/entities/items/keycard.c
rename to src/entities/items/keycard.c
diff --git a/src/world/entities/items/keycard.h b/src/entities/items/keycard.h
similarity index 96%
rename from src/world/entities/items/keycard.h
rename to src/entities/items/keycard.h
index a52f7b7..726e5fa 100644
--- a/src/world/entities/items/keycard.h
+++ b/src/entities/items/keycard.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initItem(Entity *e);
 extern void updateObjective(char *targetName);
diff --git a/src/world/entities/items/weaponPickup.c b/src/entities/items/weaponPickup.c
similarity index 100%
rename from src/world/entities/items/weaponPickup.c
rename to src/entities/items/weaponPickup.c
diff --git a/src/world/entities/items/weaponPickup.h b/src/entities/items/weaponPickup.h
similarity index 97%
rename from src/world/entities/items/weaponPickup.h
rename to src/entities/items/weaponPickup.h
index 8df66d9..df4ccaa 100644
--- a/src/world/entities/items/weaponPickup.h
+++ b/src/entities/items/weaponPickup.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void playSound(int snd, int ch);
 extern void setGameplayMessage(int type, char *format, ...);
diff --git a/src/world/entities/misc/destructable.c b/src/entities/misc/destructable.c
similarity index 100%
rename from src/world/entities/misc/destructable.c
rename to src/entities/misc/destructable.c
diff --git a/src/world/entities/misc/destructable.h b/src/entities/misc/destructable.h
similarity index 97%
rename from src/world/entities/misc/destructable.h
rename to src/entities/misc/destructable.h
index 409a448..c2d5850 100644
--- a/src/world/entities/misc/destructable.h
+++ b/src/entities/misc/destructable.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void activateEntities(char *names, int activate);
 extern void dropCarriedItem(void);
diff --git a/src/world/entities/misc/infoPoint.c b/src/entities/misc/infoPoint.c
similarity index 100%
rename from src/world/entities/misc/infoPoint.c
rename to src/entities/misc/infoPoint.c
diff --git a/src/world/entities/misc/infoPoint.h b/src/entities/misc/infoPoint.h
similarity index 96%
rename from src/world/entities/misc/infoPoint.h
rename to src/entities/misc/infoPoint.h
index a078fdf..9e69036 100644
--- a/src/world/entities/misc/infoPoint.h
+++ b/src/entities/misc/infoPoint.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern int getSpriteIndex(char *name);
 extern void initEntity(Entity *e);
diff --git a/src/world/entities/structures/cardReader.c b/src/entities/structures/cardReader.c
similarity index 100%
rename from src/world/entities/structures/cardReader.c
rename to src/entities/structures/cardReader.c
diff --git a/src/world/entities/structures/cardReader.h b/src/entities/structures/cardReader.h
similarity index 97%
rename from src/world/entities/structures/cardReader.h
rename to src/entities/structures/cardReader.h
index 2fc0d11..16c9018 100644
--- a/src/world/entities/structures/cardReader.h
+++ b/src/entities/structures/cardReader.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/structures/door.c b/src/entities/structures/door.c
similarity index 100%
rename from src/world/entities/structures/door.c
rename to src/entities/structures/door.c
diff --git a/src/world/entities/structures/door.h b/src/entities/structures/door.h
similarity index 97%
rename from src/world/entities/structures/door.h
rename to src/entities/structures/door.h
index 62b9c7e..6261610 100644
--- a/src/world/entities/structures/door.h
+++ b/src/entities/structures/door.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/structures/exit.c b/src/entities/structures/exit.c
similarity index 100%
rename from src/world/entities/structures/exit.c
rename to src/entities/structures/exit.c
diff --git a/src/world/entities/structures/exit.h b/src/entities/structures/exit.h
similarity index 97%
rename from src/world/entities/structures/exit.h
rename to src/entities/structures/exit.h
index a1ec12f..f87b250 100644
--- a/src/world/entities/structures/exit.h
+++ b/src/entities/structures/exit.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern int getSpriteIndex(char *name);
 extern void updateObjective(char *targetName);
diff --git a/src/world/entities/structures/horizontalDoor.c b/src/entities/structures/horizontalDoor.c
similarity index 100%
rename from src/world/entities/structures/horizontalDoor.c
rename to src/entities/structures/horizontalDoor.c
diff --git a/src/world/entities/structures/horizontalDoor.h b/src/entities/structures/horizontalDoor.h
similarity index 96%
rename from src/world/entities/structures/horizontalDoor.h
rename to src/entities/structures/horizontalDoor.h
index 88cf48c..b58c07d 100644
--- a/src/world/entities/structures/horizontalDoor.h
+++ b/src/entities/structures/horizontalDoor.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initDoor(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/structures/itemPad.c b/src/entities/structures/itemPad.c
similarity index 100%
rename from src/world/entities/structures/itemPad.c
rename to src/entities/structures/itemPad.c
diff --git a/src/world/entities/structures/itemPad.h b/src/entities/structures/itemPad.h
similarity index 97%
rename from src/world/entities/structures/itemPad.h
rename to src/entities/structures/itemPad.h
index 67381db..61e2b9a 100644
--- a/src/world/entities/structures/itemPad.h
+++ b/src/entities/structures/itemPad.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/structures/lift.c b/src/entities/structures/lift.c
similarity index 100%
rename from src/world/entities/structures/lift.c
rename to src/entities/structures/lift.c
diff --git a/src/world/entities/structures/lift.h b/src/entities/structures/lift.h
similarity index 97%
rename from src/world/entities/structures/lift.h
rename to src/entities/structures/lift.h
index bc0753b..07613bc 100644
--- a/src/world/entities/structures/lift.h
+++ b/src/entities/structures/lift.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/structures/powerPoint.c b/src/entities/structures/powerPoint.c
similarity index 100%
rename from src/world/entities/structures/powerPoint.c
rename to src/entities/structures/powerPoint.c
diff --git a/src/world/entities/structures/powerPoint.h b/src/entities/structures/powerPoint.h
similarity index 97%
rename from src/world/entities/structures/powerPoint.h
rename to src/entities/structures/powerPoint.h
index e2c0c71..c1d39d4 100644
--- a/src/world/entities/structures/powerPoint.h
+++ b/src/entities/structures/powerPoint.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/structures/powerPool.c b/src/entities/structures/powerPool.c
similarity index 100%
rename from src/world/entities/structures/powerPool.c
rename to src/entities/structures/powerPool.c
diff --git a/src/world/entities/structures/powerPool.h b/src/entities/structures/powerPool.h
similarity index 96%
rename from src/world/entities/structures/powerPool.h
rename to src/entities/structures/powerPool.h
index 9e325c5..955f57d 100644
--- a/src/world/entities/structures/powerPool.h
+++ b/src/entities/structures/powerPool.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern int getSpriteIndex(char *name);
 extern void initEntity(Entity *e);
diff --git a/src/world/entities/structures/pressurePlate.c b/src/entities/structures/pressurePlate.c
similarity index 100%
rename from src/world/entities/structures/pressurePlate.c
rename to src/entities/structures/pressurePlate.c
diff --git a/src/world/entities/structures/pressurePlate.h b/src/entities/structures/pressurePlate.h
similarity index 96%
rename from src/world/entities/structures/pressurePlate.h
rename to src/entities/structures/pressurePlate.h
index 0e81a9d..a353e0d 100644
--- a/src/world/entities/structures/pressurePlate.h
+++ b/src/entities/structures/pressurePlate.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/structures/pushBlock.c b/src/entities/structures/pushBlock.c
similarity index 100%
rename from src/world/entities/structures/pushBlock.c
rename to src/entities/structures/pushBlock.c
diff --git a/src/world/entities/structures/pushBlock.h b/src/entities/structures/pushBlock.h
similarity index 96%
rename from src/world/entities/structures/pushBlock.h
rename to src/entities/structures/pushBlock.h
index 36b791f..26449d3 100644
--- a/src/world/entities/structures/pushBlock.h
+++ b/src/entities/structures/pushBlock.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 extern void playSound(int snd, int ch);
diff --git a/src/world/entities/structures/teleporter.c b/src/entities/structures/teleporter.c
similarity index 100%
rename from src/world/entities/structures/teleporter.c
rename to src/entities/structures/teleporter.c
diff --git a/src/world/entities/structures/teleporter.h b/src/entities/structures/teleporter.h
similarity index 97%
rename from src/world/entities/structures/teleporter.h
rename to src/entities/structures/teleporter.h
index b46f32b..7bcb2a5 100644
--- a/src/world/entities/structures/teleporter.h
+++ b/src/entities/structures/teleporter.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 extern void playSound(int snd, int ch);
diff --git a/src/world/entities/traps/horizontalLaserTrap.c b/src/entities/traps/horizontalLaserTrap.c
similarity index 100%
rename from src/world/entities/traps/horizontalLaserTrap.c
rename to src/entities/traps/horizontalLaserTrap.c
diff --git a/src/world/entities/traps/horizontalLaserTrap.h b/src/entities/traps/horizontalLaserTrap.h
similarity index 96%
rename from src/world/entities/traps/horizontalLaserTrap.h
rename to src/entities/traps/horizontalLaserTrap.h
index 974ea6d..c9a6788 100644
--- a/src/world/entities/traps/horizontalLaserTrap.h
+++ b/src/entities/traps/horizontalLaserTrap.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initLaserTrap(Entity *e);
 extern int getSpriteIndex(char *name);
diff --git a/src/world/entities/traps/laserTrap.c b/src/entities/traps/laserTrap.c
similarity index 100%
rename from src/world/entities/traps/laserTrap.c
rename to src/entities/traps/laserTrap.c
diff --git a/src/world/entities/traps/laserTrap.h b/src/entities/traps/laserTrap.h
similarity index 97%
rename from src/world/entities/traps/laserTrap.h
rename to src/entities/traps/laserTrap.h
index 50f32b3..a933dc8 100644
--- a/src/world/entities/traps/laserTrap.h
+++ b/src/entities/traps/laserTrap.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../../common.h"
+#include "../../common.h"
 
 extern void initEntity(Entity *e);
 extern void observeActivation(Entity *e);
diff --git a/src/world/entities/unit.c b/src/entities/unit.c
similarity index 100%
rename from src/world/entities/unit.c
rename to src/entities/unit.c
diff --git a/src/world/entities/unit.h b/src/entities/unit.h
similarity index 97%
rename from src/world/entities/unit.h
rename to src/entities/unit.h
index 5969d1d..38d5586 100644
--- a/src/world/entities/unit.h
+++ b/src/entities/unit.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "../../common.h"
+#include "../common.h"
 
 extern void initEntity(Entity *e);
 extern void lookForPlayer(void);