diff --git a/force_bdss/core_plugins/test_mco/__init__.py b/force_bdss/core_plugins/test_mco/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/force_bdss/core_plugins/test_mco/basic/__init__.py b/force_bdss/core_plugins/test_mco/basic/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/force_bdss/mco/basic_bundle.py b/force_bdss/core_plugins/test_mco/basic/basic_bundle.py
similarity index 84%
rename from force_bdss/mco/basic_bundle.py
rename to force_bdss/core_plugins/test_mco/basic/basic_bundle.py
index a673f316b0bed910cd0ce58b69e64b984cfe9470..a8aa0bd25fa6fd42e27ba8547f4bb906693e8c3f 100644
--- a/force_bdss/mco/basic_bundle.py
+++ b/force_bdss/core_plugins/test_mco/basic/basic_bundle.py
@@ -1,7 +1,8 @@
 from traits.has_traits import HasStrictTraits, provides
 from traits.trait_types import String
 
-from .i_multi_criteria_optimizer_bundle import IMultiCriteriaOptimizerBundle
+from force_bdss.mco.i_multi_criteria_optimizer_bundle import (
+    IMultiCriteriaOptimizerBundle)
 from .basic_model import BasicModel
 from .basic_optimizer import BasicOptimizer
 
diff --git a/force_bdss/mco/basic_model.py b/force_bdss/core_plugins/test_mco/basic/basic_model.py
similarity index 100%
rename from force_bdss/mco/basic_model.py
rename to force_bdss/core_plugins/test_mco/basic/basic_model.py
diff --git a/force_bdss/mco/basic_optimizer.py b/force_bdss/core_plugins/test_mco/basic/basic_optimizer.py
similarity index 83%
rename from force_bdss/mco/basic_optimizer.py
rename to force_bdss/core_plugins/test_mco/basic/basic_optimizer.py
index cc7477a8f4a253db1fd3e3a709796d325588e6b6..7a4f1ed27c11b3db0a9a56b1e1a8a0c222610913 100644
--- a/force_bdss/mco/basic_optimizer.py
+++ b/force_bdss/core_plugins/test_mco/basic/basic_optimizer.py
@@ -1,8 +1,9 @@
 import subprocess
 import sys
 
-from force_bdss.mco.base_multi_criteria_optimizer import \
+from force_bdss.mco.base_multi_criteria_optimizer import (
     BaseMultiCriteriaOptimizer
+)
 
 
 class BasicOptimizer(BaseMultiCriteriaOptimizer):
diff --git a/force_bdss/core_plugins/test_mco/dakota/__init__.py b/force_bdss/core_plugins/test_mco/dakota/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/force_bdss/mco/dakota_bundle.py b/force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py
similarity index 70%
rename from force_bdss/mco/dakota_bundle.py
rename to force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py
index 1ad413bd98a4ee40f7c49c8f38811ec5d5c4b1ed..dd0ef08d38b7daafdf8ff552af3348fab81ae44d 100644
--- a/force_bdss/mco/dakota_bundle.py
+++ b/force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py
@@ -1,9 +1,11 @@
 from traits.has_traits import HasStrictTraits, provides
 from traits.trait_types import String
 
-from force_bdss.mco.dakota_optimizer import DakotaOptimizer
-from force_bdss.mco.dakota_model import DakotaModel
-from .i_multi_criteria_optimizer_bundle import IMultiCriteriaOptimizerBundle
+from force_bdss.mco.i_multi_criteria_optimizer_bundle import (
+    IMultiCriteriaOptimizerBundle)
+
+from .dakota_model import DakotaModel
+from .dakota_optimizer import DakotaOptimizer
 
 
 @provides(IMultiCriteriaOptimizerBundle)
diff --git a/force_bdss/mco/dakota_model.py b/force_bdss/core_plugins/test_mco/dakota/dakota_model.py
similarity index 70%
rename from force_bdss/mco/dakota_model.py
rename to force_bdss/core_plugins/test_mco/dakota/dakota_model.py
index 76b572f07a393d4b8b8ed93c0ce101c0927338cf..ed6ff342dfdd8c2ee8742ba32f86808cb8f82582 100644
--- a/force_bdss/mco/dakota_model.py
+++ b/force_bdss/core_plugins/test_mco/dakota/dakota_model.py
@@ -1,4 +1,4 @@
-from traits.has_traits import HasStrictTraits
+from traits.api import HasStrictTraits
 
 
 class DakotaModel(HasStrictTraits):
diff --git a/force_bdss/mco/dakota_optimizer.py b/force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py
similarity index 83%
rename from force_bdss/mco/dakota_optimizer.py
rename to force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py
index dc805322137ed238dbae885e28d634944469198f..0f8f064cc985e2afdb6fc99765f42596ae49cece 100644
--- a/force_bdss/mco/dakota_optimizer.py
+++ b/force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py
@@ -2,8 +2,9 @@ import subprocess
 
 import sys
 
-from force_bdss.mco.base_multi_criteria_optimizer import \
+from force_bdss.mco.base_multi_criteria_optimizer import (
     BaseMultiCriteriaOptimizer
+)
 
 
 class DakotaOptimizer(BaseMultiCriteriaOptimizer):
diff --git a/force_bdss/mco/multi_criteria_optimizers_plugin.py b/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py
similarity index 74%
rename from force_bdss/mco/multi_criteria_optimizers_plugin.py
rename to force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py
index 55095a26a273597731fb8790f95539058602e492..6976cdb7a9009361b2f3f9d97dd7fc2c4b4c3865 100644
--- a/force_bdss/mco/multi_criteria_optimizers_plugin.py
+++ b/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py
@@ -1,10 +1,11 @@
 from envisage.plugin import Plugin
 from traits.api import List
 
-from .i_multi_criteria_optimizer_bundle import (
+from force_bdss.mco.i_multi_criteria_optimizer_bundle import (
     IMultiCriteriaOptimizerBundle)
-from .dakota_bundle import DakotaBundle
-from .basic_bundle import BasicBundle
+
+from .basic.basic_bundle import BasicBundle
+from .dakota.dakota_bundle import DakotaBundle
 
 
 class MultiCriteriaOptimizersPlugin(Plugin):
diff --git a/setup.py b/setup.py
index 7eeb17c9c0930cebe4ab99c6a8e0f30700959698..3fedf2d5f24ff17e12009e03a305ed6b1b6fd373 100644
--- a/setup.py
+++ b/setup.py
@@ -10,11 +10,8 @@ setup(
             'force_bdss = force_bdss.cli.force_bdss:run',
         ],
         "force.bdss.extensions": [
-            "mco = force_bdss.mco.multi_criteria_optimizers_plugin:"
-            "MultiCriteriaOptimizersPlugin",
-            "data_source = force_bdss.core_plugins."
-            "test_data_sources.data_sources_plugin:"
-            "DataSourcesPlugin",
+            "mco = force_bdss.core_plugins.test_mco.multi_criteria_optimizers_plugin:MultiCriteriaOptimizersPlugin",
+            "data_source = force_bdss.core_plugins.test_data_sources.data_sources_plugin:DataSourcesPlugin",
         ]
     },
     packages=find_packages(),