diff --git a/.appveyor/appveyor.yml b/.appveyor/appveyor.yml
index ce7a2f7b6..7fcd96a10 100644
--- a/.appveyor/appveyor.yml
+++ b/.appveyor/appveyor.yml
@@ -1,4 +1,4 @@
-version: 3.9.1.{build}
+version: 2.4.a.{build}
 shallow_clone: true
 skip_branch_with_pr: false
 skip_commits:
@@ -17,6 +17,7 @@ environment:
 platform:
   - x64
 
+
 init:
   - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
         https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
@@ -61,7 +62,7 @@ build_script:
          $project = Invoke-RestMethod -method Post -Uri "$apiUrl/builds" -Headers $headers -Body $RequestBody
        }
    - ps: | 
-       if( $env:appveyor_repo_branch -eq 'master' )     
+       if( $env:appveyor_repo_branch -eq 'master' -or $env:appveyor_repo_branch -eq 'develop' )     
        {
          $apiUrl = 'https://ci.appveyor.com/api'
          $token = 'qts80b5kpq0ooj4x6vvw'
@@ -69,13 +70,12 @@ build_script:
            "Authorization" = "Bearer $token"
            "Content-type" = "application/json"
            }
-         $RequestBody = @{ accountName = 'FlightControl-Master'; projectSlug = 'moose-docs'; branch = 'master'; environmentVariables = @{} } | ConvertTo-Json
+         $RequestBody = @{ accountName = 'FlightControl-Master'; projectSlug = 'moose-docs'; branch = "$env:appveyor_repo_branch"; environmentVariables = @{} } | ConvertTo-Json
          # get project with last build details
          $project = Invoke-RestMethod -method Post -Uri "$apiUrl/builds" -Headers $headers -Body $RequestBody
        }
 
 
-
 test: off
 # test_script:
 #   - cmd: luacheck "Moose Development\Moose\moose.lua" "Moose Mission Setup\moose.lua"
diff --git a/Moose Development/Moose/AI/AI_A2A_Cap.lua b/Moose Development/Moose/AI/AI_A2A_Cap.lua
index 9b90b489e..6375f5ee8 100644
--- a/Moose Development/Moose/AI/AI_A2A_Cap.lua	
+++ b/Moose Development/Moose/AI/AI_A2A_Cap.lua	
@@ -1,6 +1,6 @@
 --- **AI** -- (R2.2) - Models the process of Combat Air Patrol (CAP) for airplanes.
 --
--- This is a class used in the @{AI_A2A_Dispatcher}.
+-- This is a class used in the @{AI.AI_A2A_Dispatcher}.
 --
 -- ===
 -- 
diff --git a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
index 96fc731d1..6594ea9bb 100644
--- a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua	
+++ b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua	
@@ -155,7 +155,7 @@
 -- ### Authors: **FlightControl** rework of GCICAP + introduction of new concepts (squadrons).
 -- ### Authors: **Stonehouse**, **SNAFU** in terms of the advice, documentation, and the original GCICAP script.
 -- 
--- @module AI_A2A_Dispatcher
+-- @module AI.AI_A2A_Dispatcher
 
 
 
diff --git a/Moose Development/Moose/Core/Base.lua b/Moose Development/Moose/Core/Base.lua
index 555786ab4..8dc4eb0e8 100644
--- a/Moose Development/Moose/Core/Base.lua	
+++ b/Moose Development/Moose/Core/Base.lua	
@@ -9,7 +9,7 @@
 -- 
 -- ===
 -- 
--- @module Base
+-- @module Core.Base
 
 
 
diff --git a/Moose Development/Moose/Core/Database.lua b/Moose Development/Moose/Core/Database.lua
index 90197b34d..ecd6cddbd 100644
--- a/Moose Development/Moose/Core/Database.lua	
+++ b/Moose Development/Moose/Core/Database.lua	
@@ -7,7 +7,7 @@
 -- 
 -- ===
 -- 
--- @module Database
+-- @module Core.Database
 
 
 --- @type DATABASE
diff --git a/Moose Development/Moose/Core/Event.lua b/Moose Development/Moose/Core/Event.lua
index 5b42a1d8a..01804da7a 100644
--- a/Moose Development/Moose/Core/Event.lua	
+++ b/Moose Development/Moose/Core/Event.lua	
@@ -164,7 +164,7 @@
 -- 
 -- ===
 --
--- @module Event
+-- @module Core.Event
 
 
 --- The EVENT structure
diff --git a/Moose Development/Moose/Core/Fsm.lua b/Moose Development/Moose/Core/Fsm.lua
index 62b80aee2..e3b2aacb1 100644
--- a/Moose Development/Moose/Core/Fsm.lua	
+++ b/Moose Development/Moose/Core/Fsm.lua	
@@ -64,7 +64,7 @@
 -- 
 -- ===
 --
--- @module Fsm
+-- @module Core.Fsm
 
 do -- FSM
 
diff --git a/Moose Development/Moose/Core/Goal.lua b/Moose Development/Moose/Core/Goal.lua
index ff6976877..e4373438e 100644
--- a/Moose Development/Moose/Core/Goal.lua	
+++ b/Moose Development/Moose/Core/Goal.lua	
@@ -10,7 +10,7 @@
 -- 
 -- ===
 -- 
--- @module Goal
+-- @module Core.Goal
 
 do -- Goal
 
diff --git a/Moose Development/Moose/Core/Menu.lua b/Moose Development/Moose/Core/Menu.lua
index 65c0025cd..03eb1c156 100644
--- a/Moose Development/Moose/Core/Menu.lua	
+++ b/Moose Development/Moose/Core/Menu.lua	
@@ -30,7 +30,7 @@
 -- 
 -- ===
 --   
--- @module Menu
+-- @module Core.Menu
 
 
 MENU_INDEX = {}
diff --git a/Moose Development/Moose/Core/Message.lua b/Moose Development/Moose/Core/Message.lua
index 11a1e19dc..904711e7b 100644
--- a/Moose Development/Moose/Core/Message.lua	
+++ b/Moose Development/Moose/Core/Message.lua	
@@ -4,7 +4,7 @@
 -- 
 -- ===
 -- 
--- @module Message
+-- @module Core.Message
 
 --- The MESSAGE class
 -- @type MESSAGE
diff --git a/Moose Development/Moose/Core/Point.lua b/Moose Development/Moose/Core/Point.lua
index 5060600d6..5d914d338 100644
--- a/Moose Development/Moose/Core/Point.lua	
+++ b/Moose Development/Moose/Core/Point.lua	
@@ -26,7 +26,7 @@
 --
 -- ### Contributions:
 --
--- @module Point
+-- @module Core.Point
 
 
 
diff --git a/Moose Development/Moose/Core/Radio.lua b/Moose Development/Moose/Core/Radio.lua
index 1d41d25b7..61eb02a76 100644
--- a/Moose Development/Moose/Core/Radio.lua	
+++ b/Moose Development/Moose/Core/Radio.lua	
@@ -32,7 +32,7 @@
 --
 -- ### Author: Hugues "Grey_Echo" Bousquet
 --
--- @module Radio
+-- @module Core.Radio
 
 
 --- # RADIO class, extends @{Base#BASE}
diff --git a/Moose Development/Moose/Core/ScheduleDispatcher.lua b/Moose Development/Moose/Core/ScheduleDispatcher.lua
index 57073a516..20f3b5185 100644
--- a/Moose Development/Moose/Core/ScheduleDispatcher.lua	
+++ b/Moose Development/Moose/Core/ScheduleDispatcher.lua	
@@ -30,7 +30,7 @@
 -- ### Contributions: -
 -- ### Authors: FlightControl : Design & Programming
 -- 
--- @module ScheduleDispatcher
+-- @module Core.ScheduleDispatcher
 
 --- The SCHEDULEDISPATCHER structure
 -- @type SCHEDULEDISPATCHER
diff --git a/Moose Development/Moose/Core/Scheduler.lua b/Moose Development/Moose/Core/Scheduler.lua
index e576aa2aa..246244b29 100644
--- a/Moose Development/Moose/Core/Scheduler.lua	
+++ b/Moose Development/Moose/Core/Scheduler.lua	
@@ -39,7 +39,7 @@
 -- 
 -- ===
 --
--- @module Scheduler
+-- @module Core.Scheduler
 
 
 --- The SCHEDULER class
diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua
index 21fdde9dd..1c7e8df5e 100644
--- a/Moose Development/Moose/Core/Set.lua	
+++ b/Moose Development/Moose/Core/Set.lua	
@@ -30,7 +30,7 @@
 -- 
 -- ===
 -- 
--- @module Set
+-- @module Core.Set
 
 
 --- @type SET_BASE
diff --git a/Moose Development/Moose/Core/Settings.lua b/Moose Development/Moose/Core/Settings.lua
index 8b8a2c601..a8b9ba76d 100644
--- a/Moose Development/Moose/Core/Settings.lua	
+++ b/Moose Development/Moose/Core/Settings.lua	
@@ -16,7 +16,7 @@
 -- 
 --   * **FlightControl**: Design & Programming
 --
--- @module Settings
+-- @module Core.Settings
 
 
 --- @type SETTINGS
diff --git a/Moose Development/Moose/Core/Spawn.lua b/Moose Development/Moose/Core/Spawn.lua
index fca5971f5..c260e6c9a 100644
--- a/Moose Development/Moose/Core/Spawn.lua	
+++ b/Moose Development/Moose/Core/Spawn.lua	
@@ -21,7 +21,7 @@
 -- 
 -- ===
 -- 
--- @module Spawn
+-- @module Core.Spawn
 
 
 --- SPAWN Class
diff --git a/Moose Development/Moose/Core/SpawnStatic.lua b/Moose Development/Moose/Core/SpawnStatic.lua
index 8019902af..22ae07cfc 100644
--- a/Moose Development/Moose/Core/SpawnStatic.lua	
+++ b/Moose Development/Moose/Core/SpawnStatic.lua	
@@ -29,7 +29,7 @@
 -- 
 -- ===
 -- 
--- @module SpawnStatic
+-- @module Core.SpawnStatic
 
 
 
diff --git a/Moose Development/Moose/Core/Spot.lua b/Moose Development/Moose/Core/Spot.lua
index 10edb6cee..19ca73263 100644
--- a/Moose Development/Moose/Core/Spot.lua	
+++ b/Moose Development/Moose/Core/Spot.lua	
@@ -38,7 +38,7 @@
 -- 
 -- ===
 -- 
--- @module Spot
+-- @module Core.Spot
 
 
 do
diff --git a/Moose Development/Moose/Core/UserFlag.lua b/Moose Development/Moose/Core/UserFlag.lua
index 05fc7b29e..f1b09589c 100644
--- a/Moose Development/Moose/Core/UserFlag.lua	
+++ b/Moose Development/Moose/Core/UserFlag.lua	
@@ -10,7 +10,7 @@
 -- 
 -- ===
 -- 
--- @module UserFlag
+-- @module Core.UserFlag
 
 do -- UserFlag
 
diff --git a/Moose Development/Moose/Core/UserSound.lua b/Moose Development/Moose/Core/UserSound.lua
index 808b78a5f..dcd6c58df 100644
--- a/Moose Development/Moose/Core/UserSound.lua	
+++ b/Moose Development/Moose/Core/UserSound.lua	
@@ -10,7 +10,7 @@
 -- 
 -- ===
 -- 
--- @module UserSound
+-- @module Core.UserSound
 
 do -- UserSound
 
diff --git a/Moose Development/Moose/Core/Velocity.lua b/Moose Development/Moose/Core/Velocity.lua
index 88d047126..ecc4b5ea6 100644
--- a/Moose Development/Moose/Core/Velocity.lua	
+++ b/Moose Development/Moose/Core/Velocity.lua	
@@ -7,7 +7,7 @@
 -- 
 -- ===
 -- 
--- @module Velocity
+-- @module Core.Velocity
 
 do -- Velocity
 
diff --git a/Moose Development/Moose/Core/Zone.lua b/Moose Development/Moose/Core/Zone.lua
index 938fde87a..a8dc2f641 100644
--- a/Moose Development/Moose/Core/Zone.lua	
+++ b/Moose Development/Moose/Core/Zone.lua	
@@ -34,7 +34,7 @@
 -- 
 -- ===
 -- 
--- @module Zone
+-- @module Core.Zone
 
 
 --- @type ZONE_BASE
diff --git a/Moose Development/Moose/Dcs/DCSAirbase.lua b/Moose Development/Moose/Dcs/DCSAirbase.lua
index d47ddc067..192444a06 100644
--- a/Moose Development/Moose/Dcs/DCSAirbase.lua	
+++ b/Moose Development/Moose/Dcs/DCSAirbase.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSAirbase
+-- @module DCS.DCSAirbase
 
 
 --- Represents airbases: airdromes, helipads and ships with flying decks or landing pads.  
diff --git a/Moose Development/Moose/Dcs/DCSCoalitionObject.lua b/Moose Development/Moose/Dcs/DCSCoalitionObject.lua
index 119c9a807..b16ca63c2 100644
--- a/Moose Development/Moose/Dcs/DCSCoalitionObject.lua	
+++ b/Moose Development/Moose/Dcs/DCSCoalitionObject.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSCoalitionObject
+-- @module DCS.DCSCoalitionObject
 
 --- @type CoalitionObject
 -- @extends Dcs.DCSWrapper.Object#Object
diff --git a/Moose Development/Moose/Dcs/DCSCommand.lua b/Moose Development/Moose/Dcs/DCSCommand.lua
index 5e0040332..89b2b6f9e 100644
--- a/Moose Development/Moose/Dcs/DCSCommand.lua	
+++ b/Moose Development/Moose/Dcs/DCSCommand.lua	
@@ -1,4 +1,4 @@
---- @module DCSCommand
+--- @module DCS.DCSCommand
 
 
 --- @type Command
diff --git a/Moose Development/Moose/Dcs/DCSController.lua b/Moose Development/Moose/Dcs/DCSController.lua
index 09b8d4b1e..99666ef97 100644
--- a/Moose Development/Moose/Dcs/DCSController.lua	
+++ b/Moose Development/Moose/Dcs/DCSController.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSController
+-- @module DCS.DCSController
 
 --- Controller is an object that performs A.I.-routines. Other words controller is an instance of A.I.. Controller stores current main task, active enroute tasks and behavior options. Controller performs commands. Please, read DCS A-10C GUI Manual EN.pdf chapter "Task Planning for Unit Groups", page 91 to understand A.I. system of DCS:A-10C. 
 -- 
diff --git a/Moose Development/Moose/Dcs/DCSGroup.lua b/Moose Development/Moose/Dcs/DCSGroup.lua
index 04f7818bf..0e1798e07 100644
--- a/Moose Development/Moose/Dcs/DCSGroup.lua	
+++ b/Moose Development/Moose/Dcs/DCSGroup.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSGroup
+-- @module DCS.DCSGroup
 
 --- Represents group of Units.
 -- @type Group
diff --git a/Moose Development/Moose/Dcs/DCSObject.lua b/Moose Development/Moose/Dcs/DCSObject.lua
index 281e2781a..fb09234d4 100644
--- a/Moose Development/Moose/Dcs/DCSObject.lua	
+++ b/Moose Development/Moose/Dcs/DCSObject.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSObject
+-- @module DCS.DCSObject
 
 --- @type Object
 -- @field #Object.Category Category
diff --git a/Moose Development/Moose/Dcs/DCSStaticObject.lua b/Moose Development/Moose/Dcs/DCSStaticObject.lua
index 5dc220412..e01f017da 100644
--- a/Moose Development/Moose/Dcs/DCSStaticObject.lua	
+++ b/Moose Development/Moose/Dcs/DCSStaticObject.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSStaticObject
+-- @module DCS.DCSStaticObject
 
 
 -------------------------------------------------------------------------------
diff --git a/Moose Development/Moose/Dcs/DCSTask.lua b/Moose Development/Moose/Dcs/DCSTask.lua
index 4b4cd277a..825b9f0bc 100644
--- a/Moose Development/Moose/Dcs/DCSTask.lua	
+++ b/Moose Development/Moose/Dcs/DCSTask.lua	
@@ -1,4 +1,4 @@
---- @module DCSTask
+--- @module DCS.DCSTask
 
 
 --- A task descriptor (internal structure for DCS World)
diff --git a/Moose Development/Moose/Dcs/DCSTime.lua b/Moose Development/Moose/Dcs/DCSTime.lua
index d70d337ec..766f53317 100644
--- a/Moose Development/Moose/Dcs/DCSTime.lua	
+++ b/Moose Development/Moose/Dcs/DCSTime.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSTime
+-- @module DCS.DCSTime
 
 --- @type ModelTime
 -- @extends #number
diff --git a/Moose Development/Moose/Dcs/DCSTypes.lua b/Moose Development/Moose/Dcs/DCSTypes.lua
index 176725302..bb00369e4 100644
--- a/Moose Development/Moose/Dcs/DCSTypes.lua	
+++ b/Moose Development/Moose/Dcs/DCSTypes.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSTypes
+-- @module DCS.DCSTypes
 
 
 
diff --git a/Moose Development/Moose/Dcs/DCSUnit.lua b/Moose Development/Moose/Dcs/DCSUnit.lua
index e5e86aba2..723b653d1 100644
--- a/Moose Development/Moose/Dcs/DCSUnit.lua	
+++ b/Moose Development/Moose/Dcs/DCSUnit.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSUnit
+-- @module DCS.DCSUnit
 
 --- @type Unit
 -- @extends Dcs.DCSCoalitionWrapper.Object#CoalitionObject
diff --git a/Moose Development/Moose/Dcs/DCSVec3.lua b/Moose Development/Moose/Dcs/DCSVec3.lua
index 6de2c20aa..0128e1a7a 100644
--- a/Moose Development/Moose/Dcs/DCSVec3.lua	
+++ b/Moose Development/Moose/Dcs/DCSVec3.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSVec3
+-- @module DCS.DCSVec3
 
 
 
diff --git a/Moose Development/Moose/Dcs/DCSZone.lua b/Moose Development/Moose/Dcs/DCSZone.lua
index 4b65bd76e..6070d8cc9 100644
--- a/Moose Development/Moose/Dcs/DCSZone.lua	
+++ b/Moose Development/Moose/Dcs/DCSZone.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSZone
+-- @module DCS.DCSZone
 
 
 
diff --git a/Moose Development/Moose/Dcs/DCScoalition.lua b/Moose Development/Moose/Dcs/DCScoalition.lua
index e51508a3e..309492fd0 100644
--- a/Moose Development/Moose/Dcs/DCScoalition.lua	
+++ b/Moose Development/Moose/Dcs/DCScoalition.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCScoalition
+-- @module DCS.DCScoalition
 
 --- @type coalition
 -- @field #coalition.side side
diff --git a/Moose Development/Moose/Dcs/DCScountry.lua b/Moose Development/Moose/Dcs/DCScountry.lua
index e390894cd..32ff4c34e 100644
--- a/Moose Development/Moose/Dcs/DCScountry.lua	
+++ b/Moose Development/Moose/Dcs/DCScountry.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCScountry
+-- @module DCS.DCScountry
 
 --- @type country
 -- @field #country.id id
diff --git a/Moose Development/Moose/Dcs/DCSenv.lua b/Moose Development/Moose/Dcs/DCSenv.lua
index c6fe98776..8b71f0f9e 100644
--- a/Moose Development/Moose/Dcs/DCSenv.lua	
+++ b/Moose Development/Moose/Dcs/DCSenv.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module env
+-- @module DCS.DCSenv
 
 --- @type env
 
diff --git a/Moose Development/Moose/Dcs/DCSland.lua b/Moose Development/Moose/Dcs/DCSland.lua
index 6391142af..5e4d2c77c 100644
--- a/Moose Development/Moose/Dcs/DCSland.lua	
+++ b/Moose Development/Moose/Dcs/DCSland.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module land
+-- @module DCS.land
 
 --- @type land
 -- @field #land.SurfaceType SurfaceType
diff --git a/Moose Development/Moose/Dcs/DCStimer.lua b/Moose Development/Moose/Dcs/DCStimer.lua
index 2d0f4a16c..91fb3b93d 100644
--- a/Moose Development/Moose/Dcs/DCStimer.lua	
+++ b/Moose Development/Moose/Dcs/DCStimer.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCStimer
+-- @module DCS.DCStimer
 
 --- @type timer
 
diff --git a/Moose Development/Moose/Dcs/DCStrigger.lua b/Moose Development/Moose/Dcs/DCStrigger.lua
index 7bf5360be..c1638c5bb 100644
--- a/Moose Development/Moose/Dcs/DCStrigger.lua	
+++ b/Moose Development/Moose/Dcs/DCStrigger.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCStrigger
+-- @module DCS.DCStrigger
 
 
 trigger = {} --#timer
diff --git a/Moose Development/Moose/Dcs/DCSworld.lua b/Moose Development/Moose/Dcs/DCSworld.lua
index 5bcb203d2..80fed64a2 100644
--- a/Moose Development/Moose/Dcs/DCSworld.lua	
+++ b/Moose Development/Moose/Dcs/DCSworld.lua	
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSWorld
+-- @module DCS.DCSWorld
 
 --- @type world
 -- @field #world.event event