diff --git a/doc/source/api/force_bdss.core.rst b/doc/source/api/force_bdss.core.rst
new file mode 100644
index 0000000000000000000000000000000000000000..cea914b156f4b8b33dfae0873af5c7717b4459c4
--- /dev/null
+++ b/doc/source/api/force_bdss.core.rst
@@ -0,0 +1,29 @@
+force_bdss.core package
+=======================
+
+Subpackages
+-----------
+
+.. toctree::
+
+    force_bdss.core.tests
+
+Submodules
+----------
+
+force_bdss.core.data_value module
+---------------------------------
+
+.. automodule:: force_bdss.core.data_value
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core.tests.rst b/doc/source/api/force_bdss.core.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..f5a4f039275b34034015e50ea5cbefd3668b53cd
--- /dev/null
+++ b/doc/source/api/force_bdss.core.tests.rst
@@ -0,0 +1,22 @@
+force_bdss.core.tests package
+=============================
+
+Submodules
+----------
+
+force_bdss.core.tests.test_data_value module
+--------------------------------------------
+
+.. automodule:: force_bdss.core.tests.test_data_value
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core.tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/api/force_bdss.data_sources.rst b/doc/source/api/force_bdss.data_sources.rst
index 7df2d7d82a4fc847ade8719b3c338e4fb4c3b04c..0d7330fb60412b83b9723f41098044db8536f0d3 100644
--- a/doc/source/api/force_bdss.data_sources.rst
+++ b/doc/source/api/force_bdss.data_sources.rst
@@ -35,22 +35,6 @@ force_bdss.data_sources.base_data_source_model module
     :undoc-members:
     :show-inheritance:
 
-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
--------------------------------------------------
-
-.. automodule:: force_bdss.data_sources.data_source_result
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 force_bdss.data_sources.i_data_source_bundle module
 ---------------------------------------------------
 
diff --git a/doc/source/api/force_bdss.kpi.rst b/doc/source/api/force_bdss.kpi.rst
index b90b1b5f07e1e7e428de41c12bfe88cb58abd4c6..55b751599bfeada834e14115e197c0aef1f07799 100644
--- a/doc/source/api/force_bdss.kpi.rst
+++ b/doc/source/api/force_bdss.kpi.rst
@@ -43,14 +43,6 @@ force_bdss.kpi.i_kpi_calculator_bundle module
     :undoc-members:
     :show-inheritance:
 
-force_bdss.kpi.kpi_calculator_result module
--------------------------------------------
-
-.. automodule:: force_bdss.kpi.kpi_calculator_result
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 
 Module contents
 ---------------
diff --git a/doc/source/api/force_bdss.rst b/doc/source/api/force_bdss.rst
index e558a1c921e3a3b557f6ccb205fb8f9349659589..701918cf76cd195ac1a42069d1023550e85a91d9 100644
--- a/doc/source/api/force_bdss.rst
+++ b/doc/source/api/force_bdss.rst
@@ -7,6 +7,7 @@ Subpackages
 .. toctree::
 
     force_bdss.cli
+    force_bdss.core
     force_bdss.core_plugins
     force_bdss.data_sources
     force_bdss.io