diff --git a/force_bdss/cli/force_bdss.py b/force_bdss/cli/force_bdss.py
index 20e1a6eacfc3d0d7508ca5d11f804e9aeab9d412..37541e66f1d1132406392ab73c66da41d0779870 100644
--- a/force_bdss/cli/force_bdss.py
+++ b/force_bdss/cli/force_bdss.py
@@ -1,13 +1,12 @@
 import click
 from envisage.core_plugin import CorePlugin
-import logging
 
 from force_bdss.bdss_application import BDSSApplication
 from force_bdss.core_mco_driver import CoreMCODriver
-from force_bdss.multi_criteria_optimizers_plugin import \
-    MultiCriteriaOptimizersPlugin
-from force_bdss.key_performance_calculators_plugin import \
+from force_bdss.kpi.key_performance_calculators_plugin import \
     KeyPerformanceCalculatorsPlugin
+from force_bdss.mco.multi_criteria_optimizers_plugin import \
+    MultiCriteriaOptimizersPlugin
 
 
 @click.command()
diff --git a/force_bdss/core_mco_driver.py b/force_bdss/core_mco_driver.py
index ef1f392966abf8d1dc652040a2785de7804d7571..c3625fc4ce8e064ab2f21e5b17c66b24e1d97e88 100644
--- a/force_bdss/core_mco_driver.py
+++ b/force_bdss/core_mco_driver.py
@@ -3,8 +3,8 @@ from envisage.plugin import Plugin
 from traits.has_traits import on_trait_change
 from traits.trait_types import List
 
-from force_bdss.i_key_performance_calculator import IKeyPerformanceCalculator
-from force_bdss.i_multi_criteria_optimizers import IMultiCriteriaOptimizer
+from force_bdss.kpi.i_key_performance_calculator import IKeyPerformanceCalculator
+from force_bdss.mco.i_multi_criteria_optimizers import IMultiCriteriaOptimizer
 
 
 class CoreMCODriver(Plugin):
diff --git a/force_bdss/kpi/__init__.py b/force_bdss/kpi/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/force_bdss/basic_key_performance_calculator.py b/force_bdss/kpi/basic_key_performance_calculator.py
similarity index 75%
rename from force_bdss/basic_key_performance_calculator.py
rename to force_bdss/kpi/basic_key_performance_calculator.py
index 63fd2e4f0ca6b9ba4287e342134463fcb6644e8f..3b7533ebfb8bfa042f3647df11a7e4635b6d9100 100644
--- a/force_bdss/basic_key_performance_calculator.py
+++ b/force_bdss/kpi/basic_key_performance_calculator.py
@@ -1,6 +1,6 @@
 from traits.api import provides, HasStrictTraits
 
-from force_bdss.i_key_performance_calculator import IKeyPerformanceCalculator
+from force_bdss.kpi.i_key_performance_calculator import IKeyPerformanceCalculator
 
 
 @provides(IKeyPerformanceCalculator)
diff --git a/force_bdss/i_key_performance_calculator.py b/force_bdss/kpi/i_key_performance_calculator.py
similarity index 100%
rename from force_bdss/i_key_performance_calculator.py
rename to force_bdss/kpi/i_key_performance_calculator.py
diff --git a/force_bdss/key_performance_calculators_plugin.py b/force_bdss/kpi/key_performance_calculators_plugin.py
similarity index 75%
rename from force_bdss/key_performance_calculators_plugin.py
rename to force_bdss/kpi/key_performance_calculators_plugin.py
index 082af87fa08bf826f7322f23993bc68c735dca63..8122c806ddab542736b6b8d8a01cf9a49411a1d6 100644
--- a/force_bdss/key_performance_calculators_plugin.py
+++ b/force_bdss/kpi/key_performance_calculators_plugin.py
@@ -1,9 +1,9 @@
-from traits.api import List
 from envisage.plugin import Plugin
+from traits.api import List
 
-from force_bdss.basic_key_performance_calculator import \
+from force_bdss.kpi.basic_key_performance_calculator import \
     BasicKeyPerformanceCalculator
-from force_bdss.i_key_performance_calculator import IKeyPerformanceCalculator
+from force_bdss.kpi.i_key_performance_calculator import IKeyPerformanceCalculator
 
 
 class KeyPerformanceCalculatorsPlugin(Plugin):
diff --git a/force_bdss/mco/__init__.py b/force_bdss/mco/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/force_bdss/basic_multi_criteria_optimizer.py b/force_bdss/mco/basic_multi_criteria_optimizer.py
similarity index 83%
rename from force_bdss/basic_multi_criteria_optimizer.py
rename to force_bdss/mco/basic_multi_criteria_optimizer.py
index fd56077ad2b2e8cb7710a665f882334682d8cc03..2fc3a351002f3895a680e99fc56b6debfee896d0 100644
--- a/force_bdss/basic_multi_criteria_optimizer.py
+++ b/force_bdss/mco/basic_multi_criteria_optimizer.py
@@ -1,8 +1,9 @@
 import subprocess
 import sys
+
 from traits.api import provides, HasStrictTraits
 
-from force_bdss.i_multi_criteria_optimizers import IMultiCriteriaOptimizer
+from force_bdss.mco.i_multi_criteria_optimizers import IMultiCriteriaOptimizer
 
 
 @provides(IMultiCriteriaOptimizer)
diff --git a/force_bdss/i_multi_criteria_optimizers.py b/force_bdss/mco/i_multi_criteria_optimizers.py
similarity index 100%
rename from force_bdss/i_multi_criteria_optimizers.py
rename to force_bdss/mco/i_multi_criteria_optimizers.py
diff --git a/force_bdss/multi_criteria_optimizers_plugin.py b/force_bdss/mco/multi_criteria_optimizers_plugin.py
similarity index 75%
rename from force_bdss/multi_criteria_optimizers_plugin.py
rename to force_bdss/mco/multi_criteria_optimizers_plugin.py
index 07a39a032f944066f86943865a28bb54f218a342..42d633316fcc1b6fd90d32b80e7d265939ce1635 100644
--- a/force_bdss/multi_criteria_optimizers_plugin.py
+++ b/force_bdss/mco/multi_criteria_optimizers_plugin.py
@@ -1,9 +1,9 @@
-from traits.api import List
 from envisage.plugin import Plugin
+from traits.api import List
 
-from force_bdss.basic_multi_criteria_optimizer import \
+from force_bdss.mco.basic_multi_criteria_optimizer import \
     BasicMultiCriteriaOptimizer
-from force_bdss.i_multi_criteria_optimizers import IMultiCriteriaOptimizer
+from force_bdss.mco.i_multi_criteria_optimizers import IMultiCriteriaOptimizer
 
 
 class MultiCriteriaOptimizersPlugin(Plugin):