diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt
index 53a072fb7..86037d73b 100644
--- a/zone/CMakeLists.txt
+++ b/zone/CMakeLists.txt
@@ -354,6 +354,31 @@ set(gm_command_sources
     gm_commands/evolving_items.cpp
     gm_commands/feature.cpp
     gm_commands/find.cpp
+	gm_commands/find/find_aa.cpp
+	gm_commands/find/find_account.cpp
+	gm_commands/find/find_body_type.cpp
+	gm_commands/find/find_bot.cpp
+	gm_commands/find/find_bug_category.cpp
+	gm_commands/find/find_character.cpp
+	gm_commands/find/find_class.cpp
+	gm_commands/find/find_comparison_type.cpp
+	gm_commands/find/find_currency.cpp
+	gm_commands/find/find_deity.cpp
+	gm_commands/find/find_emote.cpp
+	gm_commands/find/find_faction.cpp
+	gm_commands/find/find_item.cpp
+	gm_commands/find/find_language.cpp
+	gm_commands/find/find_ldon_theme.cpp
+	gm_commands/find/find_npctype.cpp
+	gm_commands/find/find_object_type.cpp
+	gm_commands/find/find_race.cpp
+	gm_commands/find/find_recipe.cpp
+	gm_commands/find/find_skill.cpp
+	gm_commands/find/find_special_ability.cpp
+	gm_commands/find/find_spell.cpp
+	gm_commands/find/find_stance.cpp
+	gm_commands/find/find_task.cpp
+	gm_commands/find/find_zone.cpp
     gm_commands/fish.cpp
     gm_commands/fixmob.cpp
     gm_commands/flagedit.cpp
@@ -577,6 +602,34 @@ set(gm_command_sources
     gm_commands/zsave.cpp
 )
 
+source_group(find FILES
+	gm_commands/find/find_aa.cpp
+	gm_commands/find/find_account.cpp
+	gm_commands/find/find_body_type.cpp
+	gm_commands/find/find_bot.cpp
+	gm_commands/find/find_bug_category.cpp
+	gm_commands/find/find_character.cpp
+	gm_commands/find/find_class.cpp
+	gm_commands/find/find_comparison_type.cpp
+	gm_commands/find/find_currency.cpp
+	gm_commands/find/find_deity.cpp
+	gm_commands/find/find_emote.cpp
+	gm_commands/find/find_faction.cpp
+	gm_commands/find/find_item.cpp
+	gm_commands/find/find_language.cpp
+	gm_commands/find/find_ldon_theme.cpp
+	gm_commands/find/find_npctype.cpp
+	gm_commands/find/find_object_type.cpp
+	gm_commands/find/find_race.cpp
+	gm_commands/find/find_recipe.cpp
+	gm_commands/find/find_skill.cpp
+	gm_commands/find/find_special_ability.cpp
+	gm_commands/find/find_spell.cpp
+	gm_commands/find/find_stance.cpp
+	gm_commands/find/find_task.cpp
+	gm_commands/find/find_zone.cpp
+)
+
 source_group(set FILES 
     gm_commands/set/set_aa_exp.cpp
     gm_commands/set/set_aa_points.cpp
diff --git a/zone/gm_commands/find.cpp b/zone/gm_commands/find.cpp
index 6ee5815cb..a5e2bad3d 100644
--- a/zone/gm_commands/find.cpp
+++ b/zone/gm_commands/find.cpp
@@ -1,29 +1,30 @@
 #include "../client.h"
-#include "find/aa.cpp"
-#include "find/account.cpp"
-#include "find/body_type.cpp"
-#include "find/bot.cpp"
-#include "find/bug_category.cpp"
-#include "find/character.cpp"
-#include "find/class.cpp"
-#include "find/comparison_type.cpp"
-#include "find/currency.cpp"
-#include "find/deity.cpp"
-#include "find/emote.cpp"
-#include "find/faction.cpp"
-#include "find/item.cpp"
-#include "find/language.cpp"
-#include "find/ldon_theme.cpp"
-#include "find/npctype.cpp"
-#include "find/object_type.cpp"
-#include "find/race.cpp"
-#include "find/recipe.cpp"
-#include "find/skill.cpp"
-#include "find/stance.cpp"
-#include "find/spell.cpp"
-#include "find/special_ability.cpp"
-#include "find/task.cpp"
-#include "find/zone.cpp"
+
+void FindAA(Client* c, const Seperator* sep);
+void FindAccount(Client* c, const Seperator* sep);
+void FindBodyType(Client* c, const Seperator* sep);
+void FindBot(Client* c, const Seperator* sep);
+void FindBugCategory(Client* c, const Seperator* sep);
+void FindCharacter(Client* c, const Seperator* sep);
+void FindClass(Client* c, const Seperator* sep);
+void FindComparisonType(Client* c, const Seperator* sep);
+void FindCurrency(Client* c, const Seperator* sep);
+void FindDeity(Client* c, const Seperator* sep);
+void FindEmote(Client* c, const Seperator* sep);
+void FindFaction(Client* c, const Seperator* sep);
+void FindItem(Client* c, const Seperator* sep);
+void FindLanguage(Client* c, const Seperator* sep);
+void FindLDoNTheme(Client* c, const Seperator* sep);
+void FindNPCType(Client* c, const Seperator* sep);
+void FindObjectType(Client* c, const Seperator* sep);
+void FindRace(Client* c, const Seperator* sep);
+void FindRecipe(Client* c, const Seperator* sep);
+void FindSkill(Client* c, const Seperator* sep);
+void FindSpecialAbility(Client* c, const Seperator* sep);
+void FindStance(Client* c, const Seperator* sep);
+void FindSpell(Client* c, const Seperator* sep);
+void FindTask(Client* c, const Seperator* sep);
+void FindZone(Client* c, const Seperator* sep);
 
 void command_find(Client *c, const Seperator *sep)
 {
diff --git a/zone/gm_commands/find/aa.cpp b/zone/gm_commands/find/find_aa.cpp
similarity index 100%
rename from zone/gm_commands/find/aa.cpp
rename to zone/gm_commands/find/find_aa.cpp
diff --git a/zone/gm_commands/find/account.cpp b/zone/gm_commands/find/find_account.cpp
similarity index 94%
rename from zone/gm_commands/find/account.cpp
rename to zone/gm_commands/find/find_account.cpp
index 1265c8431..17512b2a8 100644
--- a/zone/gm_commands/find/account.cpp
+++ b/zone/gm_commands/find/find_account.cpp
@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/repositories/account_repository.h"
+#include "../../../common/repositories/account_repository.h"
 
 void FindAccount(Client *c, const Seperator *sep)
 {
diff --git a/zone/gm_commands/find/body_type.cpp b/zone/gm_commands/find/find_body_type.cpp
similarity index 100%
rename from zone/gm_commands/find/body_type.cpp
rename to zone/gm_commands/find/find_body_type.cpp
diff --git a/zone/gm_commands/find/bot.cpp b/zone/gm_commands/find/find_bot.cpp
similarity index 96%
rename from zone/gm_commands/find/bot.cpp
rename to zone/gm_commands/find/find_bot.cpp
index 061d4c428..fd403d670 100644
--- a/zone/gm_commands/find/bot.cpp
+++ b/zone/gm_commands/find/find_bot.cpp
@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/repositories/bot_data_repository.h"
+#include "../../../common/repositories/bot_data_repository.h"
 
 void FindBot(Client *c, const Seperator *sep)
 {
diff --git a/zone/gm_commands/find/bug_category.cpp b/zone/gm_commands/find/find_bug_category.cpp
similarity index 100%
rename from zone/gm_commands/find/bug_category.cpp
rename to zone/gm_commands/find/find_bug_category.cpp
diff --git a/zone/gm_commands/find/character.cpp b/zone/gm_commands/find/find_character.cpp
similarity index 95%
rename from zone/gm_commands/find/character.cpp
rename to zone/gm_commands/find/find_character.cpp
index 9029c252e..0c1842eff 100644
--- a/zone/gm_commands/find/character.cpp
+++ b/zone/gm_commands/find/find_character.cpp
@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/repositories/character_data_repository.h"
+#include "../../../common/repositories/character_data_repository.h"
 
 void FindCharacter(Client *c, const Seperator *sep)
 {
diff --git a/zone/gm_commands/find/class.cpp b/zone/gm_commands/find/find_class.cpp
similarity index 100%
rename from zone/gm_commands/find/class.cpp
rename to zone/gm_commands/find/find_class.cpp
diff --git a/zone/gm_commands/find/comparison_type.cpp b/zone/gm_commands/find/find_comparison_type.cpp
similarity index 100%
rename from zone/gm_commands/find/comparison_type.cpp
rename to zone/gm_commands/find/find_comparison_type.cpp
diff --git a/zone/gm_commands/find/currency.cpp b/zone/gm_commands/find/find_currency.cpp
similarity index 100%
rename from zone/gm_commands/find/currency.cpp
rename to zone/gm_commands/find/find_currency.cpp
diff --git a/zone/gm_commands/find/deity.cpp b/zone/gm_commands/find/find_deity.cpp
similarity index 100%
rename from zone/gm_commands/find/deity.cpp
rename to zone/gm_commands/find/find_deity.cpp
diff --git a/zone/gm_commands/find/emote.cpp b/zone/gm_commands/find/find_emote.cpp
similarity index 100%
rename from zone/gm_commands/find/emote.cpp
rename to zone/gm_commands/find/find_emote.cpp
diff --git a/zone/gm_commands/find/faction.cpp b/zone/gm_commands/find/find_faction.cpp
similarity index 100%
rename from zone/gm_commands/find/faction.cpp
rename to zone/gm_commands/find/find_faction.cpp
diff --git a/zone/gm_commands/find/item.cpp b/zone/gm_commands/find/find_item.cpp
similarity index 97%
rename from zone/gm_commands/find/item.cpp
rename to zone/gm_commands/find/find_item.cpp
index 7963e8cb6..0f4870701 100644
--- a/zone/gm_commands/find/item.cpp
+++ b/zone/gm_commands/find/find_item.cpp
@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/repositories/items_repository.h"
+#include "../../../common/repositories/items_repository.h"
 
 void FindItem(Client *c, const Seperator *sep)
 {
diff --git a/zone/gm_commands/find/language.cpp b/zone/gm_commands/find/find_language.cpp
similarity index 100%
rename from zone/gm_commands/find/language.cpp
rename to zone/gm_commands/find/find_language.cpp
diff --git a/zone/gm_commands/find/ldon_theme.cpp b/zone/gm_commands/find/find_ldon_theme.cpp
similarity index 100%
rename from zone/gm_commands/find/ldon_theme.cpp
rename to zone/gm_commands/find/find_ldon_theme.cpp
diff --git a/zone/gm_commands/find/npctype.cpp b/zone/gm_commands/find/find_npctype.cpp
similarity index 100%
rename from zone/gm_commands/find/npctype.cpp
rename to zone/gm_commands/find/find_npctype.cpp
diff --git a/zone/gm_commands/find/object_type.cpp b/zone/gm_commands/find/find_object_type.cpp
similarity index 100%
rename from zone/gm_commands/find/object_type.cpp
rename to zone/gm_commands/find/find_object_type.cpp
diff --git a/zone/gm_commands/find/race.cpp b/zone/gm_commands/find/find_race.cpp
similarity index 100%
rename from zone/gm_commands/find/race.cpp
rename to zone/gm_commands/find/find_race.cpp
diff --git a/zone/gm_commands/find/recipe.cpp b/zone/gm_commands/find/find_recipe.cpp
similarity index 96%
rename from zone/gm_commands/find/recipe.cpp
rename to zone/gm_commands/find/find_recipe.cpp
index 5aefe1044..260c6dccf 100644
--- a/zone/gm_commands/find/recipe.cpp
+++ b/zone/gm_commands/find/find_recipe.cpp
@@ -1,6 +1,6 @@
 #include "../../client.h"
 #include "../../command.h"
-#include "../../common/repositories/tradeskill_recipe_repository.h"
+#include "../../../common/repositories/tradeskill_recipe_repository.h"
 
 void FindRecipe(Client *c, const Seperator *sep)
 {
diff --git a/zone/gm_commands/find/skill.cpp b/zone/gm_commands/find/find_skill.cpp
similarity index 100%
rename from zone/gm_commands/find/skill.cpp
rename to zone/gm_commands/find/find_skill.cpp
diff --git a/zone/gm_commands/find/special_ability.cpp b/zone/gm_commands/find/find_special_ability.cpp
similarity index 100%
rename from zone/gm_commands/find/special_ability.cpp
rename to zone/gm_commands/find/find_special_ability.cpp
diff --git a/zone/gm_commands/find/spell.cpp b/zone/gm_commands/find/find_spell.cpp
similarity index 100%
rename from zone/gm_commands/find/spell.cpp
rename to zone/gm_commands/find/find_spell.cpp
diff --git a/zone/gm_commands/find/stance.cpp b/zone/gm_commands/find/find_stance.cpp
similarity index 100%
rename from zone/gm_commands/find/stance.cpp
rename to zone/gm_commands/find/find_stance.cpp
diff --git a/zone/gm_commands/find/task.cpp b/zone/gm_commands/find/find_task.cpp
similarity index 100%
rename from zone/gm_commands/find/task.cpp
rename to zone/gm_commands/find/find_task.cpp
diff --git a/zone/gm_commands/find/zone.cpp b/zone/gm_commands/find/find_zone.cpp
similarity index 98%
rename from zone/gm_commands/find/zone.cpp
rename to zone/gm_commands/find/find_zone.cpp
index c943f3e1d..6715649d9 100644
--- a/zone/gm_commands/find/zone.cpp
+++ b/zone/gm_commands/find/find_zone.cpp
@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/content/world_content_service.h"
+#include "../../../common/content/world_content_service.h"
 
 void FindZone(Client* c, const Seperator* sep)
 {