diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index 59358d33a2a..f1fcf9ce960 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -363,6 +363,7 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA
 #define IS_MOTH (1<<3)
 #define IS_SECTOID (1<<4)
 #define IS_MONKEY (1<<5)
+#define IS_YAUTJA (1<<6)
 //=================================================
 
 //AFK status
@@ -871,7 +872,6 @@ GLOBAL_LIST_INIT(human_body_parts, list(BODY_ZONE_HEAD,
 ///Slowdown for favehuggers moving through liquid
 #define FACEHUGGER_WATER_SLOWDOWN 1.6
 
-
 //Species defines
 
 ///Human species or those that functional behave like them. Default species
@@ -888,8 +888,6 @@ GLOBAL_LIST_INIT(human_body_parts, list(BODY_ZONE_HEAD,
 ///Default damage for slamming a mob against another mob
 #define BASE_MOB_SLAM_DAMAGE 8
 
-#define IS_YAUTJA (1<<6)
-
 #define MOTH_WINGS_LAYER 28
 #define MUTATIONS_LAYER 27
 #define DAMAGE_LAYER 26
@@ -897,3 +895,28 @@ GLOBAL_LIST_INIT(human_body_parts, list(BODY_ZONE_HEAD,
 #define PRED_LASER_LAYER 1.9
 #define LASER_LAYER 1.8
 #define TOTAL_LAYERS 30
+
+// Yautja defines
+
+//Gear select defines
+#define YAUTJA_GEAR_GLAIVE "The Lumbering Glaive"
+#define YAUTJA_GEAR_WHIP "The Rending Chain-Whip"
+#define YAUTJA_GEAR_SWORD "The Piercing Hunting Sword"
+#define YAUTJA_GEAR_SCYTHE "The Cleaving War-Scythe"
+#define YAUTJA_GEAR_STICK "The Adaptive Combi-Stick"
+#define YAUTJA_GEAR_SPEAR "The Nimble Spear"
+#define YAUTJA_GEAR_SCIMS "The Fearsome Scimitars"
+#define YAUTJA_GEAR_LAUNCHER "The Fleeting Spike Launcher"
+#define YAUTJA_GEAR_PISTOL "The Swift Plasma Pistol"
+#define YAUTJA_GEAR_DISC "The Purifying Smart-Disc"
+#define YAUTJA_GEAR_FULL_ARMOR "The Formidable Plate Armor"
+#define YAUTJA_GEAR_SHIELD "The Steadfast Shield"
+#define YAUTJA_GEAR_DRONE "The Agile Drone"
+
+#define YAUTJA_GEAR_GLAIVE_ALT "The Imposing Glaive"
+#define YAUTJA_GEAR_SCYTHE_ALT "The Ripping War-Scythe"
+
+#define YAUTJA_THRALL_GEAR_MACHETE "The Swift Machete"
+#define YAUTJA_THRALL_GEAR_RAPIER "The Dancing Rapier"
+#define YAUTJA_THRALL_GEAR_CLAYMORE "The Broad Claymore"
+#define YAUTJA_THRALL_GEAR_FIREAXE "The Purposeful Fireaxe"
diff --git a/code/modules/cm_preds/_yaut_defines.dm b/code/modules/cm_preds/_yaut_defines.dm
deleted file mode 100644
index c6d31b5f812..00000000000
--- a/code/modules/cm_preds/_yaut_defines.dm
+++ /dev/null
@@ -1,22 +0,0 @@
-//Gear select defines
-#define YAUTJA_GEAR_GLAIVE "The Lumbering Glaive"
-#define YAUTJA_GEAR_WHIP "The Rending Chain-Whip"
-#define YAUTJA_GEAR_SWORD "The Piercing Hunting Sword"
-#define YAUTJA_GEAR_SCYTHE "The Cleaving War-Scythe"
-#define YAUTJA_GEAR_STICK "The Adaptive Combi-Stick"
-#define YAUTJA_GEAR_SPEAR "The Nimble Spear"
-#define YAUTJA_GEAR_SCIMS "The Fearsome Scimitars"
-#define YAUTJA_GEAR_LAUNCHER "The Fleeting Spike Launcher"
-#define YAUTJA_GEAR_PISTOL "The Swift Plasma Pistol"
-#define YAUTJA_GEAR_DISC "The Purifying Smart-Disc"
-#define YAUTJA_GEAR_FULL_ARMOR "The Formidable Plate Armor"
-#define YAUTJA_GEAR_SHIELD "The Steadfast Shield"
-#define YAUTJA_GEAR_DRONE "The Agile Drone"
-
-#define YAUTJA_GEAR_GLAIVE_ALT "The Imposing Glaive"
-#define YAUTJA_GEAR_SCYTHE_ALT "The Ripping War-Scythe"
-
-#define YAUTJA_THRALL_GEAR_MACHETE "The Swift Machete"
-#define YAUTJA_THRALL_GEAR_RAPIER "The Dancing Rapier"
-#define YAUTJA_THRALL_GEAR_CLAYMORE "The Broad Claymore"
-#define YAUTJA_THRALL_GEAR_FIREAXE "The Purposeful Fireaxe"
diff --git a/code/modules/cm_preds/falcon.dm b/code/modules/predator/falcon.dm
similarity index 100%
rename from code/modules/cm_preds/falcon.dm
rename to code/modules/predator/falcon.dm
diff --git a/code/modules/cm_preds/huntdata.dm b/code/modules/predator/huntdata.dm
similarity index 100%
rename from code/modules/cm_preds/huntdata.dm
rename to code/modules/predator/huntdata.dm
diff --git a/code/modules/cm_preds/keybinds.dm b/code/modules/predator/keybinds.dm
similarity index 100%
rename from code/modules/cm_preds/keybinds.dm
rename to code/modules/predator/keybinds.dm
diff --git a/code/modules/cm_preds/landmakrs.dm b/code/modules/predator/landmakrs.dm
similarity index 100%
rename from code/modules/cm_preds/landmakrs.dm
rename to code/modules/predator/landmakrs.dm
diff --git a/code/modules/cm_preds/predator_action.dm b/code/modules/predator/predator_action.dm
similarity index 100%
rename from code/modules/cm_preds/predator_action.dm
rename to code/modules/predator/predator_action.dm
diff --git a/code/modules/cm_preds/smartdisc.dm b/code/modules/predator/smartdisc.dm
similarity index 100%
rename from code/modules/cm_preds/smartdisc.dm
rename to code/modules/predator/smartdisc.dm
diff --git a/code/modules/cm_preds/thrall_items.dm b/code/modules/predator/thrall/items.dm
similarity index 100%
rename from code/modules/cm_preds/thrall_items.dm
rename to code/modules/predator/thrall/items.dm
diff --git a/code/modules/cm_preds/thrall_procs.dm b/code/modules/predator/thrall/procs.dm
similarity index 100%
rename from code/modules/cm_preds/thrall_procs.dm
rename to code/modules/predator/thrall/procs.dm
diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/predator/yautja/bracers.dm
similarity index 100%
rename from code/modules/cm_preds/yaut_bracers.dm
rename to code/modules/predator/yautja/bracers.dm
diff --git a/code/modules/cm_preds/yaut_chems.dm b/code/modules/predator/yautja/chems.dm
similarity index 100%
rename from code/modules/cm_preds/yaut_chems.dm
rename to code/modules/predator/yautja/chems.dm
diff --git a/code/modules/cm_preds/yaut_hudprocs.dm b/code/modules/predator/yautja/hudprocs.dm
similarity index 100%
rename from code/modules/cm_preds/yaut_hudprocs.dm
rename to code/modules/predator/yautja/hudprocs.dm
diff --git a/code/modules/cm_preds/yaut_items.dm b/code/modules/predator/yautja/items.dm
similarity index 99%
rename from code/modules/cm_preds/yaut_items.dm
rename to code/modules/predator/yautja/items.dm
index d96349d6589..51e027e658b 100644
--- a/code/modules/cm_preds/yaut_items.dm
+++ b/code/modules/predator/yautja/items.dm
@@ -1,6 +1,6 @@
 //Items specific to yautja. Other people can use em, they're not restricted or anything.
 //They can't, however, activate any of the special functions.
-//Thrall subtypes are located in /code/modules/cm_preds/thrall_items.dm
+//Thrall subtypes are located in /code/modules/predator/thrall_items.dm
 
 /proc/add_to_missing_pred_gear(obj/item/W)
 	if(!is_centcom_level(W.z))
diff --git a/code/modules/cm_preds/yaut_machines.dm b/code/modules/predator/yautja/machines.dm
similarity index 100%
rename from code/modules/cm_preds/yaut_machines.dm
rename to code/modules/predator/yautja/machines.dm
diff --git a/code/modules/cm_preds/yaut_mask.dm b/code/modules/predator/yautja/mask.dm
similarity index 100%
rename from code/modules/cm_preds/yaut_mask.dm
rename to code/modules/predator/yautja/mask.dm
diff --git a/code/modules/cm_preds/yaut_procs.dm b/code/modules/predator/yautja/procs.dm
similarity index 100%
rename from code/modules/cm_preds/yaut_procs.dm
rename to code/modules/predator/yautja/procs.dm
diff --git a/code/modules/cm_preds/yautja_rope.dm b/code/modules/predator/yautja/rope.dm
similarity index 100%
rename from code/modules/cm_preds/yautja_rope.dm
rename to code/modules/predator/yautja/rope.dm
diff --git a/code/modules/cm_preds/yaut_shield.dm b/code/modules/predator/yautja/shield.dm
similarity index 100%
rename from code/modules/cm_preds/yaut_shield.dm
rename to code/modules/predator/yautja/shield.dm
diff --git a/code/modules/cm_preds/yautja_weapons/misc_weapons.dm b/code/modules/predator/yautja/weapons/misc_weapons.dm
similarity index 100%
rename from code/modules/cm_preds/yautja_weapons/misc_weapons.dm
rename to code/modules/predator/yautja/weapons/misc_weapons.dm
diff --git a/code/modules/cm_preds/yautja_weapons/one_handed.dm b/code/modules/predator/yautja/weapons/one_handed.dm
similarity index 100%
rename from code/modules/cm_preds/yautja_weapons/one_handed.dm
rename to code/modules/predator/yautja/weapons/one_handed.dm
diff --git a/code/modules/cm_preds/yautja_weapons/ranged.dm b/code/modules/predator/yautja/weapons/ranged.dm
similarity index 100%
rename from code/modules/cm_preds/yautja_weapons/ranged.dm
rename to code/modules/predator/yautja/weapons/ranged.dm
diff --git a/code/modules/cm_preds/yautja_weapons/two_handed.dm b/code/modules/predator/yautja/weapons/two_handed.dm
similarity index 100%
rename from code/modules/cm_preds/yautja_weapons/two_handed.dm
rename to code/modules/predator/yautja/weapons/two_handed.dm
diff --git a/tgmc.dme b/tgmc.dme
index e1ba71445e0..000182fbbc5 100644
--- a/tgmc.dme
+++ b/tgmc.dme
@@ -1398,28 +1398,6 @@
 #include "code\modules\clothing\under\jobs\engineering.dm"
 #include "code\modules\clothing\under\jobs\medsci.dm"
 #include "code\modules\clothing\under\jobs\security.dm"
-#include "code\modules\cm_preds\_yaut_defines.dm"
-#include "code\modules\cm_preds\falcon.dm"
-#include "code\modules\cm_preds\huntdata.dm"
-#include "code\modules\cm_preds\keybinds.dm"
-#include "code\modules\cm_preds\landmakrs.dm"
-#include "code\modules\cm_preds\predator_action.dm"
-#include "code\modules\cm_preds\smartdisc.dm"
-#include "code\modules\cm_preds\thrall_items.dm"
-#include "code\modules\cm_preds\thrall_procs.dm"
-#include "code\modules\cm_preds\yaut_bracers.dm"
-#include "code\modules\cm_preds\yaut_chems.dm"
-#include "code\modules\cm_preds\yaut_hudprocs.dm"
-#include "code\modules\cm_preds\yaut_items.dm"
-#include "code\modules\cm_preds\yaut_machines.dm"
-#include "code\modules\cm_preds\yaut_mask.dm"
-#include "code\modules\cm_preds\yaut_procs.dm"
-#include "code\modules\cm_preds\yaut_shield.dm"
-#include "code\modules\cm_preds\yautja_rope.dm"
-#include "code\modules\cm_preds\yautja_weapons\misc_weapons.dm"
-#include "code\modules\cm_preds\yautja_weapons\one_handed.dm"
-#include "code\modules\cm_preds\yautja_weapons\ranged.dm"
-#include "code\modules\cm_preds\yautja_weapons\two_handed.dm"
 #include "code\modules\codex\codex_atom.dm"
 #include "code\modules\codex\codex_client.dm"
 #include "code\modules\codex\codex_mob.dm"
@@ -1882,6 +1860,27 @@
 #include "code\modules\power\apc\apc_attack.dm"
 #include "code\modules\power\apc\apc_tool_act.dm"
 #include "code\modules\power\singularity\emitter.dm"
+#include "code\modules\predator\falcon.dm"
+#include "code\modules\predator\huntdata.dm"
+#include "code\modules\predator\keybinds.dm"
+#include "code\modules\predator\landmakrs.dm"
+#include "code\modules\predator\predator_action.dm"
+#include "code\modules\predator\smartdisc.dm"
+#include "code\modules\predator\thrall\items.dm"
+#include "code\modules\predator\thrall\procs.dm"
+#include "code\modules\predator\yautja\bracers.dm"
+#include "code\modules\predator\yautja\chems.dm"
+#include "code\modules\predator\yautja\hudprocs.dm"
+#include "code\modules\predator\yautja\items.dm"
+#include "code\modules\predator\yautja\machines.dm"
+#include "code\modules\predator\yautja\mask.dm"
+#include "code\modules\predator\yautja\procs.dm"
+#include "code\modules\predator\yautja\shield.dm"
+#include "code\modules\predator\yautja\rope.dm"
+#include "code\modules\predator\yautja\weapons\misc_weapons.dm"
+#include "code\modules\predator\yautja\weapons\one_handed.dm"
+#include "code\modules\predator\yautja\weapons\ranged.dm"
+#include "code\modules\predator\yautja\weapons\two_handed.dm"
 #include "code\modules\projectiles\ammo_datums.dm"
 #include "code\modules\projectiles\ammunition.dm"
 #include "code\modules\projectiles\gun_attachables.dm"