diff --git a/force_bdss/core_plugins/__init__.py b/force_bdss/core_plugins/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/force_bdss/core_plugins/test_data_sources/__init__.py b/force_bdss/core_plugins/test_data_sources/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/force_bdss/core_plugins/test_data_sources/basic/__init__.py b/force_bdss/core_plugins/test_data_sources/basic/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/force_bdss/data_sources/basic_bundle.py b/force_bdss/core_plugins/test_data_sources/basic/basic_bundle.py
similarity index 79%
rename from force_bdss/data_sources/basic_bundle.py
rename to force_bdss/core_plugins/test_data_sources/basic/basic_bundle.py
index a0764c4fbdbeaee01980c3a0034e69b1e8a9538d..8a99792da4ba9ef207841b5aa2c39e9d4b918e5b 100644
--- a/force_bdss/data_sources/basic_bundle.py
+++ b/force_bdss/core_plugins/test_data_sources/basic/basic_bundle.py
@@ -1,8 +1,9 @@
 from traits.api import provides, HasStrictTraits, String
 
-from force_bdss.data_sources.basic_data_source import BasicDataSource
 from force_bdss.data_sources.i_data_source_bundle import IDataSourceBundle
-from force_bdss.mco.basic_model import BasicModel
+
+from .basic_model import BasicModel
+from .basic_data_source import BasicDataSource
 
 
 @provides(IDataSourceBundle)
diff --git a/force_bdss/data_sources/basic_data_source.py b/force_bdss/core_plugins/test_data_sources/basic/basic_data_source.py
similarity index 100%
rename from force_bdss/data_sources/basic_data_source.py
rename to force_bdss/core_plugins/test_data_sources/basic/basic_data_source.py
diff --git a/force_bdss/data_sources/basic_model.py b/force_bdss/core_plugins/test_data_sources/basic/basic_model.py
similarity index 100%
rename from force_bdss/data_sources/basic_model.py
rename to force_bdss/core_plugins/test_data_sources/basic/basic_model.py
diff --git a/force_bdss/data_sources/data_sources_plugin.py b/force_bdss/core_plugins/test_data_sources/data_sources_plugin.py
similarity index 61%
rename from force_bdss/data_sources/data_sources_plugin.py
rename to force_bdss/core_plugins/test_data_sources/data_sources_plugin.py
index 85c2b1affc79a56ec1546aa14ebe592c6159417b..9960da34aeea3f79a2987c20401d0c1d9c0b712e 100644
--- a/force_bdss/data_sources/data_sources_plugin.py
+++ b/force_bdss/core_plugins/test_data_sources/data_sources_plugin.py
@@ -1,10 +1,11 @@
 from envisage.plugin import Plugin
 from traits.api import List
 
-from force_bdss.data_sources.basic_bundle import BasicBundle
-from force_bdss.data_sources.price_bundle import PriceBundle
-from force_bdss.data_sources.viscosity_bundle import ViscosityBundle
-from .i_data_source_bundle import IDataSourceBundle
+from force_bdss.data_sources.i_data_source_bundle import IDataSourceBundle
+
+from .basic.basic_bundle import BasicBundle
+from .price.price_bundle import PriceBundle
+from .viscosity.viscosity_bundle import ViscosityBundle
 
 
 class DataSourcesPlugin(Plugin):
diff --git a/force_bdss/core_plugins/test_data_sources/price/__init__.py b/force_bdss/core_plugins/test_data_sources/price/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/force_bdss/data_sources/price_bundle.py b/force_bdss/core_plugins/test_data_sources/price/price_bundle.py
similarity index 79%
rename from force_bdss/data_sources/price_bundle.py
rename to force_bdss/core_plugins/test_data_sources/price/price_bundle.py
index 7067d1aaa1f711a897fa76b181c7a0bc2c764841..2721ee27bf5aa836adaa22b864eff4ec99b3ac51 100644
--- a/force_bdss/data_sources/price_bundle.py
+++ b/force_bdss/core_plugins/test_data_sources/price/price_bundle.py
@@ -2,8 +2,9 @@ from traits.api import provides, HasStrictTraits
 from traits.trait_types import String
 
 from force_bdss.data_sources.i_data_source_bundle import IDataSourceBundle
-from force_bdss.data_sources.price_data_source import PriceDataSource
-from force_bdss.data_sources.price_model import PriceModel
+
+from .price_model import PriceModel
+from .price_data_source import PriceDataSource
 
 
 @provides(IDataSourceBundle)
diff --git a/force_bdss/data_sources/price_data_source.py b/force_bdss/core_plugins/test_data_sources/price/price_data_source.py
similarity index 100%
rename from force_bdss/data_sources/price_data_source.py
rename to force_bdss/core_plugins/test_data_sources/price/price_data_source.py
diff --git a/force_bdss/data_sources/price_model.py b/force_bdss/core_plugins/test_data_sources/price/price_model.py
similarity index 100%
rename from force_bdss/data_sources/price_model.py
rename to force_bdss/core_plugins/test_data_sources/price/price_model.py
diff --git a/force_bdss/core_plugins/test_data_sources/viscosity/__init__.py b/force_bdss/core_plugins/test_data_sources/viscosity/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/force_bdss/data_sources/viscosity_bundle.py b/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_bundle.py
similarity index 66%
rename from force_bdss/data_sources/viscosity_bundle.py
rename to force_bdss/core_plugins/test_data_sources/viscosity/viscosity_bundle.py
index c338a98fde569a9112e67d850ed354ee15eaca85..6b05b062b6f1d7ad9e54cc515a665d5c26ba24cf 100644
--- a/force_bdss/data_sources/viscosity_bundle.py
+++ b/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_bundle.py
@@ -1,9 +1,9 @@
-from traits.api import provides, HasStrictTraits
-from traits.trait_types import String
+from traits.api import provides, HasStrictTraits, String
+
+from force_bdss.data_sources.i_data_source_bundle import IDataSourceBundle
 
-from force_bdss.data_sources.viscosity_model import ViscosityModel
-from .i_data_source_bundle import IDataSourceBundle
 from .viscosity_data_source import ViscosityDataSource
+from .viscosity_model import ViscosityModel
 
 
 @provides(IDataSourceBundle)
diff --git a/force_bdss/data_sources/viscosity_data_source.py b/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_data_source.py
similarity index 100%
rename from force_bdss/data_sources/viscosity_data_source.py
rename to force_bdss/core_plugins/test_data_sources/viscosity/viscosity_data_source.py
diff --git a/force_bdss/data_sources/viscosity_model.py b/force_bdss/core_plugins/test_data_sources/viscosity/viscosity_model.py
similarity index 100%
rename from force_bdss/data_sources/viscosity_model.py
rename to force_bdss/core_plugins/test_data_sources/viscosity/viscosity_model.py
diff --git a/setup.py b/setup.py
index 3105683964a7547fbc519e7653da1a57fcd63855..7eeb17c9c0930cebe4ab99c6a8e0f30700959698 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,8 @@ setup(
         "force.bdss.extensions": [
             "mco = force_bdss.mco.multi_criteria_optimizers_plugin:"
             "MultiCriteriaOptimizersPlugin",
-            "data_source = force_bdss.data_sources.data_sources_plugin:"
+            "data_source = force_bdss.core_plugins."
+            "test_data_sources.data_sources_plugin:"
             "DataSourcesPlugin",
         ]
     },