diff --git a/Moose Development/Moose/Fsm/Cargo.lua b/Moose Development/Moose/Fsm/Cargo.lua index 2ad0fda68..334d8b751 100644 --- a/Moose Development/Moose/Fsm/Cargo.lua +++ b/Moose Development/Moose/Fsm/Cargo.lua @@ -224,22 +224,18 @@ do -- CARGO_BASE -- @return #CARGO_BASE function CARGO_BASE:New( Type, Name, Weight, ReportRadius, NearRadius ) - FSMT = { - initial = 'UnLoaded', - events = { - { name = 'Board', from = 'UnLoaded', to = 'Boarding' }, - { name = 'Boarding', from = 'Boarding', to = 'Boarding' }, - { name = 'Load', from = 'Boarding', to = 'Loaded' }, - { name = 'Load', from = 'UnLoaded', to = 'Loaded' }, - { name = 'UnBoard', from = 'Loaded', to = 'UnBoarding' }, - { name = 'UnBoarding', from = 'UnBoarding', to = 'UnBoarding' }, - { name = 'UnLoad', from = 'UnBoarding', to = 'UnLoaded' }, - { name = 'UnLoad', from = 'Loaded', to = 'UnLoaded' }, - }, - } - - local self = BASE:Inherit( self, FSM_PROCESS:New( FSMT ) ) -- #CARGO_BASE + local self = BASE:Inherit( self, FSM:New() ) -- Fsm.Fsm#FSM_CONTROLLABLE self:F( { Type, Name, Weight, ReportRadius, NearRadius } ) + + self:SetStartState( "UnLoaded" ) + self:AddTransition( "UnLoaded", "Board", "Boarding" ) + self:AddTransition( "Boarding", "Boarding", "Boarding" ) + self:AddTransition( "Boarding", "Load", "Loaded" ) + self:AddTransition( "UnLoaded", "Load", "Loaded" ) + self:AddTransition( "Loaded", "UnBoard", "UnBoarding" ) + self:AddTransition( "UnBoarding", "UnBoarding", "UnBoarding" ) + self:AddTransition( "UnBoarding", "UnLoad", "UnLoaded" ) + self:AddTransition( "Loaded", "UnLoad", "UnLoaded" ) self.Type = Type @@ -312,9 +308,6 @@ function CARGO_REPRESENTABLE:New( CargoObject, Type, Name, Weight, ReportRadius, local self = BASE:Inherit( self, CARGO_BASE:New( Type, Name, Weight, ReportRadius, NearRadius ) ) -- #CARGO_BASE self:F( { Type, Name, Weight, ReportRadius, NearRadius } ) - - - return self end @@ -371,11 +364,11 @@ end --- Enter UnBoarding State. -- @param #CARGO_UNIT self --- @param Core.Point#POINT_VEC2 ToPointVec2 -- @param #string Event -- @param #string From -- @param #string To -function CARGO_UNIT:onenterUnBoarding( ToPointVec2, Event, From, To ) +-- @param Core.Point#POINT_VEC2 ToPointVec2 +function CARGO_UNIT:onenterUnBoarding( Event, From, To, ToPointVec2 ) self:F() local Angle = 180 @@ -416,11 +409,11 @@ end --- Leave UnBoarding State. -- @param #CARGO_UNIT self --- @param Core.Point#POINT_VEC2 ToPointVec2 -- @param #string Event -- @param #string From -- @param #string To -function CARGO_UNIT:onleaveUnBoarding( ToPointVec2, Event, From, To ) +-- @param Core.Point#POINT_VEC2 ToPointVec2 +function CARGO_UNIT:onleaveUnBoarding( Event, From, To, ToPointVec2 ) self:F( { ToPointVec2, Event, From, To } ) local Angle = 180 @@ -440,11 +433,11 @@ end --- UnBoard Event. -- @param #CARGO_UNIT self --- @param Core.Point#POINT_VEC2 ToPointVec2 -- @param #string Event -- @param #string From -- @param #string To -function CARGO_UNIT:onafterUnBoarding( ToPointVec2, Event, From, To ) +-- @param Core.Point#POINT_VEC2 ToPointVec2 +function CARGO_UNIT:onafterUnBoarding( Event, From, To, ToPointVec2 ) self:F( { ToPointVec2, Event, From, To } ) self.CargoInAir = self.CargoObject:InAir() @@ -465,11 +458,11 @@ end --- Enter UnLoaded State. -- @param #CARGO_UNIT self --- @param Core.Point#POINT_VEC2 -- @param #string Event -- @param #string From -- @param #string To -function CARGO_UNIT:onenterUnLoaded( ToPointVec2, Event, From, To ) +-- @param Core.Point#POINT_VEC2 +function CARGO_UNIT:onenterUnLoaded( Event, From, To, ToPointVec2 ) self:F( { ToPointVec2, Event, From, To } ) local Angle = 180 @@ -503,11 +496,11 @@ end --- Enter Boarding State. -- @param #CARGO_UNIT self --- @param Wrapper.Unit#UNIT CargoCarrier -- @param #string Event -- @param #string From -- @param #string To -function CARGO_UNIT:onenterBoarding( CargoCarrier, Event, From, To ) +-- @param Wrapper.Unit#UNIT CargoCarrier +function CARGO_UNIT:onenterBoarding( Event, From, To, CargoCarrier ) self:F( { CargoCarrier.UnitName, Event, From, To } ) local Speed = 10 @@ -535,11 +528,11 @@ end --- Leave Boarding State. -- @param #CARGO_UNIT self --- @param Wrapper.Unit#UNIT CargoCarrier -- @param #string Event -- @param #string From -- @param #string To -function CARGO_UNIT:onleaveBoarding( CargoCarrier, Event, From, To ) +-- @param Wrapper.Unit#UNIT CargoCarrier +function CARGO_UNIT:onleaveBoarding( Event, From, To, CargoCarrier ) self:F( { CargoCarrier.UnitName, Event, From, To } ) if self:IsNear( CargoCarrier:GetPointVec2() ) then @@ -553,11 +546,11 @@ end --- Loaded State. -- @param #CARGO_UNIT self --- @param Wrapper.Unit#UNIT CargoCarrier -- @param #string Event -- @param #string From -- @param #string To -function CARGO_UNIT:onenterLoaded( CargoCarrier, Event, From, To ) +-- @param Wrapper.Unit#UNIT CargoCarrier +function CARGO_UNIT:onenterLoaded( Event, From, To, CargoCarrier ) self:F() self.CargoCarrier = CargoCarrier @@ -575,7 +568,7 @@ end -- @param #string Event -- @param #string From -- @param #string To -function CARGO_UNIT:onafterBoard( CargoCarrier, Event, From, To) +function CARGO_UNIT:onafterBoard( Event, From, To, CargoCarrier ) self:F() self.CargoInAir = self.CargoObject:InAir() @@ -621,7 +614,6 @@ end --- Board Event. -- @param #CARGO_PACKAGE self --- @param Fsm.Fsm#FSM_PROCESS FsmP -- @param #string Event -- @param #string From -- @param #string To @@ -629,7 +621,7 @@ end -- @param #number Speed -- @param #number BoardDistance -- @param #number Angle -function CARGO_PACKAGE:onafterOnBoard( FsmP, Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle ) +function CARGO_PACKAGE:onafterOnBoard( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle ) self:F() self.CargoInAir = self.CargoCarrier:InAir() @@ -679,24 +671,22 @@ end --- Boarded Event. -- @param #CARGO_PACKAGE self --- @param Fsm.Fsm#FSM_PROCESS FsmP -- @param #string Event -- @param #string From -- @param #string To -- @param Wrapper.Unit#UNIT CargoCarrier -function CARGO_PACKAGE:onafterOnBoarded( FsmP, Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle ) +function CARGO_PACKAGE:onafterOnBoarded( Event, From, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle ) self:F() if self:IsNear( CargoCarrier ) then - self:_NextEvent( FsmP.Load, CargoCarrier, Speed, LoadDistance, Angle ) + self:__Load( 1, CargoCarrier, Speed, LoadDistance, Angle ) else - self:_NextEvent( FsmP.Boarded, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle ) + self:__Boarded( 1, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle ) end end --- UnBoard Event. -- @param #CARGO_PACKAGE self --- @param Fsm.Fsm#FSM_PROCESS FsmP -- @param #string Event -- @param #string From -- @param #string To @@ -705,7 +695,7 @@ end -- @param #number UnBoardDistance -- @param #number Radius -- @param #number Angle -function CARGO_PACKAGE:onafterUnBoard( FsmP, Event, From, To, CargoCarrier, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle ) +function CARGO_PACKAGE:onafterUnBoard( Event, From, To, CargoCarrier, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle ) self:F() self.CargoInAir = self.CargoCarrier:InAir() @@ -733,30 +723,28 @@ function CARGO_PACKAGE:onafterUnBoard( FsmP, Event, From, To, CargoCarrier, Spee CargoCarrier:SetTask( TaskRoute, 1 ) end - self:_NextEvent( FsmP.UnBoarded, CargoCarrier, Speed ) + self:__UnBoarded( 1 , CargoCarrier, Speed ) end --- UnBoarded Event. -- @param #CARGO_PACKAGE self --- @param Fsm.Fsm#FSM_PROCESS FsmP -- @param #string Event -- @param #string From -- @param #string To -- @param Wrapper.Unit#UNIT CargoCarrier -function CARGO_PACKAGE:onafterUnBoarded( FsmP, Event, From, To, CargoCarrier, Speed ) +function CARGO_PACKAGE:onafterUnBoarded( Event, From, To, CargoCarrier, Speed ) self:F() if self:IsNear( CargoCarrier ) then - self:_NextEvent( FsmP.UnLoad, CargoCarrier, Speed ) + self:__UnLoad( 1, CargoCarrier, Speed ) else - self:_NextEvent( FsmP.UnBoarded, CargoCarrier, Speed ) + self:__UnBoarded( 1, CargoCarrier, Speed ) end end --- Load Event. -- @param #CARGO_PACKAGE self --- @param Fsm.Fsm#FSM_PROCESS FsmP -- @param #string Event -- @param #string From -- @param #string To @@ -764,7 +752,7 @@ end -- @param #number Speed -- @param #number LoadDistance -- @param #number Angle -function CARGO_PACKAGE:onafterLoad( FsmP, Event, From, To, CargoCarrier, Speed, LoadDistance, Angle ) +function CARGO_PACKAGE:onafterLoad( Event, From, To, CargoCarrier, Speed, LoadDistance, Angle ) self:F() self.CargoCarrier = CargoCarrier @@ -785,13 +773,12 @@ end --- UnLoad Event. -- @param #CARGO_PACKAGE self --- @param Fsm.Fsm#FSM_PROCESS FsmP -- @param #string Event -- @param #string From -- @param #string To -- @param #number Distance -- @param #number Angle -function CARGO_PACKAGE:onafterUnLoad( FsmP, Event, From, To, CargoCarrier, Speed, Distance, Angle ) +function CARGO_PACKAGE:onafterUnLoad( Event, From, To, CargoCarrier, Speed, Distance, Angle ) self:F() local StartPointVec2 = self.CargoCarrier:GetPointVec2() @@ -874,7 +861,7 @@ end -- @param #string Event -- @param #string From -- @param #string To -function CARGO_GROUPED:onenterBoarding( CargoCarrier, Event, From, To ) +function CARGO_GROUPED:onenterBoarding( Event, From, To, CargoCarrier ) self:F( { CargoCarrier.UnitName, Event, From, To } ) if From == "UnLoaded" then @@ -897,7 +884,7 @@ end -- @param #string Event -- @param #string From -- @param #string To -function CARGO_GROUPED:onenterLoaded( CargoCarrier, Event, From, To ) +function CARGO_GROUPED:onenterLoaded( Event, From, To, CargoCarrier ) self:F( { CargoCarrier.UnitName, Event, From, To } ) if From == "UnLoaded" then @@ -914,7 +901,7 @@ end -- @param #string Event -- @param #string From -- @param #string To -function CARGO_GROUPED:onleaveBoarding( CargoCarrier, Event, From, To ) +function CARGO_GROUPED:onleaveBoarding( Event, From, To, CargoCarrier ) self:F( { CargoCarrier.UnitName, Event, From, To } ) local Boarded = true @@ -941,7 +928,7 @@ end -- @param #string Event -- @param #string From -- @param #string To -function CARGO_GROUPED:onenterUnBoarding( ToPointVec2, Event, From, To ) +function CARGO_GROUPED:onenterUnBoarding( Event, From, To, ToPointVec2 ) self:F() local Timer = 1 @@ -967,7 +954,7 @@ end -- @param #string Event -- @param #string From -- @param #string To -function CARGO_GROUPED:onleaveUnBoarding( ToPointVec2, Event, From, To ) +function CARGO_GROUPED:onleaveUnBoarding( Event, From, To, ToPointVec2 ) self:F( { ToPointVec2, Event, From, To } ) local Angle = 180 @@ -1002,7 +989,7 @@ end -- @param #string Event -- @param #string From -- @param #string To -function CARGO_GROUPED:onafterUnBoarding( ToPointVec2, Event, From, To ) +function CARGO_GROUPED:onafterUnBoarding( Event, From, To, ToPointVec2 ) self:F( { ToPointVec2, Event, From, To } ) self:__UnLoad( 1, ToPointVec2 ) @@ -1016,7 +1003,7 @@ end -- @param #string Event -- @param #string From -- @param #string To -function CARGO_GROUPED:onenterUnLoaded( ToPointVec2, Event, From, To ) +function CARGO_GROUPED:onenterUnLoaded( Event, From, To, ToPointVec2 ) self:F( { ToPointVec2, Event, From, To } ) if From == "Loaded" then diff --git a/Moose Development/Moose/Fsm/Fsm.lua b/Moose Development/Moose/Fsm/Fsm.lua index 698005fcb..eb2bf8646 100644 --- a/Moose Development/Moose/Fsm/Fsm.lua +++ b/Moose Development/Moose/Fsm/Fsm.lua @@ -419,10 +419,12 @@ FSM_PROCESS = { -- @return #FSM_PROCESS function FSM_PROCESS:New( FsmT, Controllable, Task ) + FsmT = FsmT or FSM_TEMPLATE:New( "" ) + local self = BASE:Inherit( self, FSM_CONTROLLABLE:New( FsmT ) ) -- Fsm.Fsm#FSM_PROCESS self:Assign( Controllable, Task ) - self.ClassName = FsmT._Name + for ParameterID, Parameter in pairs( FsmT:GetParameters() ) do self[ ParameterID ] = Parameter diff --git a/Moose Development/ReleaseNotes.txt b/Moose Development/ReleaseNotes.txt index 8872451a8..6686615c8 100644 --- a/Moose Development/ReleaseNotes.txt +++ b/Moose Development/ReleaseNotes.txt @@ -1,3 +1,18 @@ +2016-12-06 + + - Renamed the documentation references following the structure of the files. + -- All STATEMACHINE references became FSM + -- FSM_TEMPLATE references are also abbreviated by FSMT + -- Removed Process#PROCESS references. + -- All cross file documentation references updated. That was a lot of work! + + - Tasking is working now. But needs further cleanup. + - Templates are assigned to Tasks. When a task is assigned to a player, the FSMT + - Removed 2nd level in tasking. Now there is only one level. + - Tasking works now with FSM. + - Made FSMT process templates that can be used in Tasks. + - Scoring can now also be added to the templates. + 2016-09-01 - Expanded the CARGO classes and implemented the CARGO_GROUPED classes. diff --git a/Moose Test Missions/Moose_Test_AI_Balancer/Moose_Test_AIBALANCER.lua b/Moose Test Missions/AI Balancer/Moose_Test_AIBALANCER.lua similarity index 100% rename from Moose Test Missions/Moose_Test_AI_Balancer/Moose_Test_AIBALANCER.lua rename to Moose Test Missions/AI Balancer/Moose_Test_AIBALANCER.lua diff --git a/Moose Test Missions/Moose_Test_AI_Balancer/Moose_Test_AIBALANCER.miz b/Moose Test Missions/AI Balancer/Moose_Test_AIBALANCER.miz similarity index 100% rename from Moose Test Missions/Moose_Test_AI_Balancer/Moose_Test_AIBALANCER.miz rename to Moose Test Missions/AI Balancer/Moose_Test_AIBALANCER.miz diff --git a/Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.lua b/Moose Test Missions/Airbase Cleaner/Moose_Test_CLEANUP.lua similarity index 100% rename from Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.lua rename to Moose Test Missions/Airbase Cleaner/Moose_Test_CLEANUP.lua diff --git a/Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz b/Moose Test Missions/Airbase Cleaner/Moose_Test_CLEANUP.miz similarity index 100% rename from Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz rename to Moose Test Missions/Airbase Cleaner/Moose_Test_CLEANUP.miz diff --git a/Moose Test Missions/Moose_Test_Airbase_Police/Moose_Test_AIRBASEPOLICE-DB.miz b/Moose Test Missions/Airbase Police/Moose_Test_AIRBASEPOLICE-DB.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Airbase_Police/Moose_Test_AIRBASEPOLICE-DB.miz rename to Moose Test Missions/Airbase Police/Moose_Test_AIRBASEPOLICE-DB.miz diff --git a/Moose Test Missions/Moose_Test_Airbase_Police/Moose_Test_AIRBASEPOLICE.miz b/Moose Test Missions/Airbase Police/Moose_Test_AIRBASEPOLICE.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Airbase_Police/Moose_Test_AIRBASEPOLICE.miz rename to Moose Test Missions/Airbase Police/Moose_Test_AIRBASEPOLICE.miz diff --git a/Moose Test Missions/Moose_Test_Airbase_Police/Moose_Test_AIRBASEPOLICE_CAUCASUS.lua b/Moose Test Missions/Airbase Police/Moose_Test_AIRBASEPOLICE_CAUCASUS.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Airbase_Police/Moose_Test_AIRBASEPOLICE_CAUCASUS.lua rename to Moose Test Missions/Airbase Police/Moose_Test_AIRBASEPOLICE_CAUCASUS.lua diff --git a/Moose Test Missions/Moose_Test_Airbase_Police/Moose_Test_AIRBASEPOLICE_CAUCASUS.miz b/Moose Test Missions/Airbase Police/Moose_Test_AIRBASEPOLICE_CAUCASUS.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Airbase_Police/Moose_Test_AIRBASEPOLICE_CAUCASUS.miz rename to Moose Test Missions/Airbase Police/Moose_Test_AIRBASEPOLICE_CAUCASUS.miz diff --git a/Moose Test Missions/Moose_Test_Airbase_Police/Moose_Test_AIRBASEPOLICE_NEVADA.lua b/Moose Test Missions/Airbase Police/Moose_Test_AIRBASEPOLICE_NEVADA.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Airbase_Police/Moose_Test_AIRBASEPOLICE_NEVADA.lua rename to Moose Test Missions/Airbase Police/Moose_Test_AIRBASEPOLICE_NEVADA.lua diff --git a/Moose Test Missions/Moose_Test_Airbase_Police/Moose_Test_AIRBASEPOLICE_NEVADA.miz b/Moose Test Missions/Airbase Police/Moose_Test_AIRBASEPOLICE_NEVADA.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Airbase_Police/Moose_Test_AIRBASEPOLICE_NEVADA.miz rename to Moose Test Missions/Airbase Police/Moose_Test_AIRBASEPOLICE_NEVADA.miz diff --git a/Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_Board/MOOSE_Test_CARGO_GROUPED_Board.miz b/Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_Board/MOOSE_Test_CARGO_GROUPED_Board.miz new file mode 100644 index 000000000..56797d802 Binary files /dev/null and b/Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_Board/MOOSE_Test_CARGO_GROUPED_Board.miz differ diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_GROUPED_Board/Moose_Test_CARGO_GROUPED_Board.lua b/Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_Board/Moose_Test_CARGO_GROUPED_Board.lua similarity index 100% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_GROUPED_Board/Moose_Test_CARGO_GROUPED_Board.lua rename to Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_Board/Moose_Test_CARGO_GROUPED_Board.lua diff --git a/Moose Test Missions/Moose_Test_Cargo/Moose_Test_CARGO_GROUPED_Transfer/MOOSE_Test_CARGO_GROUPED_Transfer.miz b/Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_Transfer/MOOSE_Test_CARGO_GROUPED_Transfer.miz similarity index 89% rename from Moose Test Missions/Moose_Test_Cargo/Moose_Test_CARGO_GROUPED_Transfer/MOOSE_Test_CARGO_GROUPED_Transfer.miz rename to Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_Transfer/MOOSE_Test_CARGO_GROUPED_Transfer.miz index e80f29f3f..e047e4941 100644 Binary files a/Moose Test Missions/Moose_Test_Cargo/Moose_Test_CARGO_GROUPED_Transfer/MOOSE_Test_CARGO_GROUPED_Transfer.miz and b/Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_Transfer/MOOSE_Test_CARGO_GROUPED_Transfer.miz differ diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_GROUPED_Transfer/MOOSE_Test_CARGO_UNIT_Transfer.miz b/Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_Transfer/MOOSE_Test_CARGO_UNIT_Transfer.miz similarity index 100% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_GROUPED_Transfer/MOOSE_Test_CARGO_UNIT_Transfer.miz rename to Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_Transfer/MOOSE_Test_CARGO_UNIT_Transfer.miz diff --git a/Moose Test Missions/Moose_Test_Cargo/Moose_Test_CARGO_GROUPED_Transfer/Moose_Test_CARGO_GROUPED_Transfer.lua b/Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_Transfer/Moose_Test_CARGO_GROUPED_Transfer.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Cargo/Moose_Test_CARGO_GROUPED_Transfer/Moose_Test_CARGO_GROUPED_Transfer.lua rename to Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_Transfer/Moose_Test_CARGO_GROUPED_Transfer.lua diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_GROUPED_UnBoard/MOOSE_Test_CARGO_GROUPED_UnBoard.miz b/Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_UnBoard/MOOSE_Test_CARGO_GROUPED_UnBoard.miz similarity index 100% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_GROUPED_UnBoard/MOOSE_Test_CARGO_GROUPED_UnBoard.miz rename to Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_UnBoard/MOOSE_Test_CARGO_GROUPED_UnBoard.miz diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_GROUPED_UnBoard/Moose_Test_CARGO_GROUPED_UnBoard.lua b/Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_UnBoard/Moose_Test_CARGO_GROUPED_UnBoard.lua similarity index 100% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_GROUPED_UnBoard/Moose_Test_CARGO_GROUPED_UnBoard.lua rename to Moose Test Missions/Cargo/Moose_Test_CARGO_GROUPED_UnBoard/Moose_Test_CARGO_GROUPED_UnBoard.lua diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_PACKAGE_Board/MOOSE_Test_CARGO_PACKAGE_Board.miz b/Moose Test Missions/Cargo/Moose_Test_CARGO_PACKAGE_Board/MOOSE_Test_CARGO_PACKAGE_Board.miz similarity index 80% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_PACKAGE_Board/MOOSE_Test_CARGO_PACKAGE_Board.miz rename to Moose Test Missions/Cargo/Moose_Test_CARGO_PACKAGE_Board/MOOSE_Test_CARGO_PACKAGE_Board.miz index 4207215be..afff74d82 100644 Binary files a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_PACKAGE_Board/MOOSE_Test_CARGO_PACKAGE_Board.miz and b/Moose Test Missions/Cargo/Moose_Test_CARGO_PACKAGE_Board/MOOSE_Test_CARGO_PACKAGE_Board.miz differ diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_PACKAGE_Board/Moose_Test_CARGO_PACKAGE_Board.lua b/Moose Test Missions/Cargo/Moose_Test_CARGO_PACKAGE_Board/Moose_Test_CARGO_PACKAGE_Board.lua similarity index 100% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_PACKAGE_Board/Moose_Test_CARGO_PACKAGE_Board.lua rename to Moose Test Missions/Cargo/Moose_Test_CARGO_PACKAGE_Board/Moose_Test_CARGO_PACKAGE_Board.lua diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_PACKAGE_UnBoard/MOOSE_Test_CARGO_PACKAGE_UnBoard.miz b/Moose Test Missions/Cargo/Moose_Test_CARGO_PACKAGE_UnBoard/MOOSE_Test_CARGO_PACKAGE_UnBoard.miz similarity index 100% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_PACKAGE_UnBoard/MOOSE_Test_CARGO_PACKAGE_UnBoard.miz rename to Moose Test Missions/Cargo/Moose_Test_CARGO_PACKAGE_UnBoard/MOOSE_Test_CARGO_PACKAGE_UnBoard.miz diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_PACKAGE_UnBoard/Moose_Test_CARGO_PACKAGE_UnBoard.lua b/Moose Test Missions/Cargo/Moose_Test_CARGO_PACKAGE_UnBoard/Moose_Test_CARGO_PACKAGE_UnBoard.lua similarity index 100% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_PACKAGE_UnBoard/Moose_Test_CARGO_PACKAGE_UnBoard.lua rename to Moose Test Missions/Cargo/Moose_Test_CARGO_PACKAGE_UnBoard/Moose_Test_CARGO_PACKAGE_UnBoard.lua diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_GROUPED_Board/MOOSE_Test_CARGO_GROUPED_Board.miz b/Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_Board/MOOSE_Test_CARGO_UNIT_Board.miz similarity index 61% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_GROUPED_Board/MOOSE_Test_CARGO_GROUPED_Board.miz rename to Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_Board/MOOSE_Test_CARGO_UNIT_Board.miz index 7aa494e00..5a69ddf6c 100644 Binary files a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_GROUPED_Board/MOOSE_Test_CARGO_GROUPED_Board.miz and b/Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_Board/MOOSE_Test_CARGO_UNIT_Board.miz differ diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_Board/Moose_Test_CARGO_UNIT_Board.lua b/Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_Board/Moose_Test_CARGO_UNIT_Board.lua similarity index 100% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_Board/Moose_Test_CARGO_UNIT_Board.lua rename to Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_Board/Moose_Test_CARGO_UNIT_Board.lua diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_Transfer/MOOSE_Test_CARGO_UNIT_Transfer.miz b/Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_Transfer/MOOSE_Test_CARGO_UNIT_Transfer.miz similarity index 100% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_Transfer/MOOSE_Test_CARGO_UNIT_Transfer.miz rename to Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_Transfer/MOOSE_Test_CARGO_UNIT_Transfer.miz diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_Transfer/Moose_Test_CARGO_UNIT_Transfer.lua b/Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_Transfer/Moose_Test_CARGO_UNIT_Transfer.lua similarity index 100% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_Transfer/Moose_Test_CARGO_UNIT_Transfer.lua rename to Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_Transfer/Moose_Test_CARGO_UNIT_Transfer.lua diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_UnBoard/MOOSE_Test_CARGO_UNIT_UnBoard.miz b/Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_UnBoard/MOOSE_Test_CARGO_UNIT_UnBoard.miz similarity index 100% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_UnBoard/MOOSE_Test_CARGO_UNIT_UnBoard.miz rename to Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_UnBoard/MOOSE_Test_CARGO_UNIT_UnBoard.miz diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_UnBoard/Moose_Test_CARGO_UNIT_UnBoard.lua b/Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_UnBoard/Moose_Test_CARGO_UNIT_UnBoard.lua similarity index 100% rename from Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_UnBoard/Moose_Test_CARGO_UNIT_UnBoard.lua rename to Moose Test Missions/Cargo/Moose_Test_CARGO_UNIT_UnBoard/Moose_Test_CARGO_UNIT_UnBoard.lua diff --git a/Moose Test Missions/Moose_Test_Detection/Moose_Test_Detection_Areas/Moose_Test_Detection_Areas.lua b/Moose Test Missions/Detection/Moose_Test_Detection_Areas/Moose_Test_Detection_Areas.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Detection/Moose_Test_Detection_Areas/Moose_Test_Detection_Areas.lua rename to Moose Test Missions/Detection/Moose_Test_Detection_Areas/Moose_Test_Detection_Areas.lua diff --git a/Moose Test Missions/Moose_Test_Detection/Moose_Test_Detection_Areas/Moose_Test_Detection_Areas.miz b/Moose Test Missions/Detection/Moose_Test_Detection_Areas/Moose_Test_Detection_Areas.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Detection/Moose_Test_Detection_Areas/Moose_Test_Detection_Areas.miz rename to Moose Test Missions/Detection/Moose_Test_Detection_Areas/Moose_Test_Detection_Areas.miz diff --git a/Moose Test Missions/Moose_Test_Detection/Moose_Test_Detection_Reporting/Moose_Test_Detection_Reporting.lua b/Moose Test Missions/Detection/Moose_Test_Detection_Reporting/Moose_Test_Detection_Reporting.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Detection/Moose_Test_Detection_Reporting/Moose_Test_Detection_Reporting.lua rename to Moose Test Missions/Detection/Moose_Test_Detection_Reporting/Moose_Test_Detection_Reporting.lua diff --git a/Moose Test Missions/Moose_Test_Detection/Moose_Test_Detection_Reporting/Moose_Test_Detection_Reporting.miz b/Moose Test Missions/Detection/Moose_Test_Detection_Reporting/Moose_Test_Detection_Reporting.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Detection/Moose_Test_Detection_Reporting/Moose_Test_Detection_Reporting.miz rename to Moose Test Missions/Detection/Moose_Test_Detection_Reporting/Moose_Test_Detection_Reporting.miz diff --git a/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.lua b/Moose Test Missions/Escorting/MOOSE_Test_ESCORT.lua similarity index 100% rename from Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.lua rename to Moose Test Missions/Escorting/MOOSE_Test_ESCORT.lua diff --git a/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz b/Moose Test Missions/Escorting/MOOSE_Test_ESCORT.miz similarity index 100% rename from Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz rename to Moose Test Missions/Escorting/MOOSE_Test_ESCORT.miz diff --git a/Moose Test Missions/Moose_Test_Menus/Moose_Test_MENU_CLIENT/Moose_Test_MENU_CLIENT.lua b/Moose Test Missions/Menus/Moose_Test_MENU_CLIENT/Moose_Test_MENU_CLIENT.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Menus/Moose_Test_MENU_CLIENT/Moose_Test_MENU_CLIENT.lua rename to Moose Test Missions/Menus/Moose_Test_MENU_CLIENT/Moose_Test_MENU_CLIENT.lua diff --git a/Moose Test Missions/Moose_Test_Menus/Moose_Test_MENU_CLIENT/Moose_Test_MENU_CLIENT.miz b/Moose Test Missions/Menus/Moose_Test_MENU_CLIENT/Moose_Test_MENU_CLIENT.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Menus/Moose_Test_MENU_CLIENT/Moose_Test_MENU_CLIENT.miz rename to Moose Test Missions/Menus/Moose_Test_MENU_CLIENT/Moose_Test_MENU_CLIENT.miz diff --git a/Moose Test Missions/Moose_Test_Menus/Moose_Test_MENU_COALITION/Moose_Test_MENU_COALITION.lua b/Moose Test Missions/Menus/Moose_Test_MENU_COALITION/Moose_Test_MENU_COALITION.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Menus/Moose_Test_MENU_COALITION/Moose_Test_MENU_COALITION.lua rename to Moose Test Missions/Menus/Moose_Test_MENU_COALITION/Moose_Test_MENU_COALITION.lua diff --git a/Moose Test Missions/Moose_Test_Menus/Moose_Test_MENU_COALITION/Moose_Test_MENU_COALITION.miz b/Moose Test Missions/Menus/Moose_Test_MENU_COALITION/Moose_Test_MENU_COALITION.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Menus/Moose_Test_MENU_COALITION/Moose_Test_MENU_COALITION.miz rename to Moose Test Missions/Menus/Moose_Test_MENU_COALITION/Moose_Test_MENU_COALITION.miz diff --git a/Moose Test Missions/Moose_Test_Menus/Moose_Test_MENU_GROUP/Moose_Test_MENU_GROUP.lua b/Moose Test Missions/Menus/Moose_Test_MENU_GROUP/Moose_Test_MENU_GROUP.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Menus/Moose_Test_MENU_GROUP/Moose_Test_MENU_GROUP.lua rename to Moose Test Missions/Menus/Moose_Test_MENU_GROUP/Moose_Test_MENU_GROUP.lua diff --git a/Moose Test Missions/Moose_Test_Menus/Moose_Test_MENU_GROUP/Moose_Test_MENU_GROUP.miz b/Moose Test Missions/Menus/Moose_Test_MENU_GROUP/Moose_Test_MENU_GROUP.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Menus/Moose_Test_MENU_GROUP/Moose_Test_MENU_GROUP.miz rename to Moose Test Missions/Menus/Moose_Test_MENU_GROUP/Moose_Test_MENU_GROUP.miz diff --git a/Moose Test Missions/Moose_Test_Missile_Trainer/Moose_Test_MISSILETRAINER.lua b/Moose Test Missions/Missile Trainer/Moose_Test_MISSILETRAINER.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Missile_Trainer/Moose_Test_MISSILETRAINER.lua rename to Moose Test Missions/Missile Trainer/Moose_Test_MISSILETRAINER.lua diff --git a/Moose Test Missions/Moose_Test_Missile_Trainer/Moose_Test_MISSILETRAINER.miz b/Moose Test Missions/Missile Trainer/Moose_Test_MISSILETRAINER.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Missile_Trainer/Moose_Test_MISSILETRAINER.miz rename to Moose Test Missions/Missile Trainer/Moose_Test_MISSILETRAINER.miz diff --git a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_Board/MOOSE_Test_CARGO_UNIT_Board.miz b/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_Board/MOOSE_Test_CARGO_UNIT_Board.miz deleted file mode 100644 index 3e48768b5..000000000 Binary files a/Moose Test Missions/Moose_Test_CARGO/Moose_Test_CARGO_UNIT_Board/MOOSE_Test_CARGO_UNIT_Board.miz and /dev/null differ diff --git a/Moose Test Missions/Moose_Test_Patrolling/Moose_Test_PROCESS_PATROLZONE_Switching/Moose_Test_PROCESS_PATROLZONE_Switching.lua b/Moose Test Missions/Patrolling/Moose_Test_PROCESS_PATROLZONE_Switching/Moose_Test_PROCESS_PATROLZONE_Switching.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Patrolling/Moose_Test_PROCESS_PATROLZONE_Switching/Moose_Test_PROCESS_PATROLZONE_Switching.lua rename to Moose Test Missions/Patrolling/Moose_Test_PROCESS_PATROLZONE_Switching/Moose_Test_PROCESS_PATROLZONE_Switching.lua diff --git a/Moose Test Missions/Moose_Test_Patrolling/Moose_Test_PROCESS_PATROLZONE_Switching/Moose_Test_PROCESS_PATROLZONE_Switching.miz b/Moose Test Missions/Patrolling/Moose_Test_PROCESS_PATROLZONE_Switching/Moose_Test_PROCESS_PATROLZONE_Switching.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Patrolling/Moose_Test_PROCESS_PATROLZONE_Switching/Moose_Test_PROCESS_PATROLZONE_Switching.miz rename to Moose Test Missions/Patrolling/Moose_Test_PROCESS_PATROLZONE_Switching/Moose_Test_PROCESS_PATROLZONE_Switching.miz diff --git a/Moose Test Missions/Moose_Test_Scheduling/Moose_Test_SCHEDULER_Nested/Moose_Test_SCHEDULER_Nested.lua b/Moose Test Missions/Scheduling/Moose_Test_SCHEDULER_Nested/Moose_Test_SCHEDULER_Nested.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Scheduling/Moose_Test_SCHEDULER_Nested/Moose_Test_SCHEDULER_Nested.lua rename to Moose Test Missions/Scheduling/Moose_Test_SCHEDULER_Nested/Moose_Test_SCHEDULER_Nested.lua diff --git a/Moose Test Missions/Moose_Test_Scheduling/Moose_Test_SCHEDULER_Nested/Moose_Test_SCHEDULER_Nested.miz b/Moose Test Missions/Scheduling/Moose_Test_SCHEDULER_Nested/Moose_Test_SCHEDULER_Nested.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Scheduling/Moose_Test_SCHEDULER_Nested/Moose_Test_SCHEDULER_Nested.miz rename to Moose Test Missions/Scheduling/Moose_Test_SCHEDULER_Nested/Moose_Test_SCHEDULER_Nested.miz diff --git a/Moose Test Missions/Moose_Test_Scheduling/Moose_Test_SCHEDULER_Repeated/Moose_Test_SCHEDULER_Repeated.lua b/Moose Test Missions/Scheduling/Moose_Test_SCHEDULER_Repeated/Moose_Test_SCHEDULER_Repeated.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Scheduling/Moose_Test_SCHEDULER_Repeated/Moose_Test_SCHEDULER_Repeated.lua rename to Moose Test Missions/Scheduling/Moose_Test_SCHEDULER_Repeated/Moose_Test_SCHEDULER_Repeated.lua diff --git a/Moose Test Missions/Moose_Test_Scheduling/Moose_Test_SCHEDULER_Repeated/Moose_Test_SCHEDULER_Repeated.miz b/Moose Test Missions/Scheduling/Moose_Test_SCHEDULER_Repeated/Moose_Test_SCHEDULER_Repeated.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Scheduling/Moose_Test_SCHEDULER_Repeated/Moose_Test_SCHEDULER_Repeated.miz rename to Moose Test Missions/Scheduling/Moose_Test_SCHEDULER_Repeated/Moose_Test_SCHEDULER_Repeated.miz diff --git a/Moose Test Missions/Moose_Test_Scheduling/Moose_Test_SCHEDULER_Simple/Moose_Test_SCHEDULER_Simple.lua b/Moose Test Missions/Scheduling/Moose_Test_SCHEDULER_Simple/Moose_Test_SCHEDULER_Simple.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Scheduling/Moose_Test_SCHEDULER_Simple/Moose_Test_SCHEDULER_Simple.lua rename to Moose Test Missions/Scheduling/Moose_Test_SCHEDULER_Simple/Moose_Test_SCHEDULER_Simple.lua diff --git a/Moose Test Missions/Moose_Test_Scheduling/Moose_Test_SCHEDULER_Simple/Moose_Test_SCHEDULER_Simple.miz b/Moose Test Missions/Scheduling/Moose_Test_SCHEDULER_Simple/Moose_Test_SCHEDULER_Simple.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Scheduling/Moose_Test_SCHEDULER_Simple/Moose_Test_SCHEDULER_Simple.miz rename to Moose Test Missions/Scheduling/Moose_Test_SCHEDULER_Simple/Moose_Test_SCHEDULER_Simple.miz diff --git a/Moose Test Missions/Moose_Test_Sead_Avoidance/MOOSE_Test_SEAD.miz b/Moose Test Missions/Sead Avoidance/MOOSE_Test_SEAD.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Sead_Avoidance/MOOSE_Test_SEAD.miz rename to Moose Test Missions/Sead Avoidance/MOOSE_Test_SEAD.miz diff --git a/Moose Test Missions/Moose_Test_Sead_Avoidance/Moose_Test_SEAD.lua b/Moose Test Missions/Sead Avoidance/Moose_Test_SEAD.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Sead_Avoidance/Moose_Test_SEAD.lua rename to Moose Test Missions/Sead Avoidance/Moose_Test_SEAD.lua diff --git a/Moose Test Missions/Moose_Test_Sets/Moose_Test_SET_AIRBASE/Moose_Test_SET_AIRBASE.lua b/Moose Test Missions/Sets/Moose_Test_SET_AIRBASE/Moose_Test_SET_AIRBASE.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Sets/Moose_Test_SET_AIRBASE/Moose_Test_SET_AIRBASE.lua rename to Moose Test Missions/Sets/Moose_Test_SET_AIRBASE/Moose_Test_SET_AIRBASE.lua diff --git a/Moose Test Missions/Moose_Test_Sets/Moose_Test_SET_AIRBASE/Moose_Test_SET_AIRBASE.miz b/Moose Test Missions/Sets/Moose_Test_SET_AIRBASE/Moose_Test_SET_AIRBASE.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Sets/Moose_Test_SET_AIRBASE/Moose_Test_SET_AIRBASE.miz rename to Moose Test Missions/Sets/Moose_Test_SET_AIRBASE/Moose_Test_SET_AIRBASE.miz diff --git a/Moose Test Missions/Moose_Test_Sets/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.lua b/Moose Test Missions/Sets/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Sets/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.lua rename to Moose Test Missions/Sets/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.lua diff --git a/Moose Test Missions/Moose_Test_Sets/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.miz b/Moose Test Missions/Sets/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Sets/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.miz rename to Moose Test Missions/Sets/Moose_Test_SET_CLIENT/Moose_Test_SET_CLIENT.miz diff --git a/Moose Test Missions/Moose_Test_Sets/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.lua b/Moose Test Missions/Sets/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Sets/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.lua rename to Moose Test Missions/Sets/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.lua diff --git a/Moose Test Missions/Moose_Test_Sets/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.miz b/Moose Test Missions/Sets/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Sets/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.miz rename to Moose Test Missions/Sets/Moose_Test_SET_GROUP/Moose_Test_SET_GROUP.miz diff --git a/Moose Test Missions/Moose_Test_Spawning/MOOSE_Test_SPAWN.lua b/Moose Test Missions/Spawning/MOOSE_Test_SPAWN.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/MOOSE_Test_SPAWN.lua rename to Moose Test Missions/Spawning/MOOSE_Test_SPAWN.lua diff --git a/Moose Test Missions/Moose_Test_Spawning/MOOSE_Test_SPAWN.miz b/Moose Test Missions/Spawning/MOOSE_Test_SPAWN.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/MOOSE_Test_SPAWN.miz rename to Moose Test Missions/Spawning/MOOSE_Test_SPAWN.miz diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_CleanUp/MOOSE_Test_SPAWN_CleanUp.lua b/Moose Test Missions/Spawning/Moose_Test_SPAWN_CleanUp/MOOSE_Test_SPAWN_CleanUp.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_CleanUp/MOOSE_Test_SPAWN_CleanUp.lua rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_CleanUp/MOOSE_Test_SPAWN_CleanUp.lua diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_CleanUp/MOOSE_Test_SPAWN_CleanUp.miz b/Moose Test Missions/Spawning/Moose_Test_SPAWN_CleanUp/MOOSE_Test_SPAWN_CleanUp.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_CleanUp/MOOSE_Test_SPAWN_CleanUp.miz rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_CleanUp/MOOSE_Test_SPAWN_CleanUp.miz diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitLimit/MOOSE_Test_SPAWN_InitLimit.lua b/Moose Test Missions/Spawning/Moose_Test_SPAWN_InitLimit/MOOSE_Test_SPAWN_InitLimit.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitLimit/MOOSE_Test_SPAWN_InitLimit.lua rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_InitLimit/MOOSE_Test_SPAWN_InitLimit.lua diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitLimit/MOOSE_Test_SPAWN_InitLimit.miz b/Moose Test Missions/Spawning/Moose_Test_SPAWN_InitLimit/MOOSE_Test_SPAWN_InitLimit.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitLimit/MOOSE_Test_SPAWN_InitLimit.miz rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_InitLimit/MOOSE_Test_SPAWN_InitLimit.miz diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitRandomizeTemplate/MOOSE_Test_SPAWN_InitRandomizeTemplate.lua b/Moose Test Missions/Spawning/Moose_Test_SPAWN_InitRandomizeTemplate/MOOSE_Test_SPAWN_InitRandomizeTemplate.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitRandomizeTemplate/MOOSE_Test_SPAWN_InitRandomizeTemplate.lua rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_InitRandomizeTemplate/MOOSE_Test_SPAWN_InitRandomizeTemplate.lua diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitRandomizeTemplate/MOOSE_Test_SPAWN_InitRandomizeTemplate.miz b/Moose Test Missions/Spawning/Moose_Test_SPAWN_InitRandomizeTemplate/MOOSE_Test_SPAWN_InitRandomizeTemplate.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitRandomizeTemplate/MOOSE_Test_SPAWN_InitRandomizeTemplate.miz rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_InitRandomizeTemplate/MOOSE_Test_SPAWN_InitRandomizeTemplate.miz diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitRandomizeZones/Moose_Test_SPAWN_InitRandomizeZones.lua b/Moose Test Missions/Spawning/Moose_Test_SPAWN_InitRandomizeZones/Moose_Test_SPAWN_InitRandomizeZones.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitRandomizeZones/Moose_Test_SPAWN_InitRandomizeZones.lua rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_InitRandomizeZones/Moose_Test_SPAWN_InitRandomizeZones.lua diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitRandomizeZones/Moose_Test_SPAWN_InitRandomizeZones.miz b/Moose Test Missions/Spawning/Moose_Test_SPAWN_InitRandomizeZones/Moose_Test_SPAWN_InitRandomizeZones.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitRandomizeZones/Moose_Test_SPAWN_InitRandomizeZones.miz rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_InitRandomizeZones/Moose_Test_SPAWN_InitRandomizeZones.miz diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitRepeat/MOOSE_Test_SPAWN_InitRepeat.lua b/Moose Test Missions/Spawning/Moose_Test_SPAWN_InitRepeat/MOOSE_Test_SPAWN_InitRepeat.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitRepeat/MOOSE_Test_SPAWN_InitRepeat.lua rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_InitRepeat/MOOSE_Test_SPAWN_InitRepeat.lua diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitRepeat/MOOSE_Test_SPAWN_InitRepeat.miz b/Moose Test Missions/Spawning/Moose_Test_SPAWN_InitRepeat/MOOSE_Test_SPAWN_InitRepeat.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_InitRepeat/MOOSE_Test_SPAWN_InitRepeat.miz rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_InitRepeat/MOOSE_Test_SPAWN_InitRepeat.miz diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromStatic/Moose_Test_SPAWN_SpawnFromStatic.lua b/Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromStatic/Moose_Test_SPAWN_SpawnFromStatic.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromStatic/Moose_Test_SPAWN_SpawnFromStatic.lua rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromStatic/Moose_Test_SPAWN_SpawnFromStatic.lua diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromStatic/Moose_Test_SPAWN_SpawnFromStatic.miz b/Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromStatic/Moose_Test_SPAWN_SpawnFromStatic.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromStatic/Moose_Test_SPAWN_SpawnFromStatic.miz rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromStatic/Moose_Test_SPAWN_SpawnFromStatic.miz diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromUnit/Moose_Test_SPAWN_SpawnFromUnit.lua b/Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromUnit/Moose_Test_SPAWN_SpawnFromUnit.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromUnit/Moose_Test_SPAWN_SpawnFromUnit.lua rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromUnit/Moose_Test_SPAWN_SpawnFromUnit.lua diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromUnit/Moose_Test_SPAWN_SpawnFromUnit.miz b/Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromUnit/Moose_Test_SPAWN_SpawnFromUnit.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromUnit/Moose_Test_SPAWN_SpawnFromUnit.miz rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromUnit/Moose_Test_SPAWN_SpawnFromUnit.miz diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromVec2/Moose_Test_SPAWN_SpawnFromVec2.lua b/Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromVec2/Moose_Test_SPAWN_SpawnFromVec2.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromVec2/Moose_Test_SPAWN_SpawnFromVec2.lua rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromVec2/Moose_Test_SPAWN_SpawnFromVec2.lua diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromVec2/Moose_Test_SPAWN_SpawnFromVec2.miz b/Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromVec2/Moose_Test_SPAWN_SpawnFromVec2.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromVec2/Moose_Test_SPAWN_SpawnFromVec2.miz rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromVec2/Moose_Test_SPAWN_SpawnFromVec2.miz diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromVec3/Moose_Test_SPAWN_SpawnFromVec3.lua b/Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromVec3/Moose_Test_SPAWN_SpawnFromVec3.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromVec3/Moose_Test_SPAWN_SpawnFromVec3.lua rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromVec3/Moose_Test_SPAWN_SpawnFromVec3.lua diff --git a/Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromVec3/Moose_Test_SPAWN_SpawnFromVec3.miz b/Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromVec3/Moose_Test_SPAWN_SpawnFromVec3.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Spawning/Moose_Test_SPAWN_SpawnFromVec3/Moose_Test_SPAWN_SpawnFromVec3.miz rename to Moose Test Missions/Spawning/Moose_Test_SPAWN_SpawnFromVec3/Moose_Test_SPAWN_SpawnFromVec3.miz diff --git a/Moose Test Missions/Moose_Test_Tasking/Moose_Test_Detection_Dispatcher/Moose_Test_Detection_Dispatcher.lua b/Moose Test Missions/Tasking/Moose_Test_Detection_Dispatcher/Moose_Test_Detection_Dispatcher.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Tasking/Moose_Test_Detection_Dispatcher/Moose_Test_Detection_Dispatcher.lua rename to Moose Test Missions/Tasking/Moose_Test_Detection_Dispatcher/Moose_Test_Detection_Dispatcher.lua diff --git a/Moose Test Missions/Moose_Test_Tasking/Moose_Test_Detection_Dispatcher/Moose_Test_Detection_Dispatcher.miz b/Moose Test Missions/Tasking/Moose_Test_Detection_Dispatcher/Moose_Test_Detection_Dispatcher.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Tasking/Moose_Test_Detection_Dispatcher/Moose_Test_Detection_Dispatcher.miz rename to Moose Test Missions/Tasking/Moose_Test_Detection_Dispatcher/Moose_Test_Detection_Dispatcher.miz diff --git a/Moose Test Missions/Moose_Test_Tasking/Moose_Test_Task_Pickup_and_Deploy/MOOSE_Test_Task_Pickup_and_Deploy.lua b/Moose Test Missions/Tasking/Moose_Test_Task_Pickup_and_Deploy/MOOSE_Test_Task_Pickup_and_Deploy.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Tasking/Moose_Test_Task_Pickup_and_Deploy/MOOSE_Test_Task_Pickup_and_Deploy.lua rename to Moose Test Missions/Tasking/Moose_Test_Task_Pickup_and_Deploy/MOOSE_Test_Task_Pickup_and_Deploy.lua diff --git a/Moose Test Missions/Moose_Test_Tasking/Moose_Test_Task_Pickup_and_Deploy/MOOSE_Test_Task_Pickup_and_Deploy.miz b/Moose Test Missions/Tasking/Moose_Test_Task_Pickup_and_Deploy/MOOSE_Test_Task_Pickup_and_Deploy.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Tasking/Moose_Test_Task_Pickup_and_Deploy/MOOSE_Test_Task_Pickup_and_Deploy.miz rename to Moose Test Missions/Tasking/Moose_Test_Task_Pickup_and_Deploy/MOOSE_Test_Task_Pickup_and_Deploy.miz diff --git a/Moose Test Missions/Moose_Test_Tasking/Moose_Test_Task_SEAD/Moose_Test_Task_SEAD.lua b/Moose Test Missions/Tasking/Moose_Test_Task_SEAD/Moose_Test_Task_SEAD.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Tasking/Moose_Test_Task_SEAD/Moose_Test_Task_SEAD.lua rename to Moose Test Missions/Tasking/Moose_Test_Task_SEAD/Moose_Test_Task_SEAD.lua diff --git a/Moose Test Missions/Moose_Test_Tasking/Moose_Test_Task_SEAD/Moose_Test_Task_SEAD.miz b/Moose Test Missions/Tasking/Moose_Test_Task_SEAD/Moose_Test_Task_SEAD.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Tasking/Moose_Test_Task_SEAD/Moose_Test_Task_SEAD.miz rename to Moose Test Missions/Tasking/Moose_Test_Task_SEAD/Moose_Test_Task_SEAD.miz diff --git a/Moose Test Missions/Moose_Test_GROUP_TaskFollow/Moose_Test_GROUP_TaskFollow.lua b/Moose Test Missions/Wrapper/Moose_Test_GROUP_TaskFollow/Moose_Test_GROUP_TaskFollow.lua similarity index 100% rename from Moose Test Missions/Moose_Test_GROUP_TaskFollow/Moose_Test_GROUP_TaskFollow.lua rename to Moose Test Missions/Wrapper/Moose_Test_GROUP_TaskFollow/Moose_Test_GROUP_TaskFollow.lua diff --git a/Moose Test Missions/Moose_Test_GROUP_TaskFollow/Moose_Test_GROUP_TaskFollow.miz b/Moose Test Missions/Wrapper/Moose_Test_GROUP_TaskFollow/Moose_Test_GROUP_TaskFollow.miz similarity index 100% rename from Moose Test Missions/Moose_Test_GROUP_TaskFollow/Moose_Test_GROUP_TaskFollow.miz rename to Moose Test Missions/Wrapper/Moose_Test_GROUP_TaskFollow/Moose_Test_GROUP_TaskFollow.miz diff --git a/Moose Test Missions/Moose_Test_Wrapper/Moose_Test_Group/Moose_Test_GROUP_SwitchWayPoint/MOOSE_Test_GROUP_SwitchWayPoint.miz b/Moose Test Missions/Wrapper/Moose_Test_Group/Moose_Test_GROUP_SwitchWayPoint/MOOSE_Test_GROUP_SwitchWayPoint.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Wrapper/Moose_Test_Group/Moose_Test_GROUP_SwitchWayPoint/MOOSE_Test_GROUP_SwitchWayPoint.miz rename to Moose Test Missions/Wrapper/Moose_Test_Group/Moose_Test_GROUP_SwitchWayPoint/MOOSE_Test_GROUP_SwitchWayPoint.miz diff --git a/Moose Test Missions/Moose_Test_Wrapper/Moose_Test_Group/Moose_Test_GROUP_SwitchWayPoint/Moose_Test_GROUP_SwitchWayPoint.lua b/Moose Test Missions/Wrapper/Moose_Test_Group/Moose_Test_GROUP_SwitchWayPoint/Moose_Test_GROUP_SwitchWayPoint.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Wrapper/Moose_Test_Group/Moose_Test_GROUP_SwitchWayPoint/Moose_Test_GROUP_SwitchWayPoint.lua rename to Moose Test Missions/Wrapper/Moose_Test_Group/Moose_Test_GROUP_SwitchWayPoint/Moose_Test_GROUP_SwitchWayPoint.lua diff --git a/Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.lua b/Moose Test Missions/Wrapper/Moose_Test_WRAPPER.lua similarity index 100% rename from Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.lua rename to Moose Test Missions/Wrapper/Moose_Test_WRAPPER.lua diff --git a/Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz b/Moose Test Missions/Wrapper/Moose_Test_WRAPPER.miz similarity index 100% rename from Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz rename to Moose Test Missions/Wrapper/Moose_Test_WRAPPER.miz diff --git a/Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE/Moose_Test_ZONE.lua b/Moose Test Missions/Zones/Moose_Test_ZONE/Moose_Test_ZONE.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE/Moose_Test_ZONE.lua rename to Moose Test Missions/Zones/Moose_Test_ZONE/Moose_Test_ZONE.lua diff --git a/Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE/Moose_Test_ZONE.miz b/Moose Test Missions/Zones/Moose_Test_ZONE/Moose_Test_ZONE.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE/Moose_Test_ZONE.miz rename to Moose Test Missions/Zones/Moose_Test_ZONE/Moose_Test_ZONE.miz diff --git a/Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.lua b/Moose Test Missions/Zones/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.lua rename to Moose Test Missions/Zones/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.lua diff --git a/Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.miz b/Moose Test Missions/Zones/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.miz rename to Moose Test Missions/Zones/Moose_Test_ZONE_GROUP/Moose_Test_ZONE_GROUP.miz diff --git a/Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.lua b/Moose Test Missions/Zones/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.lua rename to Moose Test Missions/Zones/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.lua diff --git a/Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.miz b/Moose Test Missions/Zones/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.miz rename to Moose Test Missions/Zones/Moose_Test_ZONE_POLYGON/Moose_Test_ZONE_POLYGON.miz diff --git a/Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.lua b/Moose Test Missions/Zones/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.lua rename to Moose Test Missions/Zones/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.lua diff --git a/Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.miz b/Moose Test Missions/Zones/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.miz rename to Moose Test Missions/Zones/Moose_Test_ZONE_RADIUS/Moose_Test_ZONE_RADIUS.miz diff --git a/Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.lua b/Moose Test Missions/Zones/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.lua similarity index 100% rename from Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.lua rename to Moose Test Missions/Zones/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.lua diff --git a/Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz b/Moose Test Missions/Zones/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz similarity index 100% rename from Moose Test Missions/Moose_Test_Zones/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz rename to Moose Test Missions/Zones/Moose_Test_ZONE_UNIT/Moose_Test_ZONE_UNIT.miz diff --git a/Moose Training/Presentations/DCS World - MOOSE - AI Balancer - Part 1 - Explanation.pptx b/Moose Training/Presentations/AI Balancer/DCS World - MOOSE - AI Balancer - Part 1 - Explanation.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - AI Balancer - Part 1 - Explanation.pptx rename to Moose Training/Presentations/AI Balancer/DCS World - MOOSE - AI Balancer - Part 1 - Explanation.pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Cargo.pptx b/Moose Training/Presentations/Cargo/DCS World - MOOSE - Cargo.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Cargo.pptx rename to Moose Training/Presentations/Cargo/DCS World - MOOSE - Cargo.pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Detection - Part 1 - Teaser.pptx b/Moose Training/Presentations/Detection/DCS World - MOOSE - Detection - Part 1 - Teaser.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Detection - Part 1 - Teaser.pptx rename to Moose Training/Presentations/Detection/DCS World - MOOSE - Detection - Part 1 - Teaser.pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Detection - Part 2 - Demo.pptx b/Moose Training/Presentations/Detection/DCS World - MOOSE - Detection - Part 2 - Demo.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Detection - Part 2 - Demo.pptx rename to Moose Training/Presentations/Detection/DCS World - MOOSE - Detection - Part 2 - Demo.pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Detection and Fac.pptx b/Moose Training/Presentations/Detection/DCS World - MOOSE - Detection and Fac.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Detection and Fac.pptx rename to Moose Training/Presentations/Detection/DCS World - MOOSE - Detection and Fac.pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Escorting - Part 2 - APIs.pptx b/Moose Training/Presentations/Escorting/DCS World - MOOSE - Escorting - Part 2 - APIs.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Escorting - Part 2 - APIs.pptx rename to Moose Training/Presentations/Escorting/DCS World - MOOSE - Escorting - Part 2 - APIs.pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Development - Part 1 - Tools and Installation.pptx b/Moose Training/Presentations/Installation and Usage/DCS World - MOOSE - Development - Part 1 - Tools and Installation.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Development - Part 1 - Tools and Installation.pptx rename to Moose Training/Presentations/Installation and Usage/DCS World - MOOSE - Development - Part 1 - Tools and Installation.pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Development - Part 2 - Using Eclipse and MOOSE - Copy.pptx b/Moose Training/Presentations/Installation and Usage/DCS World - MOOSE - Development - Part 2 - Using Eclipse and MOOSE - Copy.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Development - Part 2 - Using Eclipse and MOOSE - Copy.pptx rename to Moose Training/Presentations/Installation and Usage/DCS World - MOOSE - Development - Part 2 - Using Eclipse and MOOSE - Copy.pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Development - Part 3 - The DATABASE - UNIT - CLIENT - GROUP - ZONE, .pptx b/Moose Training/Presentations/Installation and Usage/DCS World - MOOSE - Development - Part 3 - The DATABASE - UNIT - CLIENT - GROUP - ZONE, .pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Development - Part 3 - The DATABASE - UNIT - CLIENT - GROUP - ZONE, .pptx rename to Moose Training/Presentations/Installation and Usage/DCS World - MOOSE - Development - Part 3 - The DATABASE - UNIT - CLIENT - GROUP - ZONE, .pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Missile Trainer.pptx b/Moose Training/Presentations/Missile Trainer/DCS World - MOOSE - Missile Trainer.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Missile Trainer.pptx rename to Moose Training/Presentations/Missile Trainer/DCS World - MOOSE - Missile Trainer.pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Sets - Part 1 - SET_GROUP.pptx b/Moose Training/Presentations/Sets/DCS World - MOOSE - Sets - Part 1 - SET_GROUP.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Sets - Part 1 - SET_GROUP.pptx rename to Moose Training/Presentations/Sets/DCS World - MOOSE - Sets - Part 1 - SET_GROUP.pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Spawning - Part 2 - APIs.pptx b/Moose Training/Presentations/Spawning/DCS World - MOOSE - Spawning - Part 2 - APIs.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Spawning - Part 2 - APIs.pptx rename to Moose Training/Presentations/Spawning/DCS World - MOOSE - Spawning - Part 2 - APIs.pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Development - Part 4 - Wrapper Classes.pptx b/Moose Training/Presentations/Wrapper/DCS World - MOOSE - Development - Part 4 - Wrapper Classes.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Development - Part 4 - Wrapper Classes.pptx rename to Moose Training/Presentations/Wrapper/DCS World - MOOSE - Development - Part 4 - Wrapper Classes.pptx diff --git a/Moose Training/Presentations/DCS World - MOOSE - Zones - Part 1 - Use zones with GROUP and UNIT.pptx b/Moose Training/Presentations/Zones/DCS World - MOOSE - Zones - Part 1 - Use zones with GROUP and UNIT.pptx similarity index 100% rename from Moose Training/Presentations/DCS World - MOOSE - Zones - Part 1 - Use zones with GROUP and UNIT.pptx rename to Moose Training/Presentations/Zones/DCS World - MOOSE - Zones - Part 1 - Use zones with GROUP and UNIT.pptx