diff --git a/Moose Development/Moose/Modules.lua b/Moose Development/Moose/Modules.lua
index 37bc6f187..66a67e965 100644
--- a/Moose Development/Moose/Modules.lua	
+++ b/Moose Development/Moose/Modules.lua	
@@ -8,7 +8,9 @@ __Moose.Include( 'Scripts/Moose/Utilities/FiFo.lua' )
 __Moose.Include( 'Scripts/Moose/Utilities/Socket.lua' )
 
 __Moose.Include( 'Scripts/Moose/Core/Base.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Astar.lua' )
 __Moose.Include( 'Scripts/Moose/Core/Beacon.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Condition.lua' )
 __Moose.Include( 'Scripts/Moose/Core/UserFlag.lua' )
 __Moose.Include( 'Scripts/Moose/Core/Report.lua' )
 __Moose.Include( 'Scripts/Moose/Core/Scheduler.lua' )
diff --git a/Moose Setup/Moose.files b/Moose Setup/Moose.files
index d73ef4c1e..65c5fce6c 100644
--- a/Moose Setup/Moose.files	
+++ b/Moose Setup/Moose.files	
@@ -6,6 +6,7 @@ Utilities/Profiler.lua
 Utilities/Templates.lua
 Utilities/STTS.lua
 Utilities/FiFo.lua
+Utilities/Socket.lua
 
 Core/Base.lua
 Core/Beacon.lua
@@ -29,7 +30,8 @@ Core/SpawnStatic.lua
 Core/Timer.lua
 Core/Goal.lua
 Core/Spot.lua
-Core/TextAndSound.lua
+Core/MarkerOps_Base.lua
+Core/Astar.lua
 Core/Condition.lua
 
 Wrapper/Object.lua