diff --git a/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua b/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua
index 2f3d17215..1cec268d1 100644
--- a/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua	
+++ b/Moose Development/Moose/Functional/ZoneCaptureCoalition.lua	
@@ -1,4 +1,4 @@
---- **Core** -- Base class that models processes to capture a Zone for a Coalition, guarded by another Coalition.
+--- **Functional** -- Base class that models processes to capture a Zone for a Coalition, guarded by another Coalition.
 --
 -- ====
 -- 
@@ -15,7 +15,7 @@
 do -- ZoneGoal
 
   --- @type ZONE_CAPTURE_COALITION
-  -- @extends Core.ZoneGoalCoalition#ZONE_GOAL_COALITION
+  -- @extends Functional.ZoneGoalCoalition#ZONE_GOAL_COALITION
 
 
   --- # ZONE_CAPTURE_COALITION class, extends @{ZoneGoalCoalition#ZONE_GOAL_COALITION}
diff --git a/Moose Development/Moose/Core/ZoneGoal.lua b/Moose Development/Moose/Functional/ZoneGoal.lua
similarity index 98%
rename from Moose Development/Moose/Core/ZoneGoal.lua
rename to Moose Development/Moose/Functional/ZoneGoal.lua
index 128b0f6bd..6d5f9c213 100644
--- a/Moose Development/Moose/Core/ZoneGoal.lua	
+++ b/Moose Development/Moose/Functional/ZoneGoal.lua	
@@ -1,4 +1,4 @@
---- **Core** -- Base class that models processes to achieve goals involving a Zone.
+--- **Functional** -- Base class that models processes to achieve goals involving a Zone.
 --
 -- ====
 -- 
diff --git a/Moose Development/Moose/Core/ZoneGoalCoalition.lua b/Moose Development/Moose/Functional/ZoneGoalCoalition.lua
similarity index 98%
rename from Moose Development/Moose/Core/ZoneGoalCoalition.lua
rename to Moose Development/Moose/Functional/ZoneGoalCoalition.lua
index 45030d60b..e152af7f0 100644
--- a/Moose Development/Moose/Core/ZoneGoalCoalition.lua	
+++ b/Moose Development/Moose/Functional/ZoneGoalCoalition.lua	
@@ -1,4 +1,4 @@
---- **Core** -- Base class that models processes to achieve goals involving a Zone for a Coalition.
+--- **Functional** -- Base class that models processes to achieve goals involving a Zone for a Coalition.
 --
 -- ====
 -- 
@@ -16,7 +16,7 @@
 do -- ZoneGoal
 
   --- @type ZONE_GOAL_COALITION
-  -- @extends Core.ZoneGoal#ZONE_GOAL
+  -- @extends Functional.ZoneGoal#ZONE_GOAL
 
 
   --- # ZONE_GOAL_COALITION class, extends @{ZoneGoal#ZONE_GOAL}
diff --git a/Moose Mission Setup/Moose.files b/Moose Mission Setup/Moose.files
index 7bc7a8f0e..9c19c0000 100644
--- a/Moose Mission Setup/Moose.files	
+++ b/Moose Mission Setup/Moose.files	
@@ -17,8 +17,6 @@ Core/Fsm.lua
 Core/Radio.lua
 Core/SpawnStatic.lua
 Core/Goal.lua
-Core/ZoneGoal.lua
-Core/ZoneGoalCoalition.lua
 Core/Cargo.lua
 Core/Spot.lua
 
@@ -44,6 +42,8 @@ Functional/AirbasePolice.lua
 Functional/Detection.lua
 Functional/Designate.lua
 Functional/RAT.lua
+Functional/ZoneGoal.lua
+Functional/ZoneGoalCoalition.lua
 Functional/ZoneCaptureCoalition.lua
 
 AI/AI_Balancer.lua
diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index a8d2fafcf..9b331cc01 100644
--- a/Moose Mission Setup/Moose.lua	
+++ b/Moose Mission Setup/Moose.lua	
@@ -1,5 +1,5 @@
 env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
-env.info( 'Moose Generation Timestamp: 20171005_1908' )
+env.info( 'Moose Generation Timestamp: 20171006_1308' )
 
 local base = _G
 
@@ -39,8 +39,6 @@ __Moose.Include( 'Core/Fsm.lua' )
 __Moose.Include( 'Core/Radio.lua' )
 __Moose.Include( 'Core/SpawnStatic.lua' )
 __Moose.Include( 'Core/Goal.lua' )
-__Moose.Include( 'Core/ZoneGoal.lua' )
-__Moose.Include( 'Core/ZoneGoalCoalition.lua' )
 __Moose.Include( 'Core/Cargo.lua' )
 __Moose.Include( 'Core/Spot.lua' )
 __Moose.Include( 'Wrapper/Object.lua' )
@@ -64,6 +62,8 @@ __Moose.Include( 'Functional/AirbasePolice.lua' )
 __Moose.Include( 'Functional/Detection.lua' )
 __Moose.Include( 'Functional/Designate.lua' )
 __Moose.Include( 'Functional/RAT.lua' )
+__Moose.Include( 'Functional/ZoneGoal.lua' )
+__Moose.Include( 'Functional/ZoneGoalCoalition.lua' )
 __Moose.Include( 'Functional/ZoneCaptureCoalition.lua' )
 __Moose.Include( 'AI/AI_Balancer.lua' )
 __Moose.Include( 'AI/AI_A2A.lua' )
diff --git a/Moose Mission Setup/Moose_.lua b/Moose Mission Setup/Moose_.lua
index 5ffa8d3e9..f8338f644 100644
--- a/Moose Mission Setup/Moose_.lua	
+++ b/Moose Mission Setup/Moose_.lua	
@@ -1,5 +1,5 @@
 env.info('*** MOOSE DYNAMIC INCLUDE START *** ')
-env.info('Moose Generation Timestamp: 20171005_1908')
+env.info('Moose Generation Timestamp: 20171006_1308')
 local base=_G
 __Moose={}
 __Moose.Include=function(IncludeFile)
@@ -34,8 +34,6 @@ __Moose.Include('Core/Fsm.lua')
 __Moose.Include('Core/Radio.lua')
 __Moose.Include('Core/SpawnStatic.lua')
 __Moose.Include('Core/Goal.lua')
-__Moose.Include('Core/ZoneGoal.lua')
-__Moose.Include('Core/ZoneGoalCoalition.lua')
 __Moose.Include('Core/Cargo.lua')
 __Moose.Include('Core/Spot.lua')
 __Moose.Include('Wrapper/Object.lua')
@@ -59,6 +57,8 @@ __Moose.Include('Functional/AirbasePolice.lua')
 __Moose.Include('Functional/Detection.lua')
 __Moose.Include('Functional/Designate.lua')
 __Moose.Include('Functional/RAT.lua')
+__Moose.Include('Functional/ZoneGoal.lua')
+__Moose.Include('Functional/ZoneGoalCoalition.lua')
 __Moose.Include('Functional/ZoneCaptureCoalition.lua')
 __Moose.Include('AI/AI_Balancer.lua')
 __Moose.Include('AI/AI_A2A.lua')