diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt
index 28f0a6eea..53a072fb7 100644
--- a/zone/CMakeLists.txt
+++ b/zone/CMakeLists.txt
@@ -489,6 +489,58 @@ set(gm_command_sources
     gm_commands/set/set_weather.cpp
     gm_commands/set/set_zone.cpp
     gm_commands/show.cpp
+	gm_commands/show/show_aas.cpp
+    gm_commands/show/show_aa_points.cpp
+    gm_commands/show/show_aggro.cpp
+    gm_commands/show/show_auto_login.cpp
+    gm_commands/show/show_buffs.cpp
+    gm_commands/show/show_buried_corpse_count.cpp
+    gm_commands/show/show_client_version_summary.cpp
+    gm_commands/show/show_content_flags.cpp
+    gm_commands/show/show_currencies.cpp
+    gm_commands/show/show_distance.cpp
+    gm_commands/show/show_emotes.cpp
+    gm_commands/show/show_field_of_view.cpp
+    gm_commands/show/show_flags.cpp
+    gm_commands/show/show_group_info.cpp
+    gm_commands/show/show_hatelist.cpp
+    gm_commands/show/show_inventory.cpp
+    gm_commands/show/show_ip_lookup.cpp
+    gm_commands/show/show_keyring.cpp
+    gm_commands/show/show_line_of_sight.cpp
+    gm_commands/show/show_network.cpp
+    gm_commands/show/show_network_stats.cpp
+    gm_commands/show/show_npc_global_loot.cpp
+    gm_commands/show/show_npc_stats.cpp
+    gm_commands/show/show_npc_type.cpp
+    gm_commands/show/show_peqzone_flags.cpp
+    gm_commands/show/show_petition.cpp
+    gm_commands/show/show_petition_info.cpp
+    gm_commands/show/show_proximity.cpp
+    gm_commands/show/show_quest_errors.cpp
+    gm_commands/show/show_quest_globals.cpp
+    gm_commands/show/show_recipe.cpp
+    gm_commands/show/show_server_info.cpp
+    gm_commands/show/show_skills.cpp
+    gm_commands/show/show_spawn_status.cpp
+    gm_commands/show/show_special_abilities.cpp
+    gm_commands/show/show_spells.cpp
+    gm_commands/show/show_spells_list.cpp
+    gm_commands/show/show_stats.cpp
+    gm_commands/show/show_timers.cpp
+    gm_commands/show/show_traps.cpp
+    gm_commands/show/show_uptime.cpp
+    gm_commands/show/show_variable.cpp
+    gm_commands/show/show_version.cpp
+    gm_commands/show/show_waypoints.cpp
+    gm_commands/show/show_who.cpp
+    gm_commands/show/show_xtargets.cpp
+    gm_commands/show/show_zone_data.cpp
+    gm_commands/show/show_zone_global_loot.cpp
+    gm_commands/show/show_zone_loot.cpp
+    gm_commands/show/show_zone_points.cpp
+    gm_commands/show/show_zone_status.cpp
+    gm_commands/show/show_zone_variables.cpp
     gm_commands/shutdown.cpp
     gm_commands/spawn.cpp
     gm_commands/spawneditmass.cpp
@@ -583,6 +635,60 @@ source_group(set FILES
     gm_commands/set/set_weather.cpp
     gm_commands/set/set_zone.cpp)
 
+source_group(show FILES
+    gm_commands/show/show_aas.cpp
+    gm_commands/show/show_aa_points.cpp
+    gm_commands/show/show_aggro.cpp
+    gm_commands/show/show_auto_login.cpp
+    gm_commands/show/show_buffs.cpp
+    gm_commands/show/show_buried_corpse_count.cpp
+    gm_commands/show/show_client_version_summary.cpp
+    gm_commands/show/show_content_flags.cpp
+    gm_commands/show/show_currencies.cpp
+    gm_commands/show/show_distance.cpp
+    gm_commands/show/show_emotes.cpp
+    gm_commands/show/show_field_of_view.cpp
+    gm_commands/show/show_flags.cpp
+    gm_commands/show/show_group_info.cpp
+    gm_commands/show/show_hatelist.cpp
+    gm_commands/show/show_inventory.cpp
+    gm_commands/show/show_ip_lookup.cpp
+    gm_commands/show/show_keyring.cpp
+    gm_commands/show/show_line_of_sight.cpp
+    gm_commands/show/show_network.cpp
+    gm_commands/show/show_network_stats.cpp
+    gm_commands/show/show_npc_global_loot.cpp
+    gm_commands/show/show_npc_stats.cpp
+    gm_commands/show/show_npc_type.cpp
+    gm_commands/show/show_peqzone_flags.cpp
+    gm_commands/show/show_petition.cpp
+    gm_commands/show/show_petition_info.cpp
+    gm_commands/show/show_proximity.cpp
+    gm_commands/show/show_quest_errors.cpp
+    gm_commands/show/show_quest_globals.cpp
+    gm_commands/show/show_recipe.cpp
+    gm_commands/show/show_server_info.cpp
+    gm_commands/show/show_skills.cpp
+    gm_commands/show/show_spawn_status.cpp
+    gm_commands/show/show_special_abilities.cpp
+    gm_commands/show/show_spells.cpp
+    gm_commands/show/show_spells_list.cpp
+    gm_commands/show/show_stats.cpp
+    gm_commands/show/show_timers.cpp
+    gm_commands/show/show_traps.cpp
+    gm_commands/show/show_uptime.cpp
+    gm_commands/show/show_variable.cpp
+    gm_commands/show/show_version.cpp
+    gm_commands/show/show_waypoints.cpp
+    gm_commands/show/show_who.cpp
+    gm_commands/show/show_xtargets.cpp
+    gm_commands/show/show_zone_data.cpp
+    gm_commands/show/show_zone_global_loot.cpp
+    gm_commands/show/show_zone_loot.cpp
+    gm_commands/show/show_zone_points.cpp
+    gm_commands/show/show_zone_status.cpp
+    gm_commands/show/show_zone_variables.cpp)
+
 add_library(gm_commands_zone STATIC ${gm_command_sources})
 target_link_libraries(gm_commands_zone PRIVATE cereal::cereal fmt::fmt $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv> unofficial::libmariadb)
 set_target_properties(gm_commands_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 32)
diff --git a/zone/gm_commands/show.cpp b/zone/gm_commands/show.cpp
index 5a5de4560..651cde537 100755
--- a/zone/gm_commands/show.cpp
+++ b/zone/gm_commands/show.cpp
@@ -1,56 +1,57 @@
 #include "../client.h"
-#include "show/aas.cpp"
-#include "show/aa_points.cpp"
-#include "show/aggro.cpp"
-#include "show/auto_login.cpp"
-#include "show/buffs.cpp"
-#include "show/buried_corpse_count.cpp"
-#include "show/client_version_summary.cpp"
-#include "show/content_flags.cpp"
-#include "show/currencies.cpp"
-#include "show/distance.cpp"
-#include "show/emotes.cpp"
-#include "show/field_of_view.cpp"
-#include "show/flags.cpp"
-#include "show/group_info.cpp"
-#include "show/hatelist.cpp"
-#include "show/inventory.cpp"
-#include "show/keyring.cpp"
-#include "show/ip_lookup.cpp"
-#include "show/line_of_sight.cpp"
-#include "show/network.cpp"
-#include "show/network_stats.cpp"
-#include "show/npc_global_loot.cpp"
-#include "show/npc_stats.cpp"
-#include "show/npc_type.cpp"
-#include "show/peqzone_flags.cpp"
-#include "show/petition.cpp"
-#include "show/petition_info.cpp"
-#include "show/proximity.cpp"
-#include "show/quest_errors.cpp"
-#include "show/quest_globals.cpp"
-#include "show/recipe.cpp"
-#include "show/server_info.cpp"
-#include "show/skills.cpp"
-#include "show/spawn_status.cpp"
-#include "show/special_abilities.cpp"
-#include "show/spells.cpp"
-#include "show/spells_list.cpp"
-#include "show/stats.cpp"
-#include "show/timers.cpp"
-#include "show/traps.cpp"
-#include "show/uptime.cpp"
-#include "show/variable.cpp"
-#include "show/version.cpp"
-#include "show/waypoints.cpp"
-#include "show/who.cpp"
-#include "show/xtargets.cpp"
-#include "show/zone_data.cpp"
-#include "show/zone_global_loot.cpp"
-#include "show/zone_loot.cpp"
-#include "show/zone_points.cpp"
-#include "show/zone_status.cpp"
-#include "show/zone_variables.cpp"
+
+void ShowAAs(Client* c, const Seperator* sep);
+void ShowAAPoints(Client* c, const Seperator* sep);
+void ShowAggro(Client* c, const Seperator* sep);
+void ShowAutoLogin(Client* c, const Seperator* sep);
+void ShowBuffs(Client* c, const Seperator* sep);
+void ShowBuriedCorpseCount(Client* c, const Seperator* sep);
+void ShowClientVersionSummary(Client* c, const Seperator* sep);
+void ShowContentFlags(Client* c, const Seperator* sep);
+void ShowCurrencies(Client* c, const Seperator* sep);
+void ShowDistance(Client* c, const Seperator* sep);
+void ShowEmotes(Client* c, const Seperator* sep);
+void ShowFieldOfView(Client* c, const Seperator* sep);
+void ShowFlags(Client* c, const Seperator* sep);
+void ShowGroupInfo(Client* c, const Seperator* sep);
+void ShowHateList(Client* c, const Seperator* sep);
+void ShowInventory(Client* c, const Seperator* sep);
+void ShowIPLookup(Client* c, const Seperator* sep);
+void ShowKeyring(Client* c, const Seperator* sep);
+void ShowLineOfSight(Client* c, const Seperator* sep);
+void ShowNetwork(Client* c, const Seperator* sep);
+void ShowNetworkStats(Client* c, const Seperator* sep);
+void ShowNPCGlobalLoot(Client* c, const Seperator* sep);
+void ShowNPCStats(Client* c, const Seperator* sep);
+void ShowNPCType(Client* c, const Seperator* sep);
+void ShowPEQZoneFlags(Client* c, const Seperator* sep);
+void ShowPetition(Client* c, const Seperator* sep);
+void ShowPetitionInfo(Client* c, const Seperator* sep);
+void ShowProximity(Client* c, const Seperator* sep);
+void ShowQuestErrors(Client* c, const Seperator* sep);
+void ShowQuestGlobals(Client* c, const Seperator* sep);
+void ShowRecipe(Client* c, const Seperator* sep);
+void ShowServerInfo(Client* c, const Seperator* sep);
+void ShowSkills(Client* c, const Seperator* sep);
+void ShowSpawnStatus(Client* c, const Seperator* sep);
+void ShowSpecialAbilities(Client* c, const Seperator* sep);
+void ShowSpells(Client* c, const Seperator* sep);
+void ShowSpellsList(Client* c, const Seperator* sep);
+void ShowStats(Client* c, const Seperator* sep);
+void ShowTimers(Client* c, const Seperator* sep);
+void ShowTraps(Client* c, const Seperator* sep);
+void ShowUptime(Client* c, const Seperator* sep);
+void ShowVariable(Client* c, const Seperator* sep);
+void ShowVersion(Client* c, const Seperator* sep);
+void ShowWaypoints(Client* c, const Seperator* sep);
+void ShowWho(Client* c, const Seperator* sep);
+void ShowXTargets(Client* c, const Seperator* sep);
+void ShowZoneData(Client* c, const Seperator* sep);
+void ShowZoneGlobalLoot(Client* c, const Seperator* sep);
+void ShowZoneLoot(Client* c, const Seperator* sep);
+void ShowZonePoints(Client* c, const Seperator* sep);
+void ShowZoneStatus(Client* c, const Seperator* sep);
+void ShowZoneVariables(Client* c, const Seperator* sep);
 
 void command_show(Client *c, const Seperator *sep)
 {
diff --git a/zone/gm_commands/show/aa_points.cpp b/zone/gm_commands/show/show_aa_points.cpp
similarity index 100%
rename from zone/gm_commands/show/aa_points.cpp
rename to zone/gm_commands/show/show_aa_points.cpp
diff --git a/zone/gm_commands/show/aas.cpp b/zone/gm_commands/show/show_aas.cpp
similarity index 100%
rename from zone/gm_commands/show/aas.cpp
rename to zone/gm_commands/show/show_aas.cpp
diff --git a/zone/gm_commands/show/aggro.cpp b/zone/gm_commands/show/show_aggro.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from zone/gm_commands/show/aggro.cpp
rename to zone/gm_commands/show/show_aggro.cpp
diff --git a/zone/gm_commands/show/auto_login.cpp b/zone/gm_commands/show/show_auto_login.cpp
similarity index 100%
rename from zone/gm_commands/show/auto_login.cpp
rename to zone/gm_commands/show/show_auto_login.cpp
diff --git a/zone/gm_commands/show/buffs.cpp b/zone/gm_commands/show/show_buffs.cpp
similarity index 100%
rename from zone/gm_commands/show/buffs.cpp
rename to zone/gm_commands/show/show_buffs.cpp
diff --git a/zone/gm_commands/show/buried_corpse_count.cpp b/zone/gm_commands/show/show_buried_corpse_count.cpp
similarity index 100%
rename from zone/gm_commands/show/buried_corpse_count.cpp
rename to zone/gm_commands/show/show_buried_corpse_count.cpp
diff --git a/zone/gm_commands/show/client_version_summary.cpp b/zone/gm_commands/show/show_client_version_summary.cpp
similarity index 100%
rename from zone/gm_commands/show/client_version_summary.cpp
rename to zone/gm_commands/show/show_client_version_summary.cpp
diff --git a/zone/gm_commands/show/content_flags.cpp b/zone/gm_commands/show/show_content_flags.cpp
similarity index 100%
rename from zone/gm_commands/show/content_flags.cpp
rename to zone/gm_commands/show/show_content_flags.cpp
diff --git a/zone/gm_commands/show/currencies.cpp b/zone/gm_commands/show/show_currencies.cpp
similarity index 100%
rename from zone/gm_commands/show/currencies.cpp
rename to zone/gm_commands/show/show_currencies.cpp
diff --git a/zone/gm_commands/show/distance.cpp b/zone/gm_commands/show/show_distance.cpp
similarity index 100%
rename from zone/gm_commands/show/distance.cpp
rename to zone/gm_commands/show/show_distance.cpp
diff --git a/zone/gm_commands/show/emotes.cpp b/zone/gm_commands/show/show_emotes.cpp
similarity index 100%
rename from zone/gm_commands/show/emotes.cpp
rename to zone/gm_commands/show/show_emotes.cpp
diff --git a/zone/gm_commands/show/field_of_view.cpp b/zone/gm_commands/show/show_field_of_view.cpp
similarity index 100%
rename from zone/gm_commands/show/field_of_view.cpp
rename to zone/gm_commands/show/show_field_of_view.cpp
diff --git a/zone/gm_commands/show/flags.cpp b/zone/gm_commands/show/show_flags.cpp
similarity index 100%
rename from zone/gm_commands/show/flags.cpp
rename to zone/gm_commands/show/show_flags.cpp
diff --git a/zone/gm_commands/show/group_info.cpp b/zone/gm_commands/show/show_group_info.cpp
similarity index 100%
rename from zone/gm_commands/show/group_info.cpp
rename to zone/gm_commands/show/show_group_info.cpp
diff --git a/zone/gm_commands/show/hatelist.cpp b/zone/gm_commands/show/show_hatelist.cpp
similarity index 100%
rename from zone/gm_commands/show/hatelist.cpp
rename to zone/gm_commands/show/show_hatelist.cpp
diff --git a/zone/gm_commands/show/inventory.cpp b/zone/gm_commands/show/show_inventory.cpp
similarity index 100%
rename from zone/gm_commands/show/inventory.cpp
rename to zone/gm_commands/show/show_inventory.cpp
diff --git a/zone/gm_commands/show/ip_lookup.cpp b/zone/gm_commands/show/show_ip_lookup.cpp
similarity index 100%
rename from zone/gm_commands/show/ip_lookup.cpp
rename to zone/gm_commands/show/show_ip_lookup.cpp
diff --git a/zone/gm_commands/show/keyring.cpp b/zone/gm_commands/show/show_keyring.cpp
similarity index 100%
rename from zone/gm_commands/show/keyring.cpp
rename to zone/gm_commands/show/show_keyring.cpp
diff --git a/zone/gm_commands/show/line_of_sight.cpp b/zone/gm_commands/show/show_line_of_sight.cpp
similarity index 100%
rename from zone/gm_commands/show/line_of_sight.cpp
rename to zone/gm_commands/show/show_line_of_sight.cpp
diff --git a/zone/gm_commands/show/network.cpp b/zone/gm_commands/show/show_network.cpp
similarity index 100%
rename from zone/gm_commands/show/network.cpp
rename to zone/gm_commands/show/show_network.cpp
diff --git a/zone/gm_commands/show/network_stats.cpp b/zone/gm_commands/show/show_network_stats.cpp
similarity index 100%
rename from zone/gm_commands/show/network_stats.cpp
rename to zone/gm_commands/show/show_network_stats.cpp
diff --git a/zone/gm_commands/show/npc_global_loot.cpp b/zone/gm_commands/show/show_npc_global_loot.cpp
similarity index 100%
rename from zone/gm_commands/show/npc_global_loot.cpp
rename to zone/gm_commands/show/show_npc_global_loot.cpp
diff --git a/zone/gm_commands/show/npc_stats.cpp b/zone/gm_commands/show/show_npc_stats.cpp
similarity index 100%
rename from zone/gm_commands/show/npc_stats.cpp
rename to zone/gm_commands/show/show_npc_stats.cpp
diff --git a/zone/gm_commands/show/npc_type.cpp b/zone/gm_commands/show/show_npc_type.cpp
similarity index 100%
rename from zone/gm_commands/show/npc_type.cpp
rename to zone/gm_commands/show/show_npc_type.cpp
diff --git a/zone/gm_commands/show/peqzone_flags.cpp b/zone/gm_commands/show/show_peqzone_flags.cpp
similarity index 100%
rename from zone/gm_commands/show/peqzone_flags.cpp
rename to zone/gm_commands/show/show_peqzone_flags.cpp
diff --git a/zone/gm_commands/show/petition.cpp b/zone/gm_commands/show/show_petition.cpp
similarity index 94%
rename from zone/gm_commands/show/petition.cpp
rename to zone/gm_commands/show/show_petition.cpp
index f93338ec0..1c15036a9 100644
--- a/zone/gm_commands/show/petition.cpp
+++ b/zone/gm_commands/show/show_petition.cpp
@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/repositories/petitions_repository.h"
+#include "../../../common/repositories/petitions_repository.h"
 
 void ShowPetition(Client *c, const Seperator *sep)
 {
diff --git a/zone/gm_commands/show/petition_info.cpp b/zone/gm_commands/show/show_petition_info.cpp
similarity index 96%
rename from zone/gm_commands/show/petition_info.cpp
rename to zone/gm_commands/show/show_petition_info.cpp
index fa1616dde..d4a45599b 100644
--- a/zone/gm_commands/show/petition_info.cpp
+++ b/zone/gm_commands/show/show_petition_info.cpp
@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/repositories/petitions_repository.h"
+#include "../../../common/repositories/petitions_repository.h"
 
 void ShowPetitionInfo(Client *c, const Seperator *sep)
 {
diff --git a/zone/gm_commands/show/proximity.cpp b/zone/gm_commands/show/show_proximity.cpp
similarity index 100%
rename from zone/gm_commands/show/proximity.cpp
rename to zone/gm_commands/show/show_proximity.cpp
diff --git a/zone/gm_commands/show/quest_errors.cpp b/zone/gm_commands/show/show_quest_errors.cpp
similarity index 100%
rename from zone/gm_commands/show/quest_errors.cpp
rename to zone/gm_commands/show/show_quest_errors.cpp
diff --git a/zone/gm_commands/show/quest_globals.cpp b/zone/gm_commands/show/show_quest_globals.cpp
similarity index 100%
rename from zone/gm_commands/show/quest_globals.cpp
rename to zone/gm_commands/show/show_quest_globals.cpp
diff --git a/zone/gm_commands/show/recipe.cpp b/zone/gm_commands/show/show_recipe.cpp
similarity index 93%
rename from zone/gm_commands/show/recipe.cpp
rename to zone/gm_commands/show/show_recipe.cpp
index e9f8db666..c66e25218 100644
--- a/zone/gm_commands/show/recipe.cpp
+++ b/zone/gm_commands/show/show_recipe.cpp
@@ -1,7 +1,7 @@
 #include "../../client.h"
 #include "../../command.h"
-#include "../../common/repositories/tradeskill_recipe_repository.h"
-#include "../../common/repositories/tradeskill_recipe_entries_repository.h"
+#include "../../../common/repositories/tradeskill_recipe_repository.h"
+#include "../../../common/repositories/tradeskill_recipe_entries_repository.h"
 
 void ShowRecipe(Client *c, const Seperator *sep)
 {
diff --git a/zone/gm_commands/show/server_info.cpp b/zone/gm_commands/show/show_server_info.cpp
similarity index 98%
rename from zone/gm_commands/show/server_info.cpp
rename to zone/gm_commands/show/show_server_info.cpp
index ff3070aa7..6a8d8b717 100644
--- a/zone/gm_commands/show/server_info.cpp
+++ b/zone/gm_commands/show/show_server_info.cpp
@@ -1,6 +1,6 @@
 #include "../../client.h"
 #include "../../dialogue_window.h"
-#include "../../common/serverinfo.h"
+#include "../../../common/serverinfo.h"
 
 void ShowServerInfo(Client *c, const Seperator *sep)
 {
diff --git a/zone/gm_commands/show/skills.cpp b/zone/gm_commands/show/show_skills.cpp
similarity index 100%
rename from zone/gm_commands/show/skills.cpp
rename to zone/gm_commands/show/show_skills.cpp
diff --git a/zone/gm_commands/show/spawn_status.cpp b/zone/gm_commands/show/show_spawn_status.cpp
similarity index 100%
rename from zone/gm_commands/show/spawn_status.cpp
rename to zone/gm_commands/show/show_spawn_status.cpp
diff --git a/zone/gm_commands/show/special_abilities.cpp b/zone/gm_commands/show/show_special_abilities.cpp
similarity index 100%
rename from zone/gm_commands/show/special_abilities.cpp
rename to zone/gm_commands/show/show_special_abilities.cpp
diff --git a/zone/gm_commands/show/spells.cpp b/zone/gm_commands/show/show_spells.cpp
similarity index 100%
rename from zone/gm_commands/show/spells.cpp
rename to zone/gm_commands/show/show_spells.cpp
diff --git a/zone/gm_commands/show/spells_list.cpp b/zone/gm_commands/show/show_spells_list.cpp
similarity index 100%
rename from zone/gm_commands/show/spells_list.cpp
rename to zone/gm_commands/show/show_spells_list.cpp
diff --git a/zone/gm_commands/show/stats.cpp b/zone/gm_commands/show/show_stats.cpp
similarity index 100%
rename from zone/gm_commands/show/stats.cpp
rename to zone/gm_commands/show/show_stats.cpp
diff --git a/zone/gm_commands/show/timers.cpp b/zone/gm_commands/show/show_timers.cpp
similarity index 100%
rename from zone/gm_commands/show/timers.cpp
rename to zone/gm_commands/show/show_timers.cpp
diff --git a/zone/gm_commands/show/traps.cpp b/zone/gm_commands/show/show_traps.cpp
similarity index 100%
rename from zone/gm_commands/show/traps.cpp
rename to zone/gm_commands/show/show_traps.cpp
diff --git a/zone/gm_commands/show/uptime.cpp b/zone/gm_commands/show/show_uptime.cpp
similarity index 100%
rename from zone/gm_commands/show/uptime.cpp
rename to zone/gm_commands/show/show_uptime.cpp
diff --git a/zone/gm_commands/show/variable.cpp b/zone/gm_commands/show/show_variable.cpp
similarity index 100%
rename from zone/gm_commands/show/variable.cpp
rename to zone/gm_commands/show/show_variable.cpp
diff --git a/zone/gm_commands/show/version.cpp b/zone/gm_commands/show/show_version.cpp
similarity index 100%
rename from zone/gm_commands/show/version.cpp
rename to zone/gm_commands/show/show_version.cpp
diff --git a/zone/gm_commands/show/waypoints.cpp b/zone/gm_commands/show/show_waypoints.cpp
similarity index 100%
rename from zone/gm_commands/show/waypoints.cpp
rename to zone/gm_commands/show/show_waypoints.cpp
diff --git a/zone/gm_commands/show/who.cpp b/zone/gm_commands/show/show_who.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from zone/gm_commands/show/who.cpp
rename to zone/gm_commands/show/show_who.cpp
diff --git a/zone/gm_commands/show/xtargets.cpp b/zone/gm_commands/show/show_xtargets.cpp
similarity index 94%
rename from zone/gm_commands/show/xtargets.cpp
rename to zone/gm_commands/show/show_xtargets.cpp
index b3416b561..f9d07387e 100644
--- a/zone/gm_commands/show/xtargets.cpp
+++ b/zone/gm_commands/show/show_xtargets.cpp
@@ -1,5 +1,5 @@
 #include "../../client.h"
-#include "../../common/data_verification.h"
+#include "../../../common/data_verification.h"
 
 void ShowXTargets(Client *c, const Seperator *sep)
 {
diff --git a/zone/gm_commands/show/zone_data.cpp b/zone/gm_commands/show/show_zone_data.cpp
similarity index 100%
rename from zone/gm_commands/show/zone_data.cpp
rename to zone/gm_commands/show/show_zone_data.cpp
diff --git a/zone/gm_commands/show/zone_global_loot.cpp b/zone/gm_commands/show/show_zone_global_loot.cpp
similarity index 100%
rename from zone/gm_commands/show/zone_global_loot.cpp
rename to zone/gm_commands/show/show_zone_global_loot.cpp
diff --git a/zone/gm_commands/show/zone_loot.cpp b/zone/gm_commands/show/show_zone_loot.cpp
similarity index 100%
rename from zone/gm_commands/show/zone_loot.cpp
rename to zone/gm_commands/show/show_zone_loot.cpp
diff --git a/zone/gm_commands/show/zone_points.cpp b/zone/gm_commands/show/show_zone_points.cpp
similarity index 100%
rename from zone/gm_commands/show/zone_points.cpp
rename to zone/gm_commands/show/show_zone_points.cpp
diff --git a/zone/gm_commands/show/zone_status.cpp b/zone/gm_commands/show/show_zone_status.cpp
similarity index 100%
rename from zone/gm_commands/show/zone_status.cpp
rename to zone/gm_commands/show/show_zone_status.cpp
diff --git a/zone/gm_commands/show/zone_variables.cpp b/zone/gm_commands/show/show_zone_variables.cpp
similarity index 100%
rename from zone/gm_commands/show/zone_variables.cpp
rename to zone/gm_commands/show/show_zone_variables.cpp