diff --git a/etc/mesh_bot_reporting.tmp b/etc/bot_reporting.tmp
similarity index 100%
rename from etc/mesh_bot_reporting.tmp
rename to etc/bot_reporting.tmp
diff --git a/modules/blackjack.py b/modules/games/blackjack.py
similarity index 100%
rename from modules/blackjack.py
rename to modules/games/blackjack.py
diff --git a/modules/dopewar.py b/modules/games/dopewar.py
similarity index 100%
rename from modules/dopewar.py
rename to modules/games/dopewar.py
diff --git a/modules/golfsim.py b/modules/games/golfsim.py
similarity index 100%
rename from modules/golfsim.py
rename to modules/games/golfsim.py
diff --git a/modules/lemonade.py b/modules/games/lemonade.py
similarity index 100%
rename from modules/lemonade.py
rename to modules/games/lemonade.py
diff --git a/modules/meshtrekker.py b/modules/games/meshtrekker.py
similarity index 100%
rename from modules/meshtrekker.py
rename to modules/games/meshtrekker.py
diff --git a/modules/mmind.py b/modules/games/mmind.py
similarity index 100%
rename from modules/mmind.py
rename to modules/games/mmind.py
diff --git a/modules/uno.py b/modules/games/uno.py
similarity index 99%
rename from modules/uno.py
rename to modules/games/uno.py
index c14e5f2..5607c84 100644
--- a/modules/uno.py
+++ b/modules/games/uno.py
@@ -194,7 +194,7 @@ def playUno(nodeID, message):
     global unoTracker, unoGameTable, unoLobby
     playing = False
     nextPlayerNodeID = 0
-    msg = 'Feature Not Implemented'
-
+    msg = 'Not implemented yet'
 
+    
     return msg
\ No newline at end of file
diff --git a/modules/videopoker.py b/modules/games/videopoker.py
similarity index 100%
rename from modules/videopoker.py
rename to modules/games/videopoker.py
diff --git a/modules/system.py b/modules/system.py
index 07f7d90..4369e08 100644
--- a/modules/system.py
+++ b/modules/system.py
@@ -97,40 +97,40 @@ if llm_enabled:
 
 # DopeWars Configuration
 if dopewars_enabled:
-    from modules.dopewar import * # from the spudgunman/meshing-around repo
+    from modules.games.dopewar import * # from the spudgunman/meshing-around repo
     trap_list = trap_list + ("dopewars",)
     games_enabled = True
 
 # Lemonade Stand Configuration
 if lemonade_enabled:
-    from modules.lemonade import * # from the spudgunman/meshing-around repo
+    from modules.games.lemonade import * # from the spudgunman/meshing-around repo
     trap_list = trap_list + ("lemonstand",)
     games_enabled = True
 
 # BlackJack Configuration
 if blackjack_enabled:
-    from modules.blackjack import * # from the spudgunman/meshing-around repo
+    from modules.games.blackjack import * # from the spudgunman/meshing-around repo
     trap_list = trap_list + ("blackjack",)
     games_enabled = True
 
 # Video Poker Configuration
 if videoPoker_enabled:
-    from modules.videopoker import * # from the spudgunman/meshing-around repo
+    from modules.games.videopoker import * # from the spudgunman/meshing-around repo
     trap_list = trap_list + ("videopoker",)
     games_enabled = True
 
 if mastermind_enabled:
-    from modules.mmind import * # from the spudgunman/meshing-around repo
+    from modules.games.mmind import * # from the spudgunman/meshing-around repo
     trap_list = trap_list + ("mastermind",)
     games_enabled = True
 
 if golfSim_enabled:
-    from modules.golfsim import * # from the spudgunman/meshing-around repo
+    from modules.games.golfsim import * # from the spudgunman/meshing-around repo
     trap_list = trap_list + ("golfsim",)
     games_enabled = True
 
 if uno_enabled:
-    from modules.uno import * # from the spudgunman/meshing-around repo
+    from modules.games.uno import * # from the spudgunman/meshing-around repo
     trap_list = trap_list + ("playuno",)
     games_enabled = True