-#include "../common/util-pre.qh"
-#include "../dpdefs/csprogsdefs.qh"
-#include "../common/util-post.qh"
-
#include "../lib/_all.inc"
+#include "_all.qh"
+
+#include "../common/effects/qc/all.qc"
#include "announcer.qc"
#include "bgmscript.qc"
-#include "controlpoint.qc"
#include "csqcmodel_hooks.qc"
-#include "damage.qc"
-#include "effects.qc"
-#include "generator.qc"
-#include "gibs.qc"
#include "hook.qc"
-#include "hud.qc"
-#include "hud_config.qc"
+#include "hud/all.qc"
#include "main.qc"
#include "mapvoting.qc"
#include "miscfunctions.qc"
-#include "modeleffects.qc"
#include "movelib.qc"
-#include "particles.qc"
#include "player_skeleton.qc"
-#include "rubble.qc"
#include "scoreboard.qc"
#include "shownames.qc"
#include "teamradar.qc"
#include "view.qc"
#include "wall.qc"
-#include "command/all.qc"
+#include "commands/all.qc"
#include "weapons/projectile.qc" // TODO
#include "../common/animdecide.qc"
-#include "../common/buffs.qc"
-#include "../common/effects/effects.qc"
+#include "../common/effects/effectinfo.qc"
#include "../common/mapinfo.qc"
#include "../common/movetypes/include.qc"
-#include "../common/nades.qc"
#include "../common/net_notice.qc"
#include "../common/notifications.qc"
#include "../common/physics.qc"
#include "../common/minigames/minigames.qc"
#include "../common/minigames/cl_minigames.qc"
+#include "../common/buffs/all.qc"
+#include "../common/deathtypes/all.qc"
+#include "../common/effects/all.qc"
+#include "../common/gamemodes/all.qc"
#include "../common/items/all.qc"
#include "../common/monsters/all.qc"
#include "../common/mutators/all.qc"
+#include "../common/nades/all.qc"
+#include "../common/turrets/all.qc"
#include "../common/vehicles/all.qc"
#include "../common/weapons/all.qc"
#include "../common/turrets/cl_turrets.qc"
-#include "../common/turrets/all.qc"
#include "../common/triggers/include.qc"
-#include "../csqcmodellib/cl_model.qc"
-#include "../csqcmodellib/cl_player.qc"
-#include "../csqcmodellib/interpolate.qc"
-
-#include "../server/mutators/mutator_multijump.qc"
+#include "../lib/csqcmodel/cl_model.qc"
+#include "../lib/csqcmodel/cl_player.qc"
+#include "../lib/csqcmodel/interpolate.qc"
-#include "../warpzonelib/anglestransform.qc"
-#include "../warpzonelib/client.qc"
-#include "../warpzonelib/common.qc"
-#include "../warpzonelib/util_server.qc"
+#include "../lib/warpzone/anglestransform.qc"
+#include "../lib/warpzone/client.qc"
+#include "../lib/warpzone/common.qc"
+#include "../lib/warpzone/util_server.qc"
-#include "../mod/client/progs.inc"
+#if BUILD_MOD
+#include "../../mod/client/progs.inc"
+#endif