diff --git a/doc/source/api/force_bdss.core.rst b/doc/source/api/force_bdss.core.rst
index 89bd45886bfbabc82466b81e93179d0262e24502..06471ee2f0ca55e0a9d5c5dee3c86e7ad7b5cf52 100644
--- a/doc/source/api/force_bdss.core.rst
+++ b/doc/source/api/force_bdss.core.rst
@@ -19,6 +19,14 @@ force_bdss.core.data_value module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.core.input_slot_map module
+-------------------------------------
+
+.. automodule:: force_bdss.core.input_slot_map
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 force_bdss.core.slot module
 ---------------------------
 
@@ -27,6 +35,14 @@ force_bdss.core.slot module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.core.workflow module
+-------------------------------
+
+.. automodule:: force_bdss.core.workflow
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------
diff --git a/doc/source/api/force_bdss.core.tests.rst b/doc/source/api/force_bdss.core.tests.rst
index ff19cc77edfec70f85fc762ea91d5c8ab71026d6..21f5407b36d8c3c59a44ed90e3ba23e1b68b8448 100644
--- a/doc/source/api/force_bdss.core.tests.rst
+++ b/doc/source/api/force_bdss.core.tests.rst
@@ -12,6 +12,14 @@ force_bdss.core.tests.test_data_value module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.core.tests.test_input_slot_map module
+------------------------------------------------
+
+.. automodule:: force_bdss.core.tests.test_input_slot_map
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 force_bdss.core.tests.test_slot module
 --------------------------------------
 
diff --git a/doc/source/api/force_bdss.core_plugins.dummy.tests.rst b/doc/source/api/force_bdss.core_plugins.dummy.tests.rst
index b20750e59689a67817f4bade9d9b5cca503aa9af..62d415bda34bce5ccd29614de5ba6673580cda08 100644
--- a/doc/source/api/force_bdss.core_plugins.dummy.tests.rst
+++ b/doc/source/api/force_bdss.core_plugins.dummy.tests.rst
@@ -20,6 +20,14 @@ force_bdss.core_plugins.dummy.tests.kpi_calculator_bundle_test_mixin module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.core_plugins.dummy.tests.test_direct_execution module
+----------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy.tests.test_direct_execution
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------
diff --git a/doc/source/api/force_bdss.data_sources.tests.rst b/doc/source/api/force_bdss.data_sources.tests.rst
index 067997cbdb5e09e2db0e7b93d0aa7f87d3082e40..7e3cc42616275ffc306d47b5deccba358e3ddfae 100644
--- a/doc/source/api/force_bdss.data_sources.tests.rst
+++ b/doc/source/api/force_bdss.data_sources.tests.rst
@@ -20,6 +20,14 @@ force_bdss.data_sources.tests.test_base_data_source_bundle module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.data_sources.tests.test_base_data_source_model module
+----------------------------------------------------------------
+
+.. automodule:: force_bdss.data_sources.tests.test_base_data_source_model
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------
diff --git a/doc/source/api/force_bdss.kpi.tests.rst b/doc/source/api/force_bdss.kpi.tests.rst
index 9c7eb6c4e91b36ebafe7b82c5da3f3dfa08efb20..96c191623081ab254267fe0e4fab43df8b63de66 100644
--- a/doc/source/api/force_bdss.kpi.tests.rst
+++ b/doc/source/api/force_bdss.kpi.tests.rst
@@ -20,6 +20,14 @@ force_bdss.kpi.tests.test_base_kpi_calculator_bundle module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.kpi.tests.test_base_kpi_calculator_model module
+----------------------------------------------------------
+
+.. automodule:: force_bdss.kpi.tests.test_base_kpi_calculator_model
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------
diff --git a/doc/source/api/force_bdss.rst b/doc/source/api/force_bdss.rst
index 701918cf76cd195ac1a42069d1023550e85a91d9..6d71a20103c8f9654c5945b43c271cc403f66549 100644
--- a/doc/source/api/force_bdss.rst
+++ b/doc/source/api/force_bdss.rst
@@ -14,7 +14,6 @@ Subpackages
     force_bdss.kpi
     force_bdss.mco
     force_bdss.tests
-    force_bdss.workspecs
 
 Submodules
 ----------
@@ -83,6 +82,14 @@ force_bdss.ids module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.local_traits module
+------------------------------
+
+.. automodule:: force_bdss.local_traits
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 force_bdss.version module
 -------------------------
 
diff --git a/doc/source/api/force_bdss.tests.rst b/doc/source/api/force_bdss.tests.rst
index 3f6641aec683b4a9df907c93aed68093123e0b50..67e8a0a030b89259487618e57a8ba36557186aa0 100644
--- a/doc/source/api/force_bdss.tests.rst
+++ b/doc/source/api/force_bdss.tests.rst
@@ -43,6 +43,14 @@ force_bdss.tests.test_ids module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.tests.test_local_traits module
+-----------------------------------------
+
+.. automodule:: force_bdss.tests.test_local_traits
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------
diff --git a/doc/source/api/force_bdss.workspecs.rst b/doc/source/api/force_bdss.workspecs.rst
deleted file mode 100644
index 13fb1dc84f6905f6ae3cbdbb78d4ad0b48fd4c5a..0000000000000000000000000000000000000000
--- a/doc/source/api/force_bdss.workspecs.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-force_bdss.workspecs package
-============================
-
-Submodules
-----------
-
-force_bdss.workspecs.workflow module
-------------------------------------
-
-.. automodule:: force_bdss.workspecs.workflow
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: force_bdss.workspecs
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/force_bdss/base_core_driver.py b/force_bdss/base_core_driver.py
index 45b1f2265f1811adf1c1351f79fc0069c6430db4..2b34ddb6a6ffb616482ff2036e4aab3c6223b4d8 100644
--- a/force_bdss/base_core_driver.py
+++ b/force_bdss/base_core_driver.py
@@ -1,12 +1,12 @@
 from envisage.plugin import Plugin
 from traits.trait_types import Instance
 
+from .core.workflow import Workflow
 from .bundle_registry_plugin import (
     BundleRegistryPlugin,
     BUNDLE_REGISTRY_PLUGIN_ID
 )
 from .io.workflow_reader import WorkflowReader
-from .workspecs.workflow import Workflow
 
 
 class BaseCoreDriver(Plugin):
diff --git a/force_bdss/workspecs/workflow.py b/force_bdss/core/workflow.py
similarity index 73%
rename from force_bdss/workspecs/workflow.py
rename to force_bdss/core/workflow.py
index 0d709470de43a758da4efb87aaaa9f18fee5655d..34032b98b31e01ee4d0abc05aef128b9d6acb5ed 100644
--- a/force_bdss/workspecs/workflow.py
+++ b/force_bdss/core/workflow.py
@@ -1,8 +1,8 @@
 from traits.api import HasStrictTraits, Instance, List
 
-from ..data_sources.base_data_source_model import BaseDataSourceModel
-from ..kpi.base_kpi_calculator_model import BaseKPICalculatorModel
-from ..mco.base_mco_model import BaseMCOModel
+from force_bdss.data_sources.base_data_source_model import BaseDataSourceModel
+from force_bdss.kpi.base_kpi_calculator_model import BaseKPICalculatorModel
+from force_bdss.mco.base_mco_model import BaseMCOModel
 
 
 class Workflow(HasStrictTraits):
diff --git a/force_bdss/io/tests/test_workflow_writer.py b/force_bdss/io/tests/test_workflow_writer.py
index 4ce0b2ac974af878e5369d7efbde3bdaa81c0152..0dc1397d8c0a4c0dcbaf4df7c91cccac22b02a46 100644
--- a/force_bdss/io/tests/test_workflow_writer.py
+++ b/force_bdss/io/tests/test_workflow_writer.py
@@ -1,5 +1,6 @@
-import unittest
 import json
+import unittest
+
 from six import StringIO
 
 from force_bdss.bundle_registry_plugin import BundleRegistryPlugin
@@ -17,7 +18,7 @@ from force_bdss.ids import bundle_id, mco_parameter_id
 from force_bdss.io.workflow_writer import WorkflowWriter
 from force_bdss.mco.base_mco_model import BaseMCOModel
 from force_bdss.mco.i_mco_bundle import IMCOBundle
-from force_bdss.workspecs.workflow import Workflow
+from force_bdss.core.workflow import Workflow
 
 
 class TestWorkflowWriter(unittest.TestCase):
diff --git a/force_bdss/io/workflow_reader.py b/force_bdss/io/workflow_reader.py
index c55536ba8343d4bf19efc5c69b223e205a72b399..d82c917440ebdbc5afe3fd8bbe7f39b48191a27b 100644
--- a/force_bdss/io/workflow_reader.py
+++ b/force_bdss/io/workflow_reader.py
@@ -4,8 +4,8 @@ import logging
 from traits.api import HasStrictTraits, Instance
 
 from force_bdss.core.input_slot_map import InputSlotMap
+from force_bdss.core.workflow import Workflow
 from ..bundle_registry_plugin import BundleRegistryPlugin
-from ..workspecs.workflow import Workflow
 
 SUPPORTED_FILE_VERSIONS = ["1"]
 
diff --git a/force_bdss/workspecs/__init__.py b/force_bdss/workspecs/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000