diff --git a/doc/source/api/force_bdss.cli.rst b/doc/source/api/force_bdss.cli.rst
index c96292e6712e3cb76369b1c4c59ddfe58c7c3e3f..c6f155feae77f2f4ef9f45341a29ee927b931f5e 100644
--- a/doc/source/api/force_bdss.cli.rst
+++ b/doc/source/api/force_bdss.cli.rst
@@ -1,5 +1,5 @@
-force_bdss.cli package
-======================
+force\_bdss\.cli package
+========================
 
 Subpackages
 -----------
@@ -11,8 +11,8 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.cli.force_bdss module
---------------------------------
+force\_bdss\.cli\.force\_bdss module
+------------------------------------
 
 .. automodule:: force_bdss.cli.force_bdss
     :members:
diff --git a/doc/source/api/force_bdss.cli.tests.rst b/doc/source/api/force_bdss.cli.tests.rst
index 5fef4d6bb9516d1e822af0255e1b311b0b77ea98..207d9516f942c774bf349ac8a91ec55c4f5807ca 100644
--- a/doc/source/api/force_bdss.cli.tests.rst
+++ b/doc/source/api/force_bdss.cli.tests.rst
@@ -1,11 +1,11 @@
-force_bdss.cli.tests package
-============================
+force\_bdss\.cli\.tests package
+===============================
 
 Submodules
 ----------
 
-force_bdss.cli.tests.test_execution module
-------------------------------------------
+force\_bdss\.cli\.tests\.test\_execution module
+-----------------------------------------------
 
 .. automodule:: force_bdss.cli.tests.test_execution
     :members:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.rst b/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.rst
index 7ec4b2b1d243ecb8fc04c04497b4121bc34ed3f3..9ae598589c9d83a01f695595f72b5065774f8ce1 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.rst
@@ -1,27 +1,34 @@
-force_bdss.core_plugins.dummy.csv_extractor package
-===================================================
+force\_bdss\.core\_plugins\.dummy\.csv\_extractor package
+=========================================================
+
+Subpackages
+-----------
+
+.. toctree::
+
+    force_bdss.core_plugins.dummy.csv_extractor.tests
 
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_bundle module
------------------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.csv\_extractor\.csv\_extractor\_bundle module
+--------------------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_bundle
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_data_source module
-----------------------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.csv\_extractor\.csv\_extractor\_data\_source module
+--------------------------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_data_source
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_model module
-----------------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.csv\_extractor\.csv\_extractor\_model module
+-------------------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.csv_extractor.csv_extractor_model
     :members:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..95ab6ce85eadac258e92d3e68dcd65ced13d2c6a
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.csv_extractor.tests.rst
@@ -0,0 +1,30 @@
+force\_bdss\.core\_plugins\.dummy\.csv\_extractor\.tests package
+================================================================
+
+Submodules
+----------
+
+force\_bdss\.core\_plugins\.dummy\.csv\_extractor\.tests\.test\_csv\_extractor\_bundle module
+---------------------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_bundle
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force\_bdss\.core\_plugins\.dummy\.csv\_extractor\.tests\.test\_csv\_extractor\_data\_source module
+---------------------------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.tests.test_csv_extractor_data_source
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy.csv_extractor.tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.rst
index 2745070d829bff45eb8b4b0d34dd2627a2b68083..9ddaee43284dbe56e934bebb16764fedecda5d81 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.rst
@@ -1,35 +1,42 @@
-force_bdss.core_plugins.dummy.dummy_dakota package
-==================================================
+force\_bdss\.core\_plugins\.dummy\.dummy\_dakota package
+========================================================
+
+Subpackages
+-----------
+
+.. toctree::
+
+    force_bdss.core_plugins.dummy.dummy_dakota.tests
 
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.dummy_dakota.dakota_bundle module
----------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.dummy\_dakota\.dakota\_bundle module
+-----------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_bundle
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_dakota.dakota_communicator module
----------------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.dummy\_dakota\.dakota\_communicator module
+-----------------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_communicator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_dakota.dakota_model module
---------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.dummy\_dakota\.dakota\_model module
+----------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_model
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_dakota.dakota_optimizer module
-------------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.dummy\_dakota\.dakota\_optimizer module
+--------------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.dakota_optimizer
     :members:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..0e5975a08327f16be2155c9f947abeba04c6f669
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_dakota.tests.rst
@@ -0,0 +1,30 @@
+force\_bdss\.core\_plugins\.dummy\.dummy\_dakota\.tests package
+===============================================================
+
+Submodules
+----------
+
+force\_bdss\.core\_plugins\.dummy\.dummy\_dakota\.tests\.test\_dakota\_bundle module
+------------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_bundle
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force\_bdss\.core\_plugins\.dummy\.dummy\_dakota\.tests\.test\_dakota\_communicator module
+------------------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.tests.test_dakota_communicator
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_dakota.tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
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..da0f4ed38f1eafcdf6736cf1ffa7f3f736638b12
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.rst
@@ -0,0 +1,45 @@
+force\_bdss\.core\_plugins\.dummy\.dummy\_data\_source package
+==============================================================
+
+Subpackages
+-----------
+
+.. toctree::
+
+    force_bdss.core_plugins.dummy.dummy_data_source.tests
+
+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.dummy_data_source.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..a665a03f64f2c6d9d8011de225f1f9b8f05e7407
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_data_source.tests.rst
@@ -0,0 +1,30 @@
+force\_bdss\.core\_plugins\.dummy\.dummy\_data\_source\.tests package
+=====================================================================
+
+Submodules
+----------
+
+force\_bdss\.core\_plugins\.dummy\.dummy\_data\_source\.tests\.test\_dummy\_data\_source module
+-----------------------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.tests.test_dummy_data_source
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force\_bdss\.core\_plugins\.dummy\.dummy\_data\_source\.tests\.test\_dummy\_data\_source\_bundle module
+-------------------------------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.tests.test_dummy_data_source_bundle
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_data_source.tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.rst
index 4dde56d64e83459eba0472215ae60afae8bab801..5de1ecc908401be6fd36aedf61edafaa5cff6ea3 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.rst
@@ -1,27 +1,34 @@
-force_bdss.core_plugins.dummy.dummy_kpi_calculator package
-==========================================================
+force\_bdss\.core\_plugins\.dummy\.dummy\_kpi\_calculator package
+=================================================================
+
+Subpackages
+-----------
+
+.. toctree::
+
+    force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests
 
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator module
-------------------------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.dummy\_kpi\_calculator\.dummy\_kpi\_calculator module
+----------------------------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_bundle module
--------------------------------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.dummy\_kpi\_calculator\.dummy\_kpi\_calculator\_bundle module
+------------------------------------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_bundle
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_model module
-------------------------------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.dummy\_kpi\_calculator\.dummy\_kpi\_calculator\_model module
+-----------------------------------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.dummy_kpi_calculator_model
     :members:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..bf54bf5ede11330a2fc4bde99898cf22fc106e4b
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.rst
@@ -0,0 +1,22 @@
+force\_bdss\.core\_plugins\.dummy\.dummy\_kpi\_calculator\.tests package
+========================================================================
+
+Submodules
+----------
+
+force\_bdss\.core\_plugins\.dummy\.dummy\_kpi\_calculator\.tests\.test\_dummy\_kpi\_calculator\_bundle module
+-------------------------------------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests.test_dummy_kpi_calculator_bundle
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy.dummy_kpi_calculator.tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.rst b/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.rst
index 58c3acc608d06dec0a289a566d0d61b46bf6b2a1..ea4c2baf13eabbd5002ecbfd44d70aabac359fd5 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.rst
@@ -1,27 +1,34 @@
-force_bdss.core_plugins.dummy.kpi_adder package
-===============================================
+force\_bdss\.core\_plugins\.dummy\.kpi\_adder package
+=====================================================
+
+Subpackages
+-----------
+
+.. toctree::
+
+    force_bdss.core_plugins.dummy.kpi_adder.tests
 
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_bundle module
----------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.kpi\_adder\.kpi\_adder\_bundle module
+------------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_bundle
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_calculator module
--------------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.kpi\_adder\.kpi\_adder\_calculator module
+----------------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_calculator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_model module
---------------------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.kpi\_adder\.kpi\_adder\_model module
+-----------------------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.kpi_adder.kpi_adder_model
     :members:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..3937a7e155466d0c7e370c0ae4edaa0ea468dcb7
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.kpi_adder.tests.rst
@@ -0,0 +1,22 @@
+force\_bdss\.core\_plugins\.dummy\.kpi\_adder\.tests package
+============================================================
+
+Submodules
+----------
+
+force\_bdss\.core\_plugins\.dummy\.kpi\_adder\.tests\.test\_kpi\_adder\_bundle module
+-------------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.tests.test_kpi_adder_bundle
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy.kpi_adder.tests
+    :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..82b8d0273381e6db869689d1cdcc659bf260da2c 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.rst
@@ -1,5 +1,5 @@
-force_bdss.core_plugins.dummy package
-=====================================
+force\_bdss\.core\_plugins\.dummy package
+=========================================
 
 Subpackages
 -----------
@@ -8,14 +8,16 @@ 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
+    force_bdss.core_plugins.dummy.tests
 
 Submodules
 ----------
 
-force_bdss.core_plugins.dummy.dummy_plugin module
--------------------------------------------------
+force\_bdss\.core\_plugins\.dummy\.dummy\_plugin module
+-------------------------------------------------------
 
 .. automodule:: force_bdss.core_plugins.dummy.dummy_plugin
     :members:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..fbe318ae3b065e37dbcdfef4a6e2fe426183c0a7
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy.tests.rst
@@ -0,0 +1,30 @@
+force\_bdss\.core\_plugins\.dummy\.tests package
+================================================
+
+Submodules
+----------
+
+force\_bdss\.core\_plugins\.dummy\.tests\.data\_source\_bundle\_test\_mixin module
+----------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.tests.data_source_bundle_test_mixin
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force\_bdss\.core\_plugins\.dummy\.tests\.kpi\_calculator\_bundle\_test\_mixin module
+-------------------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.tests.kpi_calculator_bundle_test_mixin
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy.tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.rst b/doc/source/api/force_bdss.core_plugins.rst
index aabfada58813a84466b0ca4252d7d6277ad032df..d667de4d88ad1e3f3b4ee21977731d9091daad0b 100644
--- a/doc/source/api/force_bdss.core_plugins.rst
+++ b/doc/source/api/force_bdss.core_plugins.rst
@@ -1,5 +1,5 @@
-force_bdss.core_plugins package
-===============================
+force\_bdss\.core\_plugins package
+==================================
 
 Subpackages
 -----------
diff --git a/doc/source/api/force_bdss.data_sources.rst b/doc/source/api/force_bdss.data_sources.rst
index 7df2d7d82a4fc847ade8719b3c338e4fb4c3b04c..e5548091c1a73ff48d22001ed95eab727ddfb154 100644
--- a/doc/source/api/force_bdss.data_sources.rst
+++ b/doc/source/api/force_bdss.data_sources.rst
@@ -1,5 +1,5 @@
-force_bdss.data_sources package
-===============================
+force\_bdss\.data\_sources package
+==================================
 
 Subpackages
 -----------
@@ -11,48 +11,48 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.data_sources.base_data_source module
------------------------------------------------
+force\_bdss\.data\_sources\.base\_data\_source module
+-----------------------------------------------------
 
 .. automodule:: force_bdss.data_sources.base_data_source
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.data_sources.base_data_source_bundle module
-------------------------------------------------------
+force\_bdss\.data\_sources\.base\_data\_source\_bundle module
+-------------------------------------------------------------
 
 .. automodule:: force_bdss.data_sources.base_data_source_bundle
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.data_sources.base_data_source_model module
------------------------------------------------------
+force\_bdss\.data\_sources\.base\_data\_source\_model module
+------------------------------------------------------------
 
 .. automodule:: force_bdss.data_sources.base_data_source_model
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.data_sources.data_source_parameters module
------------------------------------------------------
+force\_bdss\.data\_sources\.data\_source\_parameters module
+-----------------------------------------------------------
 
 .. automodule:: force_bdss.data_sources.data_source_parameters
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.data_sources.data_source_result module
--------------------------------------------------
+force\_bdss\.data\_sources\.data\_source\_result module
+-------------------------------------------------------
 
 .. automodule:: force_bdss.data_sources.data_source_result
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.data_sources.i_data_source_bundle module
----------------------------------------------------
+force\_bdss\.data\_sources\.i\_data\_source\_bundle module
+----------------------------------------------------------
 
 .. automodule:: force_bdss.data_sources.i_data_source_bundle
     :members:
diff --git a/doc/source/api/force_bdss.data_sources.tests.rst b/doc/source/api/force_bdss.data_sources.tests.rst
index 067997cbdb5e09e2db0e7b93d0aa7f87d3082e40..2b9563c0d99b6b04af56263f10eb83e968312357 100644
--- a/doc/source/api/force_bdss.data_sources.tests.rst
+++ b/doc/source/api/force_bdss.data_sources.tests.rst
@@ -1,19 +1,19 @@
-force_bdss.data_sources.tests package
-=====================================
+force\_bdss\.data\_sources\.tests package
+=========================================
 
 Submodules
 ----------
 
-force_bdss.data_sources.tests.test_base_data_source module
-----------------------------------------------------------
+force\_bdss\.data\_sources\.tests\.test\_base\_data\_source module
+------------------------------------------------------------------
 
 .. automodule:: force_bdss.data_sources.tests.test_base_data_source
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.data_sources.tests.test_base_data_source_bundle module
------------------------------------------------------------------
+force\_bdss\.data\_sources\.tests\.test\_base\_data\_source\_bundle module
+--------------------------------------------------------------------------
 
 .. automodule:: force_bdss.data_sources.tests.test_base_data_source_bundle
     :members:
diff --git a/doc/source/api/force_bdss.io.rst b/doc/source/api/force_bdss.io.rst
index c221828e07ac581f86f7948193842a228c018dca..558ecbe7027e6a1f7dac11c92b973a6c3111e9f3 100644
--- a/doc/source/api/force_bdss.io.rst
+++ b/doc/source/api/force_bdss.io.rst
@@ -1,5 +1,5 @@
-force_bdss.io package
-=====================
+force\_bdss\.io package
+=======================
 
 Subpackages
 -----------
@@ -11,16 +11,16 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.io.workflow_reader module
-------------------------------------
+force\_bdss\.io\.workflow\_reader module
+----------------------------------------
 
 .. automodule:: force_bdss.io.workflow_reader
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.io.workflow_writer module
-------------------------------------
+force\_bdss\.io\.workflow\_writer module
+----------------------------------------
 
 .. automodule:: force_bdss.io.workflow_writer
     :members:
diff --git a/doc/source/api/force_bdss.io.tests.rst b/doc/source/api/force_bdss.io.tests.rst
index d7512c8f927552c173fa291b1f2958b696207c95..7a53ccef1f9275f7ef794f7d0fe3d73f45445cef 100644
--- a/doc/source/api/force_bdss.io.tests.rst
+++ b/doc/source/api/force_bdss.io.tests.rst
@@ -1,19 +1,19 @@
-force_bdss.io.tests package
-===========================
+force\_bdss\.io\.tests package
+==============================
 
 Submodules
 ----------
 
-force_bdss.io.tests.test_workflow_reader module
------------------------------------------------
+force\_bdss\.io\.tests\.test\_workflow\_reader module
+-----------------------------------------------------
 
 .. automodule:: force_bdss.io.tests.test_workflow_reader
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.io.tests.test_workflow_writer module
------------------------------------------------
+force\_bdss\.io\.tests\.test\_workflow\_writer module
+-----------------------------------------------------
 
 .. automodule:: force_bdss.io.tests.test_workflow_writer
     :members:
diff --git a/doc/source/api/force_bdss.kpi.rst b/doc/source/api/force_bdss.kpi.rst
index b90b1b5f07e1e7e428de41c12bfe88cb58abd4c6..c8c9a36153b11d6b8717c93cebc22f53675d1b0d 100644
--- a/doc/source/api/force_bdss.kpi.rst
+++ b/doc/source/api/force_bdss.kpi.rst
@@ -1,5 +1,5 @@
-force_bdss.kpi package
-======================
+force\_bdss\.kpi package
+========================
 
 Subpackages
 -----------
@@ -11,40 +11,40 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.kpi.base_kpi_calculator module
------------------------------------------
+force\_bdss\.kpi\.base\_kpi\_calculator module
+----------------------------------------------
 
 .. automodule:: force_bdss.kpi.base_kpi_calculator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.kpi.base_kpi_calculator_bundle module
-------------------------------------------------
+force\_bdss\.kpi\.base\_kpi\_calculator\_bundle module
+------------------------------------------------------
 
 .. automodule:: force_bdss.kpi.base_kpi_calculator_bundle
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.kpi.base_kpi_calculator_model module
------------------------------------------------
+force\_bdss\.kpi\.base\_kpi\_calculator\_model module
+-----------------------------------------------------
 
 .. automodule:: force_bdss.kpi.base_kpi_calculator_model
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.kpi.i_kpi_calculator_bundle module
----------------------------------------------
+force\_bdss\.kpi\.i\_kpi\_calculator\_bundle module
+---------------------------------------------------
 
 .. automodule:: force_bdss.kpi.i_kpi_calculator_bundle
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.kpi.kpi_calculator_result module
--------------------------------------------
+force\_bdss\.kpi\.kpi\_calculator\_result module
+------------------------------------------------
 
 .. automodule:: force_bdss.kpi.kpi_calculator_result
     :members:
diff --git a/doc/source/api/force_bdss.kpi.tests.rst b/doc/source/api/force_bdss.kpi.tests.rst
index 9c7eb6c4e91b36ebafe7b82c5da3f3dfa08efb20..e7a8126e235c8bac7bea84d12d09fc828949f4cf 100644
--- a/doc/source/api/force_bdss.kpi.tests.rst
+++ b/doc/source/api/force_bdss.kpi.tests.rst
@@ -1,19 +1,19 @@
-force_bdss.kpi.tests package
-============================
+force\_bdss\.kpi\.tests package
+===============================
 
 Submodules
 ----------
 
-force_bdss.kpi.tests.test_base_kpi_calculator module
-----------------------------------------------------
+force\_bdss\.kpi\.tests\.test\_base\_kpi\_calculator module
+-----------------------------------------------------------
 
 .. automodule:: force_bdss.kpi.tests.test_base_kpi_calculator
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.kpi.tests.test_base_kpi_calculator_bundle module
------------------------------------------------------------
+force\_bdss\.kpi\.tests\.test\_base\_kpi\_calculator\_bundle module
+-------------------------------------------------------------------
 
 .. automodule:: force_bdss.kpi.tests.test_base_kpi_calculator_bundle
     :members:
diff --git a/doc/source/api/force_bdss.mco.parameters.rst b/doc/source/api/force_bdss.mco.parameters.rst
index f289f438bb64123f0dff84ac4d30be8e342d72db..8bad9d2826fe41a48d1a6d9fec4562cb24aeaff1 100644
--- a/doc/source/api/force_bdss.mco.parameters.rst
+++ b/doc/source/api/force_bdss.mco.parameters.rst
@@ -1,5 +1,5 @@
-force_bdss.mco.parameters package
-=================================
+force\_bdss\.mco\.parameters package
+====================================
 
 Subpackages
 -----------
@@ -11,32 +11,32 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.mco.parameters.base_mco_parameter module
----------------------------------------------------
+force\_bdss\.mco\.parameters\.base\_mco\_parameter module
+---------------------------------------------------------
 
 .. automodule:: force_bdss.mco.parameters.base_mco_parameter
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.parameters.base_mco_parameter_factory module
------------------------------------------------------------
+force\_bdss\.mco\.parameters\.base\_mco\_parameter\_factory module
+------------------------------------------------------------------
 
 .. automodule:: force_bdss.mco.parameters.base_mco_parameter_factory
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.parameters.core_mco_parameters module
-----------------------------------------------------
+force\_bdss\.mco\.parameters\.core\_mco\_parameters module
+----------------------------------------------------------
 
 .. automodule:: force_bdss.mco.parameters.core_mco_parameters
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.parameters.mco_parameter_factory_registry module
----------------------------------------------------------------
+force\_bdss\.mco\.parameters\.mco\_parameter\_factory\_registry module
+----------------------------------------------------------------------
 
 .. automodule:: force_bdss.mco.parameters.mco_parameter_factory_registry
     :members:
diff --git a/doc/source/api/force_bdss.mco.parameters.tests.rst b/doc/source/api/force_bdss.mco.parameters.tests.rst
index 694cb158a833bfa1c3860bf12166bd71ab93788a..c8950c209dce89f496fed6cff8448b59c7a427db 100644
--- a/doc/source/api/force_bdss.mco.parameters.tests.rst
+++ b/doc/source/api/force_bdss.mco.parameters.tests.rst
@@ -1,35 +1,35 @@
-force_bdss.mco.parameters.tests package
-=======================================
+force\_bdss\.mco\.parameters\.tests package
+===========================================
 
 Submodules
 ----------
 
-force_bdss.mco.parameters.tests.test_base_mco_parameter module
---------------------------------------------------------------
+force\_bdss\.mco\.parameters\.tests\.test\_base\_mco\_parameter module
+----------------------------------------------------------------------
 
 .. automodule:: force_bdss.mco.parameters.tests.test_base_mco_parameter
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.parameters.tests.test_base_mco_parameter_factory module
-----------------------------------------------------------------------
+force\_bdss\.mco\.parameters\.tests\.test\_base\_mco\_parameter\_factory module
+-------------------------------------------------------------------------------
 
 .. automodule:: force_bdss.mco.parameters.tests.test_base_mco_parameter_factory
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.parameters.tests.test_core_mco_parameters module
----------------------------------------------------------------
+force\_bdss\.mco\.parameters\.tests\.test\_core\_mco\_parameters module
+-----------------------------------------------------------------------
 
 .. automodule:: force_bdss.mco.parameters.tests.test_core_mco_parameters
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.mco.parameters.tests.test_parameter_factory_registry module
-----------------------------------------------------------------------
+force\_bdss\.mco\.parameters\.tests\.test\_parameter\_factory\_registry module
+------------------------------------------------------------------------------
 
 .. automodule:: force_bdss.mco.parameters.tests.test_parameter_factory_registry
     :members:
diff --git a/doc/source/api/force_bdss.mco.rst b/doc/source/api/force_bdss.mco.rst
index 8b2a6e33dc0f4d464f7f10a9130d930f9ad53a85..ced0270689b083d478226aafd1faadbaf4cc7948 100644
--- a/doc/source/api/force_bdss.mco.rst
+++ b/doc/source/api/force_bdss.mco.rst
@@ -1,5 +1,5 @@
-force_bdss.mco package
-======================
+force\_bdss\.mco package
+========================
 
 Subpackages
 -----------
@@ -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..809ef692cabc2a883cb72b24e72b381c4eda9519 100644
--- a/doc/source/api/force_bdss.mco.tests.rst
+++ b/doc/source/api/force_bdss.mco.tests.rst
@@ -1,29 +1,29 @@
-force_bdss.mco.tests package
-============================
+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.rst b/doc/source/api/force_bdss.rst
index 2c20d8251c99292a472acb6d930a12ccf01d05d1..63a788a84fc979af8c0189b1a01fd682fde7b8b8 100644
--- a/doc/source/api/force_bdss.rst
+++ b/doc/source/api/force_bdss.rst
@@ -1,5 +1,5 @@
-force_bdss package
-==================
+force\_bdss package
+===================
 
 Subpackages
 -----------
@@ -18,64 +18,64 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.api module
----------------------
+force\_bdss\.api module
+-----------------------
 
 .. automodule:: force_bdss.api
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.base_core_driver module
-----------------------------------
+force\_bdss\.base\_core\_driver module
+--------------------------------------
 
 .. automodule:: force_bdss.base_core_driver
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.base_extension_plugin module
----------------------------------------
+force\_bdss\.base\_extension\_plugin module
+-------------------------------------------
 
 .. automodule:: force_bdss.base_extension_plugin
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.bdss_application module
-----------------------------------
+force\_bdss\.bdss\_application module
+-------------------------------------
 
 .. automodule:: force_bdss.bdss_application
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.bundle_registry_plugin module
-----------------------------------------
+force\_bdss\.bundle\_registry\_plugin module
+--------------------------------------------
 
 .. automodule:: force_bdss.bundle_registry_plugin
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_evaluation_driver module
-----------------------------------------
+force\_bdss\.core\_evaluation\_driver module
+--------------------------------------------
 
 .. automodule:: force_bdss.core_evaluation_driver
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.core_mco_driver module
----------------------------------
+force\_bdss\.core\_mco\_driver module
+-------------------------------------
 
 .. automodule:: force_bdss.core_mco_driver
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.ids module
----------------------
+force\_bdss\.ids module
+-----------------------
 
 .. automodule:: force_bdss.ids
     :members:
diff --git a/doc/source/api/force_bdss.tests.fixtures.rst b/doc/source/api/force_bdss.tests.fixtures.rst
index 67056f7ef65941c819e17e7abbf4756b4b11728a..3c0c12f86492d2ad5aec4a1d6e1753da47ba1084 100644
--- a/doc/source/api/force_bdss.tests.fixtures.rst
+++ b/doc/source/api/force_bdss.tests.fixtures.rst
@@ -1,5 +1,5 @@
-force_bdss.tests.fixtures package
-=================================
+force\_bdss\.tests\.fixtures package
+====================================
 
 Module contents
 ---------------
diff --git a/doc/source/api/force_bdss.tests.rst b/doc/source/api/force_bdss.tests.rst
index d78f9d359df54ee71bfe7a117a086d75f9719589..4aef3da6337e2cebefa955c7ab1e51be2ac02ec0 100644
--- a/doc/source/api/force_bdss.tests.rst
+++ b/doc/source/api/force_bdss.tests.rst
@@ -1,5 +1,5 @@
-force_bdss.tests package
-========================
+force\_bdss\.tests package
+==========================
 
 Subpackages
 -----------
@@ -11,16 +11,32 @@ Subpackages
 Submodules
 ----------
 
-force_bdss.tests.test_bundle_registry_plugin module
----------------------------------------------------
+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
+---------------------------------------------------------
 
 .. automodule:: force_bdss.tests.test_bundle_registry_plugin
     :members:
     :undoc-members:
     :show-inheritance:
 
-force_bdss.tests.test_id_generators module
-------------------------------------------
+force\_bdss\.tests\.test\_core\_evaluation\_driver module
+---------------------------------------------------------
+
+.. automodule:: force_bdss.tests.test_core_evaluation_driver
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force\_bdss\.tests\.test\_id\_generators module
+-----------------------------------------------
 
 .. automodule:: force_bdss.tests.test_id_generators
     :members:
diff --git a/doc/source/api/force_bdss.workspecs.rst b/doc/source/api/force_bdss.workspecs.rst
index 13fb1dc84f6905f6ae3cbdbb78d4ad0b48fd4c5a..d83f60e920cdaab28713ba0d8e036fe7db30fa13 100644
--- a/doc/source/api/force_bdss.workspecs.rst
+++ b/doc/source/api/force_bdss.workspecs.rst
@@ -1,11 +1,11 @@
-force_bdss.workspecs package
-============================
+force\_bdss\.workspecs package
+==============================
 
 Submodules
 ----------
 
-force_bdss.workspecs.workflow module
-------------------------------------
+force\_bdss\.workspecs\.workflow module
+---------------------------------------
 
 .. automodule:: force_bdss.workspecs.workflow
     :members: