diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.rst
new file mode 100644
index 0000000000000000000000000000000000000000..0d3491bb8020a5033b5c8f113a41e969d6af6693
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.rst
@@ -0,0 +1,38 @@
+force_bdss.core_plugins.dummy.dummy_data_source package
+=======================================================
+
+Submodules
+----------
+
+force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source module
+------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source_bundle module
+-------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source_bundle
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source_model module
+------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.dummy_data_source_model
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.rst b/doc/source/api/force_bdss.core_plugins.dummy.rst
index 9855728ad131b97dced0c75b7475654a5e3766b7..6476239ac3951c1b2f5ebef36b3a1172e81fd265 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.rst
@@ -8,6 +8,7 @@ Subpackages
 
     force_bdss.core_plugins.dummy.csv_extractor
     force_bdss.core_plugins.dummy.dummy_dakota
+    force_bdss.core_plugins.dummy.dummy_data_source
     force_bdss.core_plugins.dummy.dummy_kpi_calculator
     force_bdss.core_plugins.dummy.kpi_adder
 
diff --git a/doc/source/api/force_bdss.mco.rst b/doc/source/api/force_bdss.mco.rst
index 8b2a6e33dc0f4d464f7f10a9130d930f9ad53a85..c8047b33691b51c57d8f3ac75629b1c6f206f8ff 100644
--- a/doc/source/api/force_bdss.mco.rst
+++ b/doc/source/api/force_bdss.mco.rst
@@ -12,42 +12,42 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.mco.base_mco_communicator module
--------------------------------------------
+force_bdss.mco.base_mco module
+------------------------------
 
-.. automodule:: force_bdss.mco.base_mco_communicator
+.. automodule:: force_bdss.mco.base_mco
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.base_mco_model module
-------------------------------------
+force_bdss.mco.base_mco_bundle module
+-------------------------------------
 
-.. automodule:: force_bdss.mco.base_mco_model
+.. automodule:: force_bdss.mco.base_mco_bundle
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.base_multi_criteria_optimizer module
----------------------------------------------------
+force_bdss.mco.base_mco_communicator module
+-------------------------------------------
 
-.. automodule:: force_bdss.mco.base_multi_criteria_optimizer
+.. automodule:: force_bdss.mco.base_mco_communicator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.base_multi_criteria_optimizer_bundle module
-----------------------------------------------------------
+force_bdss.mco.base_mco_model module
+------------------------------------
 
-.. automodule:: force_bdss.mco.base_multi_criteria_optimizer_bundle
+.. automodule:: force_bdss.mco.base_mco_model
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.i_multi_criteria_optimizer_bundle module
--------------------------------------------------------
+force_bdss.mco.i_mco_bundle module
+----------------------------------
 
-.. automodule:: force_bdss.mco.i_multi_criteria_optimizer_bundle
+.. automodule:: force_bdss.mco.i_mco_bundle
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.mco.tests.rst b/doc/source/api/force_bdss.mco.tests.rst
index 9eb3cabfbc9be6083e0cc1e618267aa4fe82b955..6dbcf8432a56e54097c8d928f481e2ee23fed06b 100644
--- a/doc/source/api/force_bdss.mco.tests.rst
+++ b/doc/source/api/force_bdss.mco.tests.rst
@@ -4,26 +4,26 @@ force_bdss.mco.tests package
 Submodules
 ----------
 
-force_bdss.mco.tests.test_base_mco_communicator module
-------------------------------------------------------
+force_bdss.mco.tests.test_base_mco module
+-----------------------------------------
 
-.. automodule:: force_bdss.mco.tests.test_base_mco_communicator
+.. automodule:: force_bdss.mco.tests.test_base_mco
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.tests.test_base_multi_criteria_optimizer module
---------------------------------------------------------------
+force_bdss.mco.tests.test_base_mco_bundle module
+------------------------------------------------
 
-.. automodule:: force_bdss.mco.tests.test_base_multi_criteria_optimizer
+.. automodule:: force_bdss.mco.tests.test_base_mco_bundle
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.tests.test_base_multi_criteria_optimizer_bundle module
----------------------------------------------------------------------
+force_bdss.mco.tests.test_base_mco_communicator module
+------------------------------------------------------
 
-.. automodule:: force_bdss.mco.tests.test_base_multi_criteria_optimizer_bundle
+.. automodule:: force_bdss.mco.tests.test_base_mco_communicator
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/source/api/force_bdss.tests.rst b/doc/source/api/force_bdss.tests.rst
index d78f9d359df54ee71bfe7a117a086d75f9719589..149a14bb7187eda808fdadcb8a5b8f59d5d73ed5 100644
--- a/doc/source/api/force_bdss.tests.rst
+++ b/doc/source/api/force_bdss.tests.rst
@@ -11,6 +11,14 @@ Subpackages
 Submodules
 ----------
 
+force_bdss.tests.test_bdss_application module
+---------------------------------------------
+
+.. automodule:: force_bdss.tests.test_bdss_application
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 force_bdss.tests.test_bundle_registry_plugin module
 ---------------------------------------------------