diff --git a/Makefile b/Makefile
index a9f8aaa2..685407a3 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,6 @@
 #                                                        #
 # Dependencies:                                          #
 #  - SDL 1.2                                             #
-#  - libX11                                              #
 #  - libGL                                               #
 #  - libvorbis                                           #
 #  - libogg                                              #
@@ -69,11 +68,6 @@ else ifeq ($(OSTYPE),FreeBSD)
 LDFLAGS := -L/usr/local/lib -lm
 endif 
 
-# ----------
-
-# Converter rule
-
-
 # ----------
 
 # Builds everything
@@ -188,36 +182,36 @@ BASEQ2_OBJS_ = \
 	src/game/baseq2/g_turret.o \
 	src/game/baseq2/g_utils.o \
 	src/game/baseq2/g_weapon.o \
-	src/game/baseq2/m_actor.o \
-	src/game/baseq2/m_berserk.o \
-	src/game/baseq2/m_boss2.o \
-	src/game/baseq2/m_boss3.o \
-	src/game/baseq2/m_boss31.o \
-	src/game/baseq2/m_boss32.o \
-	src/game/baseq2/m_brain.o \
-	src/game/baseq2/m_chick.o \
 	src/game/baseq2/m_flash.o \
-	src/game/baseq2/m_flipper.o \
-	src/game/baseq2/m_float.o \
-	src/game/baseq2/m_flyer.o \
-	src/game/baseq2/m_gladiator.o \
-	src/game/baseq2/m_gunner.o \
-	src/game/baseq2/m_hover.o \
-	src/game/baseq2/m_infantry.o \
-	src/game/baseq2/m_insane.o \
-	src/game/baseq2/m_medic.o \
-	src/game/baseq2/m_move.o \
-	src/game/baseq2/m_mutant.o \
-	src/game/baseq2/m_parasite.o \
-	src/game/baseq2/m_soldier.o \
-	src/game/baseq2/m_supertank.o \
-	src/game/baseq2/m_tank.o \
-	src/game/baseq2/p_client.o \
-	src/game/baseq2/p_hud.o \
-	src/game/baseq2/p_trail.o \
-	src/game/baseq2/p_view.o \
-	src/game/baseq2/p_weapon.o \
 	src/game/baseq2/q_shared.o \
+	src/game/baseq2/monster/actor/actor.o \
+	src/game/baseq2/monster/berserker/berserker.o \
+	src/game/baseq2/monster/boss2/boss2.o \
+	src/game/baseq2/monster/boss3/boss3.o \
+	src/game/baseq2/monster/boss3/boss31.o \
+	src/game/baseq2/monster/boss3/boss32.o \
+	src/game/baseq2/monster/brain/brain.o \
+	src/game/baseq2/monster/chick/chick.o \
+	src/game/baseq2/monster/flipper/flipper.o \
+	src/game/baseq2/monster/float/float.o \
+	src/game/baseq2/monster/flyer/flyer.o \
+	src/game/baseq2/monster/gladiator/gladiator.o \
+	src/game/baseq2/monster/gunner/gunner.o \
+	src/game/baseq2/monster/hover/hover.o \
+	src/game/baseq2/monster/infantry/infantry.o \
+	src/game/baseq2/monster/insane/insane.o \
+	src/game/baseq2/monster/medic/medic.o \
+	src/game/baseq2/monster/misc/move.o \
+	src/game/baseq2/monster/mutant/mutant.o \
+	src/game/baseq2/monster/parasite/parasite.o \
+	src/game/baseq2/monster/soldier/soldier.o \
+	src/game/baseq2/monster/supertank/supertank.o \
+	src/game/baseq2/monster/tank/tank.o \
+	src/game/baseq2/player/client.o \
+	src/game/baseq2/player/hud.o \
+	src/game/baseq2/player/trail.o \
+	src/game/baseq2/player/view.o \
+	src/game/baseq2/player/weapon.o \
     src/game/baseq2/savegame/savegame.o	
 
 # Used by the client
diff --git a/src/game/baseq2/g_ai.c b/src/game/baseq2/g_ai.c
index 06b73104..c7554714 100644
--- a/src/game/baseq2/g_ai.c
+++ b/src/game/baseq2/g_ai.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */
 
-#include "g_local.h"
+#include "header/local.h"
 
 extern cvar_t *maxclients;
  
diff --git a/src/game/baseq2/g_chase.c b/src/game/baseq2/g_chase.c
index 0551ec88..733aa2c6 100644
--- a/src/game/baseq2/g_chase.c
+++ b/src/game/baseq2/g_chase.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */
 
-#include "g_local.h"
+#include "header/local.h"
 
 void
 UpdateChaseCam(edict_t *ent)
diff --git a/src/game/baseq2/g_cmds.c b/src/game/baseq2/g_cmds.c
index d0608f03..a7d6472e 100644
--- a/src/game/baseq2/g_cmds.c
+++ b/src/game/baseq2/g_cmds.c
@@ -24,8 +24,8 @@
  * =======================================================================
  */ 
 
-#include "g_local.h"
-#include "m_player.h"
+#include "header/local.h"
+#include "monster/header/player.h"
 
 char *
 ClientTeam(edict_t *ent)
diff --git a/src/game/baseq2/g_combat.c b/src/game/baseq2/g_combat.c
index 1061867b..93851c6d 100644
--- a/src/game/baseq2/g_combat.c
+++ b/src/game/baseq2/g_combat.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */ 
 
-#include "g_local.h"
+#include "header/local.h"
 
 /*
  * Returns true if the inflictor can 
diff --git a/src/game/baseq2/g_func.c b/src/game/baseq2/g_func.c
index 389cd2fe..048e3716 100644
--- a/src/game/baseq2/g_func.c
+++ b/src/game/baseq2/g_func.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */ 
 
-#include "g_local.h"
+#include "header/local.h"
 
 /*
  * =========================================================
diff --git a/src/game/baseq2/g_items.c b/src/game/baseq2/g_items.c
index 23deada0..19d813c8 100644
--- a/src/game/baseq2/g_items.c
+++ b/src/game/baseq2/g_items.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */  
 
-#include "g_local.h"
+#include "header/local.h"
  
 #define HEALTH_IGNORE_MAX 1
 #define HEALTH_TIMED 2
diff --git a/src/game/baseq2/g_main.c b/src/game/baseq2/g_main.c
index c7274f30..01646746 100644
--- a/src/game/baseq2/g_main.c
+++ b/src/game/baseq2/g_main.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */ 
 
-#include "g_local.h"
+#include "header/local.h"
 
 game_locals_t game;
 level_locals_t level;
diff --git a/src/game/baseq2/g_misc.c b/src/game/baseq2/g_misc.c
index 5b9ce12f..b3d3cb68 100644
--- a/src/game/baseq2/g_misc.c
+++ b/src/game/baseq2/g_misc.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */
 
-#include "g_local.h"
+#include "header/local.h"
 
 int	gibsthisframe = 0;
 int lastgibframe = 0;
diff --git a/src/game/baseq2/g_monster.c b/src/game/baseq2/g_monster.c
index 98747372..f1e293e5 100644
--- a/src/game/baseq2/g_monster.c
+++ b/src/game/baseq2/g_monster.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */ 
 
-#include "g_local.h"
+#include "header/local.h"
 
 void monster_start_go(edict_t *self);
 
diff --git a/src/game/baseq2/g_phys.c b/src/game/baseq2/g_phys.c
index cac79a9c..61a37fa1 100644
--- a/src/game/baseq2/g_phys.c
+++ b/src/game/baseq2/g_phys.c
@@ -25,7 +25,7 @@
  */ 
  
 
-#include "g_local.h"
+#include "header/local.h"
 
 #define STOP_EPSILON 0.1
 #define MAX_CLIP_PLANES 5
diff --git a/src/game/baseq2/g_spawn.c b/src/game/baseq2/g_spawn.c
index 1a12ec46..5dc2621a 100644
--- a/src/game/baseq2/g_spawn.c
+++ b/src/game/baseq2/g_spawn.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */
 
-#include "g_local.h"
+#include "header/local.h"
 
 typedef struct
 {
diff --git a/src/game/baseq2/g_svcmds.c b/src/game/baseq2/g_svcmds.c
index cbefc7bd..ff6f5640 100644
--- a/src/game/baseq2/g_svcmds.c
+++ b/src/game/baseq2/g_svcmds.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */
 
-#include "g_local.h"
+#include "header/local.h"
 
 #define MAX_IPFILTERS 1024
 
diff --git a/src/game/baseq2/g_target.c b/src/game/baseq2/g_target.c
index 2b41dea7..126dd496 100644
--- a/src/game/baseq2/g_target.c
+++ b/src/game/baseq2/g_target.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */ 
 
-#include "g_local.h"
+#include "header/local.h"
 
 /*
  * QUAKED target_temp_entity (1 0 0) (-8 -8 -8) (8 8 8)
diff --git a/src/game/baseq2/g_trigger.c b/src/game/baseq2/g_trigger.c
index f8bd35e3..d0241126 100644
--- a/src/game/baseq2/g_trigger.c
+++ b/src/game/baseq2/g_trigger.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */ 
 
-#include "g_local.h"
+#include "header/local.h"
 
 #define PUSH_ONCE 1
 
diff --git a/src/game/baseq2/g_turret.c b/src/game/baseq2/g_turret.c
index 3a0b1214..89cedf69 100644
--- a/src/game/baseq2/g_turret.c
+++ b/src/game/baseq2/g_turret.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */ 
 
-#include "g_local.h"
+#include "header/local.h"
  
 void infantry_die(edict_t *self, edict_t *inflictor, edict_t *attacker,
 		int damage);
diff --git a/src/game/baseq2/g_utils.c b/src/game/baseq2/g_utils.c
index bc2d10e0..255a5dad 100644
--- a/src/game/baseq2/g_utils.c
+++ b/src/game/baseq2/g_utils.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */
 
-#include "g_local.h"
+#include "header/local.h"
 
 #define MAXCHOICES 8
 
diff --git a/src/game/baseq2/g_weapon.c b/src/game/baseq2/g_weapon.c
index 985c3c30..a2011021 100644
--- a/src/game/baseq2/g_weapon.c
+++ b/src/game/baseq2/g_weapon.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */ 
 
-#include "g_local.h"
+#include "header/local.h"
 
 /*
  * This is a support routine used when a client is firing
diff --git a/src/game/baseq2/game.h b/src/game/baseq2/header/game.h
similarity index 100%
rename from src/game/baseq2/game.h
rename to src/game/baseq2/header/game.h
diff --git a/src/game/baseq2/g_local.h b/src/game/baseq2/header/local.h
similarity index 99%
rename from src/game/baseq2/g_local.h
rename to src/game/baseq2/header/local.h
index b100b112..5db4dadb 100644
--- a/src/game/baseq2/g_local.h
+++ b/src/game/baseq2/header/local.h
@@ -24,7 +24,10 @@
  * =======================================================================
  */ 
 
-#include "q_shared.h"
+#ifndef GAME_LOCAL_H
+#define GAME_LOCAL_H
+
+#include "../q_shared.h"
 
 /* define GAME_INCLUDE so that game.h does not define the 
    short, server-visible gclient_t and edict_t structures, 
@@ -1124,3 +1127,4 @@ struct edict_s
  #include "g_ctf.h"
 #endif
 
+#endif /* GAME_LOCAL_H */
diff --git a/src/game/baseq2/m_actor.c b/src/game/baseq2/monster/actor/actor.c
similarity index 99%
rename from src/game/baseq2/m_actor.c
rename to src/game/baseq2/monster/actor/actor.c
index 072ebef0..d0bb2808 100644
--- a/src/game/baseq2/m_actor.c
+++ b/src/game/baseq2/monster/actor/actor.c
@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // g_actor.c
 
-#include "g_local.h"
-#include "m_actor.h"
+#include "../../header/local.h"
+#include "actor.h"
 
 #define	MAX_ACTOR_NAMES		8
 char *actor_names[MAX_ACTOR_NAMES] =
diff --git a/src/game/baseq2/m_actor.h b/src/game/baseq2/monster/actor/actor.h
similarity index 100%
rename from src/game/baseq2/m_actor.h
rename to src/game/baseq2/monster/actor/actor.h
diff --git a/src/game/baseq2/m_berserk.c b/src/game/baseq2/monster/berserker/berserker.c
similarity index 99%
rename from src/game/baseq2/m_berserk.c
rename to src/game/baseq2/monster/berserker/berserker.c
index f355be3d..c4e541ad 100644
--- a/src/game/baseq2/m_berserk.c
+++ b/src/game/baseq2/monster/berserker/berserker.c
@@ -25,8 +25,8 @@ BERSERK
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_berserk.h"
+#include "../../header/local.h"
+#include "berserker.h"
 
 
 static int sound_pain;
diff --git a/src/game/baseq2/m_berserk.h b/src/game/baseq2/monster/berserker/berserker.h
similarity index 100%
rename from src/game/baseq2/m_berserk.h
rename to src/game/baseq2/monster/berserker/berserker.h
diff --git a/src/game/baseq2/m_boss2.c b/src/game/baseq2/monster/boss2/boss2.c
similarity index 99%
rename from src/game/baseq2/m_boss2.c
rename to src/game/baseq2/monster/boss2/boss2.c
index f65ab121..d8a53931 100644
--- a/src/game/baseq2/m_boss2.c
+++ b/src/game/baseq2/monster/boss2/boss2.c
@@ -25,8 +25,8 @@ boss2
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_boss2.h"
+#include "../../header/local.h"
+#include "boss2.h"
 
 void BossExplode (edict_t *self);
 
diff --git a/src/game/baseq2/m_boss2.h b/src/game/baseq2/monster/boss2/boss2.h
similarity index 100%
rename from src/game/baseq2/m_boss2.h
rename to src/game/baseq2/monster/boss2/boss2.h
diff --git a/src/game/baseq2/m_boss3.c b/src/game/baseq2/monster/boss3/boss3.c
similarity index 97%
rename from src/game/baseq2/m_boss3.c
rename to src/game/baseq2/monster/boss3/boss3.c
index f95e75b5..59886c60 100644
--- a/src/game/baseq2/m_boss3.c
+++ b/src/game/baseq2/monster/boss3/boss3.c
@@ -25,8 +25,8 @@ boss3
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_boss32.h"
+#include "../../header/local.h"
+#include "boss32.h"
 
 void Use_Boss3 (edict_t *ent, edict_t *other, edict_t *activator)
 {
diff --git a/src/game/baseq2/m_boss31.c b/src/game/baseq2/monster/boss3/boss31.c
similarity index 99%
rename from src/game/baseq2/m_boss31.c
rename to src/game/baseq2/monster/boss3/boss31.c
index 85ce4788..ab3f1f0e 100644
--- a/src/game/baseq2/m_boss31.c
+++ b/src/game/baseq2/monster/boss3/boss31.c
@@ -25,8 +25,8 @@ jorg
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_boss31.h"
+#include "../../header/local.h"
+#include "boss31.h"
 
 extern void SP_monster_makron (edict_t *self);
 qboolean visible (edict_t *self, edict_t *other);
diff --git a/src/game/baseq2/m_boss31.h b/src/game/baseq2/monster/boss3/boss31.h
similarity index 100%
rename from src/game/baseq2/m_boss31.h
rename to src/game/baseq2/monster/boss3/boss31.h
diff --git a/src/game/baseq2/m_boss32.c b/src/game/baseq2/monster/boss3/boss32.c
similarity index 99%
rename from src/game/baseq2/m_boss32.c
rename to src/game/baseq2/monster/boss3/boss32.c
index 44aa656c..efafd72e 100644
--- a/src/game/baseq2/m_boss32.c
+++ b/src/game/baseq2/monster/boss3/boss32.c
@@ -25,8 +25,8 @@ Makron -- Final Boss
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_boss32.h"
+#include "../../header/local.h"
+#include "boss32.h"
 
 qboolean visible (edict_t *self, edict_t *other);
 
diff --git a/src/game/baseq2/m_boss32.h b/src/game/baseq2/monster/boss3/boss32.h
similarity index 100%
rename from src/game/baseq2/m_boss32.h
rename to src/game/baseq2/monster/boss3/boss32.h
diff --git a/src/game/baseq2/m_brain.c b/src/game/baseq2/monster/brain/brain.c
similarity index 99%
rename from src/game/baseq2/m_brain.c
rename to src/game/baseq2/monster/brain/brain.c
index 7d1fb8c8..04487ae5 100644
--- a/src/game/baseq2/m_brain.c
+++ b/src/game/baseq2/monster/brain/brain.c
@@ -25,8 +25,8 @@ brain
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_brain.h"
+#include "../../header/local.h"
+#include "brain.h"
 
 
 static int	sound_chest_open;
diff --git a/src/game/baseq2/m_brain.h b/src/game/baseq2/monster/brain/brain.h
similarity index 100%
rename from src/game/baseq2/m_brain.h
rename to src/game/baseq2/monster/brain/brain.h
diff --git a/src/game/baseq2/m_chick.c b/src/game/baseq2/monster/chick/chick.c
similarity index 99%
rename from src/game/baseq2/m_chick.c
rename to src/game/baseq2/monster/chick/chick.c
index 75284733..3618b662 100644
--- a/src/game/baseq2/m_chick.c
+++ b/src/game/baseq2/monster/chick/chick.c
@@ -25,8 +25,8 @@ chick
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_chick.h"
+#include "../../header/local.h"
+#include "chick.h"
 
 qboolean visible (edict_t *self, edict_t *other);
 
diff --git a/src/game/baseq2/m_chick.h b/src/game/baseq2/monster/chick/chick.h
similarity index 100%
rename from src/game/baseq2/m_chick.h
rename to src/game/baseq2/monster/chick/chick.h
diff --git a/src/game/baseq2/m_flipper.c b/src/game/baseq2/monster/flipper/flipper.c
similarity index 99%
rename from src/game/baseq2/m_flipper.c
rename to src/game/baseq2/monster/flipper/flipper.c
index 4f148dc2..52d3c7ca 100644
--- a/src/game/baseq2/m_flipper.c
+++ b/src/game/baseq2/monster/flipper/flipper.c
@@ -25,8 +25,8 @@ FLIPPER
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_flipper.h"
+#include "../../header/local.h"
+#include "flipper.h"
 
 
 static int	sound_chomp;
diff --git a/src/game/baseq2/m_flipper.h b/src/game/baseq2/monster/flipper/flipper.h
similarity index 100%
rename from src/game/baseq2/m_flipper.h
rename to src/game/baseq2/monster/flipper/flipper.h
diff --git a/src/game/baseq2/m_float.c b/src/game/baseq2/monster/float/float.c
similarity index 99%
rename from src/game/baseq2/m_float.c
rename to src/game/baseq2/monster/float/float.c
index be8eb643..738ef1ab 100644
--- a/src/game/baseq2/m_float.c
+++ b/src/game/baseq2/monster/float/float.c
@@ -25,8 +25,8 @@ floater
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_float.h"
+#include "../../header/local.h"
+#include "float.h"
 
 
 static int	sound_attack2;
diff --git a/src/game/baseq2/m_float.h b/src/game/baseq2/monster/float/float.h
similarity index 100%
rename from src/game/baseq2/m_float.h
rename to src/game/baseq2/monster/float/float.h
diff --git a/src/game/baseq2/m_flyer.c b/src/game/baseq2/monster/flyer/flyer.c
similarity index 99%
rename from src/game/baseq2/m_flyer.c
rename to src/game/baseq2/monster/flyer/flyer.c
index 2abb89a9..82466a04 100644
--- a/src/game/baseq2/m_flyer.c
+++ b/src/game/baseq2/monster/flyer/flyer.c
@@ -25,8 +25,8 @@ flyer
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_flyer.h"
+#include "../../header/local.h"
+#include "flyer.h"
 
 qboolean visible (edict_t *self, edict_t *other);
 
diff --git a/src/game/baseq2/m_flyer.h b/src/game/baseq2/monster/flyer/flyer.h
similarity index 100%
rename from src/game/baseq2/m_flyer.h
rename to src/game/baseq2/monster/flyer/flyer.h
diff --git a/src/game/baseq2/m_gladiator.c b/src/game/baseq2/monster/gladiator/gladiator.c
similarity index 99%
rename from src/game/baseq2/m_gladiator.c
rename to src/game/baseq2/monster/gladiator/gladiator.c
index c9056880..76f5efb1 100644
--- a/src/game/baseq2/m_gladiator.c
+++ b/src/game/baseq2/monster/gladiator/gladiator.c
@@ -25,8 +25,8 @@ GLADIATOR
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_gladiator.h"
+#include "../../header/local.h"
+#include "gladiator.h"
 
 
 static int	sound_pain1;
diff --git a/src/game/baseq2/m_gladiator.h b/src/game/baseq2/monster/gladiator/gladiator.h
similarity index 100%
rename from src/game/baseq2/m_gladiator.h
rename to src/game/baseq2/monster/gladiator/gladiator.h
diff --git a/src/game/baseq2/m_gunner.c b/src/game/baseq2/monster/gunner/gunner.c
similarity index 99%
rename from src/game/baseq2/m_gunner.c
rename to src/game/baseq2/monster/gunner/gunner.c
index e2928826..5fc244af 100644
--- a/src/game/baseq2/m_gunner.c
+++ b/src/game/baseq2/monster/gunner/gunner.c
@@ -25,8 +25,8 @@ GUNNER
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_gunner.h"
+#include "../../header/local.h"
+#include "gunner.h"
 
 
 static int	sound_pain;
diff --git a/src/game/baseq2/m_gunner.h b/src/game/baseq2/monster/gunner/gunner.h
similarity index 100%
rename from src/game/baseq2/m_gunner.h
rename to src/game/baseq2/monster/gunner/gunner.h
diff --git a/src/game/baseq2/m_player.h b/src/game/baseq2/monster/header/player.h
similarity index 100%
rename from src/game/baseq2/m_player.h
rename to src/game/baseq2/monster/header/player.h
diff --git a/src/game/baseq2/m_rider.h b/src/game/baseq2/monster/header/rider.h
similarity index 100%
rename from src/game/baseq2/m_rider.h
rename to src/game/baseq2/monster/header/rider.h
diff --git a/src/game/baseq2/m_hover.c b/src/game/baseq2/monster/hover/hover.c
similarity index 99%
rename from src/game/baseq2/m_hover.c
rename to src/game/baseq2/monster/hover/hover.c
index e68c627d..a995a794 100644
--- a/src/game/baseq2/m_hover.c
+++ b/src/game/baseq2/monster/hover/hover.c
@@ -25,8 +25,8 @@ hover
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_hover.h"
+#include "../../header/local.h"
+#include "hover.h"
 
 qboolean visible (edict_t *self, edict_t *other);
 
diff --git a/src/game/baseq2/m_hover.h b/src/game/baseq2/monster/hover/hover.h
similarity index 100%
rename from src/game/baseq2/m_hover.h
rename to src/game/baseq2/monster/hover/hover.h
diff --git a/src/game/baseq2/m_infantry.c b/src/game/baseq2/monster/infantry/infantry.c
similarity index 99%
rename from src/game/baseq2/m_infantry.c
rename to src/game/baseq2/monster/infantry/infantry.c
index 7f40c012..2d35433b 100644
--- a/src/game/baseq2/m_infantry.c
+++ b/src/game/baseq2/monster/infantry/infantry.c
@@ -25,8 +25,8 @@ INFANTRY
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_infantry.h"
+#include "../../header/local.h"
+#include "infantry.h"
 
 void InfantryMachineGun (edict_t *self);
 
diff --git a/src/game/baseq2/m_infantry.h b/src/game/baseq2/monster/infantry/infantry.h
similarity index 100%
rename from src/game/baseq2/m_infantry.h
rename to src/game/baseq2/monster/infantry/infantry.h
diff --git a/src/game/baseq2/m_insane.c b/src/game/baseq2/monster/insane/insane.c
similarity index 99%
rename from src/game/baseq2/m_insane.c
rename to src/game/baseq2/monster/insane/insane.c
index 769720d9..69c73c61 100644
--- a/src/game/baseq2/m_insane.c
+++ b/src/game/baseq2/monster/insane/insane.c
@@ -25,8 +25,8 @@ insane
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_insane.h"
+#include "../../header/local.h"
+#include "insane.h"
 
 
 static int	sound_fist;
diff --git a/src/game/baseq2/m_insane.h b/src/game/baseq2/monster/insane/insane.h
similarity index 100%
rename from src/game/baseq2/m_insane.h
rename to src/game/baseq2/monster/insane/insane.h
diff --git a/src/game/baseq2/m_medic.c b/src/game/baseq2/monster/medic/medic.c
similarity index 99%
rename from src/game/baseq2/m_medic.c
rename to src/game/baseq2/monster/medic/medic.c
index 5c5ba321..c25364f6 100644
--- a/src/game/baseq2/m_medic.c
+++ b/src/game/baseq2/monster/medic/medic.c
@@ -25,8 +25,8 @@ MEDIC
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_medic.h"
+#include "../../header/local.h"
+#include "medic.h"
 
 qboolean visible (edict_t *self, edict_t *other);
 
diff --git a/src/game/baseq2/m_medic.h b/src/game/baseq2/monster/medic/medic.h
similarity index 100%
rename from src/game/baseq2/m_medic.h
rename to src/game/baseq2/monster/medic/medic.h
diff --git a/src/game/baseq2/m_move.c b/src/game/baseq2/monster/misc/move.c
similarity index 99%
rename from src/game/baseq2/m_move.c
rename to src/game/baseq2/monster/misc/move.c
index 5f863a46..ac12408b 100644
--- a/src/game/baseq2/m_move.c
+++ b/src/game/baseq2/monster/misc/move.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // m_move.c -- monster movement
 
-#include "g_local.h"
+#include "../../header/local.h"
 
 #define	STEPSIZE	18
 
diff --git a/src/game/baseq2/m_mutant.c b/src/game/baseq2/monster/mutant/mutant.c
similarity index 99%
rename from src/game/baseq2/m_mutant.c
rename to src/game/baseq2/monster/mutant/mutant.c
index 00849946..b636c080 100644
--- a/src/game/baseq2/m_mutant.c
+++ b/src/game/baseq2/monster/mutant/mutant.c
@@ -25,8 +25,8 @@ mutant
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_mutant.h"
+#include "../../header/local.h"
+#include "mutant.h"
 
 
 static int	sound_swing;
diff --git a/src/game/baseq2/m_mutant.h b/src/game/baseq2/monster/mutant/mutant.h
similarity index 100%
rename from src/game/baseq2/m_mutant.h
rename to src/game/baseq2/monster/mutant/mutant.h
diff --git a/src/game/baseq2/m_parasite.c b/src/game/baseq2/monster/parasite/parasite.c
similarity index 99%
rename from src/game/baseq2/m_parasite.c
rename to src/game/baseq2/monster/parasite/parasite.c
index 33e269c4..d3e2d180 100644
--- a/src/game/baseq2/m_parasite.c
+++ b/src/game/baseq2/monster/parasite/parasite.c
@@ -25,8 +25,8 @@ parasite
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_parasite.h"
+#include "../../header/local.h"
+#include "parasite.h"
 
 
 static int	sound_pain1;
diff --git a/src/game/baseq2/m_parasite.h b/src/game/baseq2/monster/parasite/parasite.h
similarity index 100%
rename from src/game/baseq2/m_parasite.h
rename to src/game/baseq2/monster/parasite/parasite.h
diff --git a/src/game/baseq2/m_soldier.c b/src/game/baseq2/monster/soldier/soldier.c
similarity index 99%
rename from src/game/baseq2/m_soldier.c
rename to src/game/baseq2/monster/soldier/soldier.c
index 0013aa70..0e5182b9 100644
--- a/src/game/baseq2/m_soldier.c
+++ b/src/game/baseq2/monster/soldier/soldier.c
@@ -25,8 +25,8 @@ SOLDIER
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_soldier.h"
+#include "../../header/local.h"
+#include "soldier.h"
 
 
 static int	sound_idle;
diff --git a/src/game/baseq2/m_soldier.h b/src/game/baseq2/monster/soldier/soldier.h
similarity index 100%
rename from src/game/baseq2/m_soldier.h
rename to src/game/baseq2/monster/soldier/soldier.h
diff --git a/src/game/baseq2/m_supertank.c b/src/game/baseq2/monster/supertank/supertank.c
similarity index 99%
rename from src/game/baseq2/m_supertank.c
rename to src/game/baseq2/monster/supertank/supertank.c
index df7cd081..6d090f15 100644
--- a/src/game/baseq2/m_supertank.c
+++ b/src/game/baseq2/monster/supertank/supertank.c
@@ -25,8 +25,8 @@ SUPERTANK
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_supertank.h"
+#include "../../header/local.h"
+#include "supertank.h"
 
 qboolean visible (edict_t *self, edict_t *other);
 
diff --git a/src/game/baseq2/m_supertank.h b/src/game/baseq2/monster/supertank/supertank.h
similarity index 100%
rename from src/game/baseq2/m_supertank.h
rename to src/game/baseq2/monster/supertank/supertank.h
diff --git a/src/game/baseq2/m_tank.c b/src/game/baseq2/monster/tank/tank.c
similarity index 99%
rename from src/game/baseq2/m_tank.c
rename to src/game/baseq2/monster/tank/tank.c
index bca81c0e..a7cd8e4b 100644
--- a/src/game/baseq2/m_tank.c
+++ b/src/game/baseq2/monster/tank/tank.c
@@ -25,8 +25,8 @@ TANK
 ==============================================================================
 */
 
-#include "g_local.h"
-#include "m_tank.h"
+#include "../../header/local.h"
+#include "tank.h"
 
 
 void tank_refire_rocket (edict_t *self);
diff --git a/src/game/baseq2/m_tank.h b/src/game/baseq2/monster/tank/tank.h
similarity index 100%
rename from src/game/baseq2/m_tank.h
rename to src/game/baseq2/monster/tank/tank.h
diff --git a/src/game/baseq2/p_client.c b/src/game/baseq2/player/client.c
similarity index 99%
rename from src/game/baseq2/p_client.c
rename to src/game/baseq2/player/client.c
index 79f4a519..07d508e0 100644
--- a/src/game/baseq2/p_client.c
+++ b/src/game/baseq2/player/client.c
@@ -24,8 +24,8 @@
  * =======================================================================
  */
 
-#include "g_local.h"
-#include "m_player.h"
+#include "../header/local.h"
+#include "../monster/header/player.h"
 
 void ClientUserinfoChanged(edict_t *ent, char *userinfo);
 void SP_misc_teleporter_dest(edict_t *ent);
diff --git a/src/game/baseq2/p_hud.c b/src/game/baseq2/player/hud.c
similarity index 99%
rename from src/game/baseq2/p_hud.c
rename to src/game/baseq2/player/hud.c
index 1ec672ea..2b63428f 100644
--- a/src/game/baseq2/p_hud.c
+++ b/src/game/baseq2/player/hud.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */
 
-#include "g_local.h"
+#include "../header/local.h"
 
 void
 MoveClientToIntermission(edict_t *ent)
diff --git a/src/game/baseq2/p_trail.c b/src/game/baseq2/player/trail.c
similarity index 99%
rename from src/game/baseq2/p_trail.c
rename to src/game/baseq2/player/trail.c
index 54bf8c52..9aadf1b7 100644
--- a/src/game/baseq2/p_trail.c
+++ b/src/game/baseq2/player/trail.c
@@ -24,7 +24,7 @@
  * =======================================================================
  */ 
 
-#include "g_local.h"
+#include "../header/local.h"
 
 /*
  * This is a circular list containing the a list of points of where
diff --git a/src/game/baseq2/p_view.c b/src/game/baseq2/player/view.c
similarity index 99%
rename from src/game/baseq2/p_view.c
rename to src/game/baseq2/player/view.c
index 7178170b..0da6929d 100644
--- a/src/game/baseq2/p_view.c
+++ b/src/game/baseq2/player/view.c
@@ -24,8 +24,8 @@
  * =======================================================================
  */ 
 
-#include "g_local.h"
-#include "m_player.h"
+#include "../header/local.h"
+#include "../monster/header/player.h"
 
 static edict_t *current_player;
 static gclient_t *current_client;
diff --git a/src/game/baseq2/p_weapon.c b/src/game/baseq2/player/weapon.c
similarity index 99%
rename from src/game/baseq2/p_weapon.c
rename to src/game/baseq2/player/weapon.c
index 8af2a6d9..90085eb5 100644
--- a/src/game/baseq2/p_weapon.c
+++ b/src/game/baseq2/player/weapon.c
@@ -24,8 +24,8 @@
  * =======================================================================
  */
 
-#include "g_local.h"
-#include "m_player.h"
+#include "../header/local.h"
+#include "../monster/header/player.h"
  
 #define FRAME_FIRE_FIRST (FRAME_ACTIVATE_LAST + 1)
 #define FRAME_IDLE_FIRST (FRAME_FIRE_LAST + 1)
diff --git a/src/game/baseq2/savegame/savegame.c b/src/game/baseq2/savegame/savegame.c
index 3b87481b..10490e92 100644
--- a/src/game/baseq2/savegame/savegame.c
+++ b/src/game/baseq2/savegame/savegame.c
@@ -64,7 +64,7 @@
  * system and architecture are in the hands of the user.
  */
 
-#include "../g_local.h"
+#include "../header/local.h"
 
 /* 
  * When ever the savegame version
diff --git a/src/server/header/server.h b/src/server/header/server.h
index eecc6db8..8858ef58 100644
--- a/src/server/header/server.h
+++ b/src/server/header/server.h
@@ -28,7 +28,7 @@
 #define SV_SERVER_H
 
 #include "../../common/header/common.h"
-#include "../../game/baseq2/game.h"
+#include "../../game/baseq2/header/game.h"
 
 #define MAX_MASTERS 8 
 #define LATENCY_COUNTS  16