diff --git a/watcher/api/app.py b/watcher/api/app.py
index 74131a835..f109ec816 100644
--- a/watcher/api/app.py
+++ b/watcher/api/app.py
@@ -22,7 +22,8 @@ import pecan
 from watcher.api import acl
 from watcher.api import config as api_config
 from watcher.api import middleware
-from watcher.decision_engine.framework.strategy import strategy_selector
+from watcher.decision_engine.strategy.selector import default \
+    as strategy_selector
 
 # Register options for the service
 API_SERVICE_OPTS = [
diff --git a/watcher/api/controllers/v1/audit.py b/watcher/api/controllers/v1/audit.py
index 2e2a17b4b..31c59a4ec 100644
--- a/watcher/api/controllers/v1/audit.py
+++ b/watcher/api/controllers/v1/audit.py
@@ -30,7 +30,7 @@ from watcher.api.controllers.v1 import types
 from watcher.api.controllers.v1 import utils as api_utils
 from watcher.common import exception
 from watcher.common import utils
-from watcher.decision_engine.framework.rpcapi import DecisionEngineAPI
+from watcher.decision_engine.rpcapi import DecisionEngineAPI
 from watcher import objects
 
 
diff --git a/watcher/applier/framework/command/hypervisor_state_command.py b/watcher/applier/framework/command/hypervisor_state_command.py
index 3cddd3791..a0fdbba29 100644
--- a/watcher/applier/framework/command/hypervisor_state_command.py
+++ b/watcher/applier/framework/command/hypervisor_state_command.py
@@ -24,7 +24,7 @@ from watcher.applier.api.primitive_command import PrimitiveCommand
 from watcher.applier.api.promise import Promise
 from watcher.applier.framework.command.wrapper.nova_wrapper import NovaWrapper
 from watcher.common.keystone import Client
-from watcher.decision_engine.framework.model.hypervisor_state import \
+from watcher.decision_engine.model.hypervisor_state import \
     HypervisorState
 
 CONF = cfg.CONF
diff --git a/watcher/applier/framework/command/migrate_command.py b/watcher/applier/framework/command/migrate_command.py
index c26906403..13cad4adc 100644
--- a/watcher/applier/framework/command/migrate_command.py
+++ b/watcher/applier/framework/command/migrate_command.py
@@ -25,7 +25,7 @@ from watcher.applier.api.primitive_command import PrimitiveCommand
 from watcher.applier.api.promise import Promise
 from watcher.applier.framework.command.wrapper.nova_wrapper import NovaWrapper
 from watcher.common.keystone import Client
-from watcher.decision_engine.framework.default_planner import Primitives
+from watcher.decision_engine.planner.default import Primitives
 
 CONF = cfg.CONF
 
diff --git a/watcher/applier/framework/default_command_mapper.py b/watcher/applier/framework/default_command_mapper.py
index 87b68c182..f26626627 100644
--- a/watcher/applier/framework/default_command_mapper.py
+++ b/watcher/applier/framework/default_command_mapper.py
@@ -26,7 +26,7 @@ from watcher.applier.framework.command.nop_command import NopCommand
 from watcher.applier.framework.command.power_state_command import \
     PowerStateCommand
 from watcher.common.exception import ActionNotFound
-from watcher.decision_engine.framework.default_planner import Primitives
+from watcher.decision_engine.planner.default import Primitives
 
 
 class DefaultCommandMapper(CommandMapper):
diff --git a/watcher/applier/framework/manager_applier.py b/watcher/applier/framework/manager_applier.py
index a8200e8a3..c335c3491 100644
--- a/watcher/applier/framework/manager_applier.py
+++ b/watcher/applier/framework/manager_applier.py
@@ -25,7 +25,7 @@ from watcher.applier.framework.messaging.trigger_action_plan import \
     TriggerActionPlan
 from watcher.common.messaging.messaging_core import MessagingCore
 from watcher.common.messaging.notification_handler import NotificationHandler
-from watcher.decision_engine.framework.messaging.events import Events
+from watcher.decision_engine.messaging.events import Events
 
 
 LOG = log.getLogger(__name__)
diff --git a/watcher/cmd/decisionengine.py b/watcher/cmd/decisionengine.py
index 022fa6331..97a5d71e4 100644
--- a/watcher/cmd/decisionengine.py
+++ b/watcher/cmd/decisionengine.py
@@ -24,7 +24,7 @@ import sys
 from oslo_config import cfg
 from oslo_log import log as logging
 from watcher.common import service
-from watcher.decision_engine.framework.manager import DecisionEngineManager
+from watcher.decision_engine.manager import DecisionEngineManager
 
 from watcher import i18n
 
diff --git a/watcher/common/messaging/events/event_dispatcher.py b/watcher/common/messaging/events/event_dispatcher.py
index f8b6686f4..cbc2de78a 100644
--- a/watcher/common/messaging/events/event_dispatcher.py
+++ b/watcher/common/messaging/events/event_dispatcher.py
@@ -16,7 +16,7 @@
 
 from oslo_log import log
 
-from watcher.decision_engine.framework.messaging.events import Events
+from watcher.decision_engine.messaging.events import Events
 
 LOG = log.getLogger(__name__)
 
diff --git a/watcher/decision_engine/api/__init__.py b/watcher/decision_engine/command/__init__.py
similarity index 100%
rename from watcher/decision_engine/api/__init__.py
rename to watcher/decision_engine/command/__init__.py
diff --git a/watcher/decision_engine/framework/command/trigger_audit_command.py b/watcher/decision_engine/command/audit.py
similarity index 90%
rename from watcher/decision_engine/framework/command/trigger_audit_command.py
rename to watcher/decision_engine/command/audit.py
index 10eaf6c7d..e675c18fb 100644
--- a/watcher/decision_engine/framework/command/trigger_audit_command.py
+++ b/watcher/decision_engine/command/audit.py
@@ -16,12 +16,11 @@
 from oslo_log import log
 
 from watcher.common.messaging.events.event import Event
-from watcher.decision_engine.api.messaging.decision_engine_command import \
+from watcher.decision_engine.messaging.command.base import \
     BaseDecisionEngineCommand
-from watcher.decision_engine.framework.default_planner import DefaultPlanner
-from watcher.decision_engine.framework.messaging.events import Events
-from watcher.decision_engine.framework.strategy.strategy_context import \
-    StrategyContext
+from watcher.decision_engine.messaging.events import Events
+from watcher.decision_engine.planner.default import DefaultPlanner
+from watcher.decision_engine.strategy.context.default import StrategyContext
 from watcher.objects.audit import Audit
 from watcher.objects.audit import AuditStatus
 from watcher.objects.audit_template import AuditTemplate
diff --git a/watcher/decision_engine/api/messaging/__init__.py b/watcher/decision_engine/event/__init__.py
similarity index 100%
rename from watcher/decision_engine/api/messaging/__init__.py
rename to watcher/decision_engine/event/__init__.py
diff --git a/watcher/decision_engine/framework/events/event_consumer_factory.py b/watcher/decision_engine/event/consumer_factory.py
similarity index 100%
rename from watcher/decision_engine/framework/events/event_consumer_factory.py
rename to watcher/decision_engine/event/consumer_factory.py
diff --git a/watcher/decision_engine/framework/manager.py b/watcher/decision_engine/manager.py
similarity index 86%
rename from watcher/decision_engine/framework/manager.py
rename to watcher/decision_engine/manager.py
index c3844d19c..83d30e26c 100644
--- a/watcher/decision_engine/framework/manager.py
+++ b/watcher/decision_engine/manager.py
@@ -21,19 +21,12 @@ from concurrent.futures import ThreadPoolExecutor
 from oslo_config import cfg
 from oslo_log import log
 
-from watcher.decision_engine.framework.events.event_consumer_factory import \
-    EventConsumerFactory
-
-from watcher.common.messaging.messaging_core import \
-    MessagingCore
-from watcher.decision_engine.framework.messaging.audit_endpoint import \
-    AuditEndpoint
-from watcher.decision_engine.framework.messaging.events import Events
-
-from watcher.common.messaging.notification_handler import \
-    NotificationHandler
-from watcher.decision_engine.framework.strategy.strategy_context import \
-    StrategyContext
+from watcher.common.messaging.messaging_core import MessagingCore
+from watcher.common.messaging.notification_handler import NotificationHandler
+from watcher.decision_engine.event.consumer_factory import EventConsumerFactory
+from watcher.decision_engine.messaging.audit_endpoint import AuditEndpoint
+from watcher.decision_engine.messaging.events import Events
+from watcher.decision_engine.strategy.context.default import StrategyContext
 
 LOG = log.getLogger(__name__)
 CONF = cfg.CONF
diff --git a/watcher/decision_engine/api/planner/__init__.py b/watcher/decision_engine/messaging/__init__.py
similarity index 100%
rename from watcher/decision_engine/api/planner/__init__.py
rename to watcher/decision_engine/messaging/__init__.py
diff --git a/watcher/decision_engine/framework/messaging/audit_endpoint.py b/watcher/decision_engine/messaging/audit_endpoint.py
similarity index 93%
rename from watcher/decision_engine/framework/messaging/audit_endpoint.py
rename to watcher/decision_engine/messaging/audit_endpoint.py
index eb55825dd..0d75b5cae 100644
--- a/watcher/decision_engine/framework/messaging/audit_endpoint.py
+++ b/watcher/decision_engine/messaging/audit_endpoint.py
@@ -18,8 +18,7 @@
 #
 from oslo_log import log
 
-from watcher.decision_engine.framework.command.trigger_audit_command import \
-    TriggerAuditCommand
+from watcher.decision_engine.command.audit import TriggerAuditCommand
 from watcher.metrics_engine.cluster_model_collector.manager import \
     CollectorManager
 
diff --git a/watcher/decision_engine/api/solution/__init__.py b/watcher/decision_engine/messaging/command/__init__.py
similarity index 100%
rename from watcher/decision_engine/api/solution/__init__.py
rename to watcher/decision_engine/messaging/command/__init__.py
diff --git a/watcher/decision_engine/api/messaging/decision_engine_command.py b/watcher/decision_engine/messaging/command/base.py
similarity index 100%
rename from watcher/decision_engine/api/messaging/decision_engine_command.py
rename to watcher/decision_engine/messaging/command/base.py
diff --git a/watcher/decision_engine/api/messaging/event_consumer.py b/watcher/decision_engine/messaging/event_consumer.py
similarity index 100%
rename from watcher/decision_engine/api/messaging/event_consumer.py
rename to watcher/decision_engine/messaging/event_consumer.py
diff --git a/watcher/decision_engine/framework/messaging/events.py b/watcher/decision_engine/messaging/events.py
similarity index 100%
rename from watcher/decision_engine/framework/messaging/events.py
rename to watcher/decision_engine/messaging/events.py
diff --git a/watcher/decision_engine/api/strategy/__init__.py b/watcher/decision_engine/meta_action/__init__.py
similarity index 100%
rename from watcher/decision_engine/api/strategy/__init__.py
rename to watcher/decision_engine/meta_action/__init__.py
diff --git a/watcher/decision_engine/api/strategy/meta_action.py b/watcher/decision_engine/meta_action/base.py
similarity index 94%
rename from watcher/decision_engine/api/strategy/meta_action.py
rename to watcher/decision_engine/meta_action/base.py
index 7e2a79921..c25782852 100644
--- a/watcher/decision_engine/api/strategy/meta_action.py
+++ b/watcher/decision_engine/meta_action/base.py
@@ -19,7 +19,7 @@
 import abc
 import six
 
-from watcher.decision_engine.api.strategy.strategy import StrategyLevel
+from watcher.decision_engine.strategy.level import StrategyLevel
 
 
 @six.add_metaclass(abc.ABCMeta)
diff --git a/watcher/decision_engine/framework/meta_actions/hypervisor_state.py b/watcher/decision_engine/meta_action/hypervisor_state.py
similarity index 89%
rename from watcher/decision_engine/framework/meta_actions/hypervisor_state.py
rename to watcher/decision_engine/meta_action/hypervisor_state.py
index 9dcde2db8..80b2bec3a 100644
--- a/watcher/decision_engine/framework/meta_actions/hypervisor_state.py
+++ b/watcher/decision_engine/meta_action/hypervisor_state.py
@@ -16,9 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from watcher.decision_engine.api.strategy.meta_action import MetaAction
-from watcher.decision_engine.framework.model.hypervisor_state import \
-    HypervisorState
+from watcher.decision_engine.meta_action.base import MetaAction
+from watcher.decision_engine.model.hypervisor_state import HypervisorState
 
 
 class ChangeHypervisorState(MetaAction):
diff --git a/watcher/decision_engine/framework/meta_actions/migrate.py b/watcher/decision_engine/meta_action/migrate.py
similarity index 96%
rename from watcher/decision_engine/framework/meta_actions/migrate.py
rename to watcher/decision_engine/meta_action/migrate.py
index 4c0f6861a..45546705f 100644
--- a/watcher/decision_engine/framework/meta_actions/migrate.py
+++ b/watcher/decision_engine/meta_action/migrate.py
@@ -19,7 +19,7 @@
 
 from enum import Enum
 
-from watcher.decision_engine.api.strategy.meta_action import MetaAction
+from watcher.decision_engine.meta_action.base import MetaAction
 
 
 class MigrationType(Enum):
diff --git a/watcher/decision_engine/framework/meta_actions/nop.py b/watcher/decision_engine/meta_action/nop.py
similarity index 91%
rename from watcher/decision_engine/framework/meta_actions/nop.py
rename to watcher/decision_engine/meta_action/nop.py
index 8bf1533cd..8414ac880 100644
--- a/watcher/decision_engine/framework/meta_actions/nop.py
+++ b/watcher/decision_engine/meta_action/nop.py
@@ -16,7 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from watcher.decision_engine.api.strategy.meta_action import MetaAction
+
+from watcher.decision_engine.meta_action.base import MetaAction
 
 
 class Nop(MetaAction):
diff --git a/watcher/decision_engine/framework/meta_actions/power_state.py b/watcher/decision_engine/meta_action/power_state.py
similarity index 90%
rename from watcher/decision_engine/framework/meta_actions/power_state.py
rename to watcher/decision_engine/meta_action/power_state.py
index 427a21649..72f4d8701 100644
--- a/watcher/decision_engine/framework/meta_actions/power_state.py
+++ b/watcher/decision_engine/meta_action/power_state.py
@@ -16,8 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from watcher.decision_engine.api.strategy.meta_action import MetaAction
-from watcher.decision_engine.framework.model.power_state import PowerState
+from watcher.decision_engine.meta_action.base import MetaAction
+from watcher.decision_engine.model.power_state import PowerState
 
 
 class ChangePowerState(MetaAction):
diff --git a/watcher/decision_engine/framework/__init__.py b/watcher/decision_engine/model/__init__.py
similarity index 100%
rename from watcher/decision_engine/framework/__init__.py
rename to watcher/decision_engine/model/__init__.py
diff --git a/watcher/decision_engine/framework/model/diskInfo.py b/watcher/decision_engine/model/diskInfo.py
similarity index 100%
rename from watcher/decision_engine/framework/model/diskInfo.py
rename to watcher/decision_engine/model/diskInfo.py
diff --git a/watcher/decision_engine/framework/model/hypervisor.py b/watcher/decision_engine/model/hypervisor.py
similarity index 83%
rename from watcher/decision_engine/framework/model/hypervisor.py
rename to watcher/decision_engine/model/hypervisor.py
index 96c3034c2..988bc1966 100644
--- a/watcher/decision_engine/framework/model/hypervisor.py
+++ b/watcher/decision_engine/model/hypervisor.py
@@ -13,10 +13,9 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from watcher.decision_engine.framework.model.hypervisor_state import \
-    HypervisorState
-from watcher.decision_engine.framework.model.named_element import NamedElement
-from watcher.decision_engine.framework.model.power_state import PowerState
+from watcher.decision_engine.model.hypervisor_state import HypervisorState
+from watcher.decision_engine.model.named_element import NamedElement
+from watcher.decision_engine.model.power_state import PowerState
 
 
 class Hypervisor(NamedElement):
diff --git a/watcher/decision_engine/framework/model/hypervisor_state.py b/watcher/decision_engine/model/hypervisor_state.py
similarity index 100%
rename from watcher/decision_engine/framework/model/hypervisor_state.py
rename to watcher/decision_engine/model/hypervisor_state.py
diff --git a/watcher/decision_engine/framework/model/mapping.py b/watcher/decision_engine/model/mapping.py
similarity index 100%
rename from watcher/decision_engine/framework/model/mapping.py
rename to watcher/decision_engine/model/mapping.py
diff --git a/watcher/decision_engine/framework/model/model_root.py b/watcher/decision_engine/model/model_root.py
similarity index 92%
rename from watcher/decision_engine/framework/model/model_root.py
rename to watcher/decision_engine/model/model_root.py
index 0261011d5..9f09a998c 100644
--- a/watcher/decision_engine/framework/model/model_root.py
+++ b/watcher/decision_engine/model/model_root.py
@@ -18,9 +18,9 @@ from oslo_log import log
 from watcher.common.exception import HypervisorNotFound
 from watcher.common.exception import IllegalArgumentException
 from watcher.common.exception import VMNotFound
-from watcher.decision_engine.framework.model.hypervisor import Hypervisor
-from watcher.decision_engine.framework.model.mapping import Mapping
-from watcher.decision_engine.framework.model.vm import VM
+from watcher.decision_engine.model.hypervisor import Hypervisor
+from watcher.decision_engine.model.mapping import Mapping
+from watcher.decision_engine.model.vm import VM
 
 LOG = log.getLogger(__name__)
 
diff --git a/watcher/decision_engine/framework/model/named_element.py b/watcher/decision_engine/model/named_element.py
similarity index 100%
rename from watcher/decision_engine/framework/model/named_element.py
rename to watcher/decision_engine/model/named_element.py
diff --git a/watcher/decision_engine/framework/model/power_state.py b/watcher/decision_engine/model/power_state.py
similarity index 100%
rename from watcher/decision_engine/framework/model/power_state.py
rename to watcher/decision_engine/model/power_state.py
diff --git a/watcher/decision_engine/framework/model/resource.py b/watcher/decision_engine/model/resource.py
similarity index 100%
rename from watcher/decision_engine/framework/model/resource.py
rename to watcher/decision_engine/model/resource.py
diff --git a/watcher/decision_engine/framework/command/__init__.py b/watcher/decision_engine/model/sla/__init__.py
similarity index 100%
rename from watcher/decision_engine/framework/command/__init__.py
rename to watcher/decision_engine/model/sla/__init__.py
diff --git a/watcher/decision_engine/framework/model/vm.py b/watcher/decision_engine/model/vm.py
similarity index 84%
rename from watcher/decision_engine/framework/model/vm.py
rename to watcher/decision_engine/model/vm.py
index 18a7785bf..ea17d28aa 100644
--- a/watcher/decision_engine/framework/model/vm.py
+++ b/watcher/decision_engine/model/vm.py
@@ -13,8 +13,8 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from watcher.decision_engine.framework.model.named_element import NamedElement
-from watcher.decision_engine.framework.model.vm_state import VMState
+from watcher.decision_engine.model.named_element import NamedElement
+from watcher.decision_engine.model.vm_state import VMState
 
 
 class VM(NamedElement):
diff --git a/watcher/decision_engine/framework/model/vm_state.py b/watcher/decision_engine/model/vm_state.py
similarity index 100%
rename from watcher/decision_engine/framework/model/vm_state.py
rename to watcher/decision_engine/model/vm_state.py
diff --git a/watcher/decision_engine/framework/events/__init__.py b/watcher/decision_engine/planner/__init__.py
similarity index 100%
rename from watcher/decision_engine/framework/events/__init__.py
rename to watcher/decision_engine/planner/__init__.py
diff --git a/watcher/decision_engine/api/planner/planner.py b/watcher/decision_engine/planner/base.py
similarity index 100%
rename from watcher/decision_engine/api/planner/planner.py
rename to watcher/decision_engine/planner/base.py
diff --git a/watcher/decision_engine/framework/default_planner.py b/watcher/decision_engine/planner/default.py
similarity index 94%
rename from watcher/decision_engine/framework/default_planner.py
rename to watcher/decision_engine/planner/default.py
index 8f76fad11..b1ebb7eaa 100644
--- a/watcher/decision_engine/framework/default_planner.py
+++ b/watcher/decision_engine/planner/default.py
@@ -21,16 +21,15 @@ from oslo_log import log
 from enum import Enum
 from watcher.common.exception import MetaActionNotFound
 from watcher.common import utils
-from watcher.decision_engine.api.planner.planner import Planner
+from watcher.decision_engine.planner.base import Planner
 
 from watcher import objects
 
-from watcher.decision_engine.framework.meta_actions.hypervisor_state import \
+from watcher.decision_engine.meta_action.hypervisor_state import \
     ChangeHypervisorState
-from watcher.decision_engine.framework.meta_actions.migrate import Migrate
-from watcher.decision_engine.framework.meta_actions.nop import Nop
-from watcher.decision_engine.framework.meta_actions.power_state import \
-    ChangePowerState
+from watcher.decision_engine.meta_action.migrate import Migrate
+from watcher.decision_engine.meta_action.nop import Nop
+from watcher.decision_engine.meta_action.power_state import ChangePowerState
 from watcher.objects.action import Status as AStatus
 from watcher.objects.action_plan import Status as APStatus
 
diff --git a/watcher/decision_engine/framework/rpcapi.py b/watcher/decision_engine/rpcapi.py
similarity index 89%
rename from watcher/decision_engine/framework/rpcapi.py
rename to watcher/decision_engine/rpcapi.py
index 15dc3a1d3..5f79c34ab 100644
--- a/watcher/decision_engine/framework/rpcapi.py
+++ b/watcher/decision_engine/rpcapi.py
@@ -30,14 +30,11 @@ from watcher.common.messaging.messaging_core import MessagingCore
 from watcher.common.messaging.notification_handler import NotificationHandler
 from watcher.common.messaging.utils.transport_url_builder import \
     TransportUrlBuilder
-from watcher.decision_engine.framework.events.event_consumer_factory import \
-    EventConsumerFactory
-from watcher.decision_engine.framework.manager import \
-    decision_engine_opt_group
-from watcher.decision_engine.framework.manager import \
-    WATCHER_DECISION_ENGINE_OPTS
+from watcher.decision_engine.event.consumer_factory import EventConsumerFactory
+from watcher.decision_engine.manager import decision_engine_opt_group
+from watcher.decision_engine.manager import WATCHER_DECISION_ENGINE_OPTS
 
-from watcher.decision_engine.framework.messaging.events import Events
+from watcher.decision_engine.messaging.events import Events
 
 LOG = log.getLogger(__name__)
 CONF = cfg.CONF
diff --git a/watcher/decision_engine/framework/messaging/__init__.py b/watcher/decision_engine/solution/__init__.py
similarity index 100%
rename from watcher/decision_engine/framework/messaging/__init__.py
rename to watcher/decision_engine/solution/__init__.py
diff --git a/watcher/decision_engine/api/solution/solution.py b/watcher/decision_engine/solution/base.py
similarity index 100%
rename from watcher/decision_engine/api/solution/solution.py
rename to watcher/decision_engine/solution/base.py
diff --git a/watcher/decision_engine/framework/default_solution.py b/watcher/decision_engine/solution/default.py
similarity index 94%
rename from watcher/decision_engine/framework/default_solution.py
rename to watcher/decision_engine/solution/default.py
index b86fddb53..134e98089 100644
--- a/watcher/decision_engine/framework/default_solution.py
+++ b/watcher/decision_engine/solution/default.py
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 from oslo_log import log
-from watcher.decision_engine.api.solution.solution import Solution
+from watcher.decision_engine.solution.base import Solution
 
 LOG = log.getLogger(__name__)
 
diff --git a/watcher/decision_engine/api/solution/solution_comparator.py b/watcher/decision_engine/solution/solution_comparator.py
similarity index 100%
rename from watcher/decision_engine/api/solution/solution_comparator.py
rename to watcher/decision_engine/solution/solution_comparator.py
diff --git a/watcher/decision_engine/api/solution/solution_evaluator.py b/watcher/decision_engine/solution/solution_evaluator.py
similarity index 100%
rename from watcher/decision_engine/api/solution/solution_evaluator.py
rename to watcher/decision_engine/solution/solution_evaluator.py
diff --git a/watcher/decision_engine/strategies/README.md b/watcher/decision_engine/strategy/README.md
similarity index 100%
rename from watcher/decision_engine/strategies/README.md
rename to watcher/decision_engine/strategy/README.md
diff --git a/watcher/decision_engine/framework/meta_actions/__init__.py b/watcher/decision_engine/strategy/__init__.py
similarity index 100%
rename from watcher/decision_engine/framework/meta_actions/__init__.py
rename to watcher/decision_engine/strategy/__init__.py
diff --git a/watcher/decision_engine/api/strategy/strategy.py b/watcher/decision_engine/strategy/base.py
similarity index 93%
rename from watcher/decision_engine/api/strategy/strategy.py
rename to watcher/decision_engine/strategy/base.py
index 3afe040f8..7ae69edd7 100644
--- a/watcher/decision_engine/api/strategy/strategy.py
+++ b/watcher/decision_engine/strategy/base.py
@@ -18,8 +18,8 @@ import abc
 from oslo_log import log
 
 import six
-from watcher.decision_engine.api.strategy.strategy_level import StrategyLevel
-from watcher.decision_engine.framework.default_solution import DefaultSolution
+from watcher.decision_engine.solution.default import DefaultSolution
+from watcher.decision_engine.strategy.level import StrategyLevel
 
 
 LOG = log.getLogger(__name__)
diff --git a/watcher/decision_engine/strategies/basic_consolidation.py b/watcher/decision_engine/strategy/basic_consolidation.py
similarity index 95%
rename from watcher/decision_engine/strategies/basic_consolidation.py
rename to watcher/decision_engine/strategy/basic_consolidation.py
index aa95feb77..6d37568f8 100644
--- a/watcher/decision_engine/strategies/basic_consolidation.py
+++ b/watcher/decision_engine/strategy/basic_consolidation.py
@@ -20,22 +20,18 @@ from oslo_log import log
 
 from watcher.common.exception import ClusterEmpty
 from watcher.common.exception import ClusteStateNotDefined
-from watcher.decision_engine.api.strategy.strategy import BaseStrategy
-from watcher.decision_engine.api.strategy.strategy import StrategyLevel
+from watcher.decision_engine.strategy.base import BaseStrategy
+from watcher.decision_engine.strategy.level import StrategyLevel
 
-from watcher.decision_engine.framework.meta_actions.hypervisor_state import \
+from watcher.decision_engine.meta_action.hypervisor_state import \
     ChangeHypervisorState
-from watcher.decision_engine.framework.meta_actions.migrate import Migrate
-from watcher.decision_engine.framework.meta_actions.migrate import \
-    MigrationType
-from watcher.decision_engine.framework.meta_actions.power_state import \
-    ChangePowerState
-from watcher.decision_engine.framework.meta_actions.power_state import \
-    PowerState
-from watcher.decision_engine.framework.model.hypervisor_state import \
-    HypervisorState
-from watcher.decision_engine.framework.model.resource import ResourceType
-from watcher.decision_engine.framework.model.vm_state import VMState
+from watcher.decision_engine.meta_action.migrate import Migrate
+from watcher.decision_engine.meta_action.migrate import MigrationType
+from watcher.decision_engine.meta_action.power_state import ChangePowerState
+from watcher.decision_engine.meta_action.power_state import PowerState
+from watcher.decision_engine.model.hypervisor_state import HypervisorState
+from watcher.decision_engine.model.resource import ResourceType
+from watcher.decision_engine.model.vm_state import VMState
 from watcher.metrics_engine.cluster_history.ceilometer import \
     CeilometerClusterHistory
 
diff --git a/watcher/decision_engine/framework/model/__init__.py b/watcher/decision_engine/strategy/context/__init__.py
similarity index 100%
rename from watcher/decision_engine/framework/model/__init__.py
rename to watcher/decision_engine/strategy/context/__init__.py
diff --git a/watcher/decision_engine/api/strategy/strategy_context.py b/watcher/decision_engine/strategy/context/base.py
similarity index 100%
rename from watcher/decision_engine/api/strategy/strategy_context.py
rename to watcher/decision_engine/strategy/context/base.py
diff --git a/watcher/decision_engine/framework/strategy/strategy_context.py b/watcher/decision_engine/strategy/context/default.py
similarity index 84%
rename from watcher/decision_engine/framework/strategy/strategy_context.py
rename to watcher/decision_engine/strategy/context/default.py
index 5d37719d1..49318c026 100644
--- a/watcher/decision_engine/framework/strategy/strategy_context.py
+++ b/watcher/decision_engine/strategy/context/default.py
@@ -15,11 +15,9 @@
 # limitations under the License.
 from oslo_log import log
 
-from watcher.decision_engine.api.strategy.strategy_context import\
-    BaseStrategyContext
-from watcher.decision_engine.framework.default_planner import DefaultPlanner
-from watcher.decision_engine.framework.strategy.strategy_selector import \
-    StrategySelector
+from watcher.decision_engine.planner.default import DefaultPlanner
+from watcher.decision_engine.strategy.context.base import BaseStrategyContext
+from watcher.decision_engine.strategy.selector.default import StrategySelector
 
 LOG = log.getLogger(__name__)
 
diff --git a/watcher/decision_engine/strategies/dummy_strategy.py b/watcher/decision_engine/strategy/dummy_strategy.py
similarity index 88%
rename from watcher/decision_engine/strategies/dummy_strategy.py
rename to watcher/decision_engine/strategy/dummy_strategy.py
index b693d9d9d..8198bfb15 100644
--- a/watcher/decision_engine/strategies/dummy_strategy.py
+++ b/watcher/decision_engine/strategy/dummy_strategy.py
@@ -18,8 +18,8 @@
 #
 from oslo_log import log
 
-from watcher.decision_engine.api.strategy.strategy import BaseStrategy
-from watcher.decision_engine.framework.meta_actions.nop import Nop
+from watcher.decision_engine.meta_action.nop import Nop
+from watcher.decision_engine.strategy.base import BaseStrategy
 
 LOG = log.getLogger(__name__)
 
diff --git a/watcher/decision_engine/api/strategy/strategy_level.py b/watcher/decision_engine/strategy/level.py
similarity index 100%
rename from watcher/decision_engine/api/strategy/strategy_level.py
rename to watcher/decision_engine/strategy/level.py
diff --git a/watcher/decision_engine/framework/strategy/strategy_loader.py b/watcher/decision_engine/strategy/loader.py
similarity index 95%
rename from watcher/decision_engine/framework/strategy/strategy_loader.py
rename to watcher/decision_engine/strategy/loader.py
index 5e5064dc5..aac47d89b 100644
--- a/watcher/decision_engine/framework/strategy/strategy_loader.py
+++ b/watcher/decision_engine/strategy/loader.py
@@ -21,7 +21,7 @@ from __future__ import unicode_literals
 
 from oslo_log import log
 from stevedore import ExtensionManager
-from watcher.decision_engine.strategies.basic_consolidation import \
+from watcher.decision_engine.strategy.basic_consolidation import \
     BasicConsolidation
 
 LOG = log.getLogger(__name__)
diff --git a/watcher/decision_engine/framework/model/sla/__init__.py b/watcher/decision_engine/strategy/selector/__init__.py
similarity index 100%
rename from watcher/decision_engine/framework/model/sla/__init__.py
rename to watcher/decision_engine/strategy/selector/__init__.py
diff --git a/watcher/decision_engine/api/strategy/selector.py b/watcher/decision_engine/strategy/selector/base.py
similarity index 100%
rename from watcher/decision_engine/api/strategy/selector.py
rename to watcher/decision_engine/strategy/selector/base.py
diff --git a/watcher/decision_engine/framework/strategy/strategy_selector.py b/watcher/decision_engine/strategy/selector/default.py
similarity index 91%
rename from watcher/decision_engine/framework/strategy/strategy_selector.py
rename to watcher/decision_engine/strategy/selector/default.py
index f25054464..c5f66e990 100644
--- a/watcher/decision_engine/framework/strategy/strategy_selector.py
+++ b/watcher/decision_engine/strategy/selector/default.py
@@ -16,9 +16,8 @@
 
 from oslo_config import cfg
 from oslo_log import log
-from watcher.decision_engine.api.strategy.selector import Selector
-from watcher.decision_engine.framework.strategy.strategy_loader import \
-    StrategyLoader
+from watcher.decision_engine.strategy.loader import StrategyLoader
+from watcher.decision_engine.strategy.selector.base import Selector
 from watcher.objects.audit_template import Goal
 
 LOG = log.getLogger(__name__)
diff --git a/watcher/decision_engine/api/strategy/strategy_state.py b/watcher/decision_engine/strategy/state.py
similarity index 100%
rename from watcher/decision_engine/api/strategy/strategy_state.py
rename to watcher/decision_engine/strategy/state.py
diff --git a/watcher/metrics_engine/cluster_model_collector/nova.py b/watcher/metrics_engine/cluster_model_collector/nova.py
index f9ad3e23f..154211e63 100644
--- a/watcher/metrics_engine/cluster_model_collector/nova.py
+++ b/watcher/metrics_engine/cluster_model_collector/nova.py
@@ -21,11 +21,11 @@
 from oslo_config import cfg
 from oslo_log import log
 
-from watcher.decision_engine.framework.model.hypervisor import Hypervisor
-from watcher.decision_engine.framework.model.model_root import ModelRoot
-from watcher.decision_engine.framework.model.resource import Resource
-from watcher.decision_engine.framework.model.resource import ResourceType
-from watcher.decision_engine.framework.model.vm import VM
+from watcher.decision_engine.model.hypervisor import Hypervisor
+from watcher.decision_engine.model.model_root import ModelRoot
+from watcher.decision_engine.model.resource import Resource
+from watcher.decision_engine.model.resource import ResourceType
+from watcher.decision_engine.model.vm import VM
 from watcher.metrics_engine.cluster_model_collector.api import \
     BaseClusterModelCollector
 
diff --git a/watcher/opts.py b/watcher/opts.py
index 885e997c9..5237468cd 100644
--- a/watcher/opts.py
+++ b/watcher/opts.py
@@ -22,8 +22,9 @@ import watcher.api.app
 from watcher.applier.framework import manager_applier
 import watcher.common.messaging.messaging_core
 
-from watcher.decision_engine.framework import manager
-from watcher.decision_engine.framework.strategy import strategy_selector
+from watcher.decision_engine import manager
+from watcher.decision_engine.strategy.selector import default \
+    as strategy_selector
 
 
 def list_opts():
diff --git a/watcher/tests/api/v1/test_audits.py b/watcher/tests/api/v1/test_audits.py
index 485bb565d..dd108b235 100644
--- a/watcher/tests/api/v1/test_audits.py
+++ b/watcher/tests/api/v1/test_audits.py
@@ -21,7 +21,7 @@ from six.moves.urllib import parse as urlparse
 from watcher.api.controllers.v1 import audit as api_audit
 from watcher.common import utils
 from watcher.db import api as db_api
-from watcher.decision_engine.framework import rpcapi as deapi
+from watcher.decision_engine import rpcapi as deapi
 from watcher import objects
 from watcher.tests.api import base as api_base
 from watcher.tests.api import utils as api_utils
diff --git a/watcher/tests/applier/framework/test_command_executor.py b/watcher/tests/applier/framework/test_command_executor.py
index 780f8d79d..b5a26f417 100644
--- a/watcher/tests/applier/framework/test_command_executor.py
+++ b/watcher/tests/applier/framework/test_command_executor.py
@@ -22,7 +22,7 @@ from watcher.applier.framework.command_executor import CommandExecutor
 from watcher import objects
 
 from watcher.common import utils
-from watcher.decision_engine.framework.default_planner import Primitives
+from watcher.decision_engine.planner.default import Primitives
 from watcher.objects.action import Action
 from watcher.objects.action import Status
 from watcher.tests.db.base import DbTestCase
diff --git a/watcher/tests/applier/framework/test_command_mapper.py b/watcher/tests/applier/framework/test_command_mapper.py
index 1f93d5ede..69a1116b3 100644
--- a/watcher/tests/applier/framework/test_command_mapper.py
+++ b/watcher/tests/applier/framework/test_command_mapper.py
@@ -19,7 +19,7 @@
 import mock
 from watcher.applier.framework.default_command_mapper import \
     DefaultCommandMapper
-from watcher.decision_engine.framework.default_planner import Primitives
+from watcher.decision_engine.planner.default import Primitives
 from watcher.tests import base
 
 
diff --git a/watcher/tests/cmd/test_decision_engine.py b/watcher/tests/cmd/test_decision_engine.py
index 86a43843a..baabfdb85 100644
--- a/watcher/tests/cmd/test_decision_engine.py
+++ b/watcher/tests/cmd/test_decision_engine.py
@@ -21,7 +21,7 @@ import types
 
 from mock import patch
 from oslo_config import cfg
-from watcher.decision_engine.framework.manager import DecisionEngineManager
+from watcher.decision_engine.manager import DecisionEngineManager
 from watcher.tests.base import BaseTestCase
 
 from watcher.cmd import decisionengine
diff --git a/watcher/tests/common/messaging/event/test_event_dispatcher.py b/watcher/tests/common/messaging/event/test_event_dispatcher.py
index f560b0ab1..92bf4b899 100644
--- a/watcher/tests/common/messaging/event/test_event_dispatcher.py
+++ b/watcher/tests/common/messaging/event/test_event_dispatcher.py
@@ -17,7 +17,7 @@ from mock import call
 from mock import MagicMock
 from watcher.common.messaging.events.event import Event
 from watcher.common.messaging.events.event_dispatcher import EventDispatcher
-from watcher.decision_engine.framework.messaging.events import Events
+from watcher.decision_engine.messaging.events import Events
 from watcher.tests import base
 
 
diff --git a/watcher/decision_engine/framework/strategy/__init__.py b/watcher/tests/decision_engine/command/__init__.py
similarity index 100%
rename from watcher/decision_engine/framework/strategy/__init__.py
rename to watcher/tests/decision_engine/command/__init__.py
diff --git a/watcher/tests/decision_engine/framework/command/test_event_consumer_factory.py b/watcher/tests/decision_engine/command/test_event_consumer_factory.py
similarity index 84%
rename from watcher/tests/decision_engine/framework/command/test_event_consumer_factory.py
rename to watcher/tests/decision_engine/command/test_event_consumer_factory.py
index 371b61134..edfb21ae5 100644
--- a/watcher/tests/decision_engine/framework/command/test_event_consumer_factory.py
+++ b/watcher/tests/decision_engine/command/test_event_consumer_factory.py
@@ -16,9 +16,8 @@
 
 import exceptions
 
-from watcher.decision_engine.framework.events.event_consumer_factory import \
-    EventConsumerFactory
-from watcher.decision_engine.framework.messaging.events import Events
+from watcher.decision_engine.event.consumer_factory import EventConsumerFactory
+from watcher.decision_engine.messaging.events import Events
 from watcher.tests import base
 
 
diff --git a/watcher/tests/decision_engine/framework/command/test_trigger_audit_command.py b/watcher/tests/decision_engine/command/test_trigger_audit_command.py
similarity index 94%
rename from watcher/tests/decision_engine/framework/command/test_trigger_audit_command.py
rename to watcher/tests/decision_engine/command/test_trigger_audit_command.py
index 2537c93d3..d89f4668f 100644
--- a/watcher/tests/decision_engine/framework/command/test_trigger_audit_command.py
+++ b/watcher/tests/decision_engine/command/test_trigger_audit_command.py
@@ -16,9 +16,8 @@
 
 from mock import call
 from mock import MagicMock
-from watcher.decision_engine.framework.command.trigger_audit_command import \
-    TriggerAuditCommand
-from watcher.decision_engine.framework.messaging.events import Events
+from watcher.decision_engine.command.audit import TriggerAuditCommand
+from watcher.decision_engine.messaging.events import Events
 from watcher.objects.audit import Audit
 from watcher.objects.audit import AuditStatus
 from watcher.tests.db.base import DbTestCase
diff --git a/watcher/decision_engine/strategies/__init__.py b/watcher/tests/decision_engine/event_consumer/__init__.py
similarity index 100%
rename from watcher/decision_engine/strategies/__init__.py
rename to watcher/tests/decision_engine/event_consumer/__init__.py
diff --git a/watcher/tests/decision_engine/faker_cluster_state.py b/watcher/tests/decision_engine/faker_cluster_state.py
index 3e7098118..cce526a3d 100644
--- a/watcher/tests/decision_engine/faker_cluster_state.py
+++ b/watcher/tests/decision_engine/faker_cluster_state.py
@@ -19,11 +19,11 @@
 
 import random
 
-from watcher.decision_engine.framework.model.hypervisor import Hypervisor
-from watcher.decision_engine.framework.model.model_root import ModelRoot
-from watcher.decision_engine.framework.model.resource import Resource
-from watcher.decision_engine.framework.model.resource import ResourceType
-from watcher.decision_engine.framework.model.vm import VM
+from watcher.decision_engine.model.hypervisor import Hypervisor
+from watcher.decision_engine.model.model_root import ModelRoot
+from watcher.decision_engine.model.resource import Resource
+from watcher.decision_engine.model.resource import ResourceType
+from watcher.decision_engine.model.vm import VM
 from watcher.metrics_engine.cluster_model_collector.api import \
     BaseClusterModelCollector
 
diff --git a/watcher/tests/decision_engine/framework/meta_actions/__init__.py b/watcher/tests/decision_engine/framework/meta_actions/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/watcher/tests/decision_engine/framework/model/__init__.py b/watcher/tests/decision_engine/framework/model/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/watcher/tests/decision_engine/framework/strategy/__init__.py b/watcher/tests/decision_engine/framework/strategy/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/watcher/tests/decision_engine/api/__init__.py b/watcher/tests/decision_engine/messaging/__init__.py
similarity index 100%
rename from watcher/tests/decision_engine/api/__init__.py
rename to watcher/tests/decision_engine/messaging/__init__.py
diff --git a/watcher/tests/decision_engine/framework/messaging/test_audit_endpoint.py b/watcher/tests/decision_engine/messaging/test_audit_endpoint.py
similarity index 92%
rename from watcher/tests/decision_engine/framework/messaging/test_audit_endpoint.py
rename to watcher/tests/decision_engine/messaging/test_audit_endpoint.py
index 38d224fa5..8f2c453a9 100644
--- a/watcher/tests/decision_engine/framework/messaging/test_audit_endpoint.py
+++ b/watcher/tests/decision_engine/messaging/test_audit_endpoint.py
@@ -17,10 +17,8 @@ import mock
 from mock import MagicMock
 
 from watcher.common import utils
-from watcher.decision_engine.framework.command.trigger_audit_command import \
-    TriggerAuditCommand
-from watcher.decision_engine.framework.messaging.audit_endpoint import \
-    AuditEndpoint
+from watcher.decision_engine.command.audit import TriggerAuditCommand
+from watcher.decision_engine.messaging.audit_endpoint import AuditEndpoint
 from watcher.metrics_engine.cluster_model_collector.manager import \
     CollectorManager
 from watcher.tests import base
diff --git a/watcher/tests/decision_engine/api/strategy/__init__.py b/watcher/tests/decision_engine/meta_actions/__init__.py
similarity index 100%
rename from watcher/tests/decision_engine/api/strategy/__init__.py
rename to watcher/tests/decision_engine/meta_actions/__init__.py
diff --git a/watcher/tests/decision_engine/framework/meta_actions/test_migrate.py b/watcher/tests/decision_engine/meta_actions/test_migrate.py
similarity index 82%
rename from watcher/tests/decision_engine/framework/meta_actions/test_migrate.py
rename to watcher/tests/decision_engine/meta_actions/test_migrate.py
index 34d085169..d86b0b492 100644
--- a/watcher/tests/decision_engine/framework/meta_actions/test_migrate.py
+++ b/watcher/tests/decision_engine/meta_actions/test_migrate.py
@@ -16,9 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from watcher.decision_engine.framework.meta_actions.migrate import Migrate
-from watcher.decision_engine.framework.model.hypervisor import Hypervisor
-from watcher.decision_engine.framework.model.vm import VM
+from watcher.decision_engine.meta_action.migrate import Migrate
+from watcher.decision_engine.model.hypervisor import Hypervisor
+from watcher.decision_engine.model.vm import VM
 from watcher.tests import base
 
 
diff --git a/watcher/tests/decision_engine/framework/__init__.py b/watcher/tests/decision_engine/model/__init__.py
similarity index 100%
rename from watcher/tests/decision_engine/framework/__init__.py
rename to watcher/tests/decision_engine/model/__init__.py
diff --git a/watcher/tests/decision_engine/framework/model/test_diskinfo.py b/watcher/tests/decision_engine/model/test_diskinfo.py
similarity index 93%
rename from watcher/tests/decision_engine/framework/model/test_diskinfo.py
rename to watcher/tests/decision_engine/model/test_diskinfo.py
index 143e4198c..a8adc4d2e 100644
--- a/watcher/tests/decision_engine/framework/model/test_diskinfo.py
+++ b/watcher/tests/decision_engine/model/test_diskinfo.py
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-from watcher.decision_engine.framework.model.diskInfo import DiskInfo
+from watcher.decision_engine.model.diskInfo import DiskInfo
 from watcher.tests import base
 
 
diff --git a/watcher/tests/decision_engine/framework/model/test_mapping.py b/watcher/tests/decision_engine/model/test_mapping.py
similarity index 96%
rename from watcher/tests/decision_engine/framework/model/test_mapping.py
rename to watcher/tests/decision_engine/model/test_mapping.py
index 556571868..bef582525 100644
--- a/watcher/tests/decision_engine/framework/model/test_mapping.py
+++ b/watcher/tests/decision_engine/model/test_mapping.py
@@ -17,8 +17,8 @@
 # limitations under the License.
 #
 import uuid
-from watcher.decision_engine.framework.model.hypervisor import Hypervisor
-from watcher.decision_engine.framework.model.vm_state import VMState
+from watcher.decision_engine.model.hypervisor import Hypervisor
+from watcher.decision_engine.model.vm_state import VMState
 from watcher.tests import base
 from watcher.tests.decision_engine.faker_cluster_state import \
     FakerModelCollector
diff --git a/watcher/tests/decision_engine/framework/model/test_model.py b/watcher/tests/decision_engine/model/test_model.py
similarity index 95%
rename from watcher/tests/decision_engine/framework/model/test_model.py
rename to watcher/tests/decision_engine/model/test_model.py
index 1a5401499..c5bfa81ab 100644
--- a/watcher/tests/decision_engine/framework/model/test_model.py
+++ b/watcher/tests/decision_engine/model/test_model.py
@@ -19,10 +19,9 @@
 import uuid
 from watcher.common import exception
 from watcher.common.exception import IllegalArgumentException
-from watcher.decision_engine.framework.model.hypervisor import Hypervisor
-from watcher.decision_engine.framework.model.hypervisor_state import \
-    HypervisorState
-from watcher.decision_engine.framework.model.model_root import ModelRoot
+from watcher.decision_engine.model.hypervisor import Hypervisor
+from watcher.decision_engine.model.hypervisor_state import HypervisorState
+from watcher.decision_engine.model.model_root import ModelRoot
 from watcher.tests.decision_engine.faker_cluster_state import \
     FakerModelCollector
 
diff --git a/watcher/tests/decision_engine/framework/model/test_named_element.py b/watcher/tests/decision_engine/model/test_named_element.py
similarity index 92%
rename from watcher/tests/decision_engine/framework/model/test_named_element.py
rename to watcher/tests/decision_engine/model/test_named_element.py
index 0c5d00cd6..015e439e3 100644
--- a/watcher/tests/decision_engine/framework/model/test_named_element.py
+++ b/watcher/tests/decision_engine/model/test_named_element.py
@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from watcher.decision_engine.framework.model.named_element import NamedElement
+from watcher.decision_engine.model.named_element import NamedElement
 from watcher.tests import base
 
 
diff --git a/watcher/tests/decision_engine/framework/model/test_vm.py b/watcher/tests/decision_engine/model/test_vm.py
similarity index 88%
rename from watcher/tests/decision_engine/framework/model/test_vm.py
rename to watcher/tests/decision_engine/model/test_vm.py
index 0c0a4b8a1..e1527dc12 100644
--- a/watcher/tests/decision_engine/framework/model/test_vm.py
+++ b/watcher/tests/decision_engine/model/test_vm.py
@@ -16,8 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from watcher.decision_engine.framework.model.vm import VM
-from watcher.decision_engine.framework.model.vm_state import VMState
+from watcher.decision_engine.model.vm import VM
+from watcher.decision_engine.model.vm_state import VMState
 from watcher.tests import base
 
 
diff --git a/watcher/tests/decision_engine/strategies/__init__.py b/watcher/tests/decision_engine/strategies/__init__.py
deleted file mode 100644
index 2327bf100..000000000
--- a/watcher/tests/decision_engine/strategies/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__author__ = 'Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>'
diff --git a/watcher/tests/decision_engine/framework/command/__init__.py b/watcher/tests/decision_engine/strategy/__init__.py
similarity index 100%
rename from watcher/tests/decision_engine/framework/command/__init__.py
rename to watcher/tests/decision_engine/strategy/__init__.py
diff --git a/watcher/tests/decision_engine/framework/event_consumer/__init__.py b/watcher/tests/decision_engine/strategy/context/__init__.py
similarity index 100%
rename from watcher/tests/decision_engine/framework/event_consumer/__init__.py
rename to watcher/tests/decision_engine/strategy/context/__init__.py
diff --git a/watcher/tests/decision_engine/framework/strategy/test_strategy_context.py b/watcher/tests/decision_engine/strategy/context/test_strategy_context.py
similarity index 91%
rename from watcher/tests/decision_engine/framework/strategy/test_strategy_context.py
rename to watcher/tests/decision_engine/strategy/context/test_strategy_context.py
index a9b66d651..9d7905d10 100644
--- a/watcher/tests/decision_engine/framework/strategy/test_strategy_context.py
+++ b/watcher/tests/decision_engine/strategy/context/test_strategy_context.py
@@ -14,8 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from watcher.decision_engine.framework.strategy.strategy_context import \
-    StrategyContext
+from watcher.decision_engine.strategy.context.default import StrategyContext
 from watcher.tests import base
 
 
diff --git a/watcher/tests/decision_engine/framework/messaging/__init__.py b/watcher/tests/decision_engine/strategy/selector/__init__.py
similarity index 100%
rename from watcher/tests/decision_engine/framework/messaging/__init__.py
rename to watcher/tests/decision_engine/strategy/selector/__init__.py
diff --git a/watcher/tests/decision_engine/framework/strategy/test_strategy_selector.py b/watcher/tests/decision_engine/strategy/selector/test_strategy_selector.py
similarity index 89%
rename from watcher/tests/decision_engine/framework/strategy/test_strategy_selector.py
rename to watcher/tests/decision_engine/strategy/selector/test_strategy_selector.py
index 87736564b..ed33b6dc0 100644
--- a/watcher/tests/decision_engine/framework/strategy/test_strategy_selector.py
+++ b/watcher/tests/decision_engine/strategy/selector/test_strategy_selector.py
@@ -15,10 +15,8 @@
 # limitations under the License.
 import mock
 from oslo_config import cfg
-from watcher.decision_engine.framework.strategy.strategy_loader import \
-    StrategyLoader
-from watcher.decision_engine.framework.strategy.strategy_selector import \
-    StrategySelector
+from watcher.decision_engine.strategy.loader import StrategyLoader
+from watcher.decision_engine.strategy.selector.default import StrategySelector
 from watcher.objects.audit_template import Goal
 from watcher.tests import base
 
diff --git a/watcher/tests/decision_engine/framework/strategy/test_strategy_loader.py b/watcher/tests/decision_engine/strategy/test_strategy_loader.py
similarity index 88%
rename from watcher/tests/decision_engine/framework/strategy/test_strategy_loader.py
rename to watcher/tests/decision_engine/strategy/test_strategy_loader.py
index eb63c6992..3f78f1944 100644
--- a/watcher/tests/decision_engine/framework/strategy/test_strategy_loader.py
+++ b/watcher/tests/decision_engine/strategy/test_strategy_loader.py
@@ -13,9 +13,8 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from watcher.decision_engine.api.strategy.strategy import BaseStrategy
-from watcher.decision_engine.framework.strategy.strategy_loader import \
-    StrategyLoader
+from watcher.decision_engine.strategy.base import BaseStrategy
+from watcher.decision_engine.strategy.loader import StrategyLoader
 from watcher.tests import base
 
 
diff --git a/watcher/tests/decision_engine/strategies/test_basic_consolidation.py b/watcher/tests/decision_engine/test_basic_consolidation.py
similarity index 96%
rename from watcher/tests/decision_engine/strategies/test_basic_consolidation.py
rename to watcher/tests/decision_engine/test_basic_consolidation.py
index 6801ea21b..2e11ba3dc 100644
--- a/watcher/tests/decision_engine/strategies/test_basic_consolidation.py
+++ b/watcher/tests/decision_engine/test_basic_consolidation.py
@@ -23,14 +23,13 @@ from mock import MagicMock
 
 from watcher.common import exception
 
-from watcher.decision_engine.framework.meta_actions.hypervisor_state import \
+from watcher.decision_engine.meta_action.hypervisor_state import \
     ChangeHypervisorState
-from watcher.decision_engine.framework.meta_actions.power_state import \
-    ChangePowerState
+from watcher.decision_engine.meta_action.power_state import ChangePowerState
 
-from watcher.decision_engine.framework.meta_actions.migrate import Migrate
-from watcher.decision_engine.framework.model.model_root import ModelRoot
-from watcher.decision_engine.strategies.basic_consolidation import \
+from watcher.decision_engine.meta_action.migrate import Migrate
+from watcher.decision_engine.model.model_root import ModelRoot
+from watcher.decision_engine.strategy.basic_consolidation import \
     BasicConsolidation
 from watcher.tests import base
 from watcher.tests.decision_engine.faker_cluster_state import \
diff --git a/watcher/tests/decision_engine/framework/test_default_planner.py b/watcher/tests/decision_engine/test_default_planner.py
similarity index 96%
rename from watcher/tests/decision_engine/framework/test_default_planner.py
rename to watcher/tests/decision_engine/test_default_planner.py
index f6f9f0158..8bc6fef3e 100644
--- a/watcher/tests/decision_engine/framework/test_default_planner.py
+++ b/watcher/tests/decision_engine/test_default_planner.py
@@ -19,8 +19,8 @@ from mock import MagicMock
 from watcher.common.exception import MetaActionNotFound
 from watcher.common import utils
 from watcher.db import api as db_api
-from watcher.decision_engine.framework.default_planner import DefaultPlanner
-from watcher.decision_engine.strategies.basic_consolidation import \
+from watcher.decision_engine.planner.default import DefaultPlanner
+from watcher.decision_engine.strategy.basic_consolidation import \
     BasicConsolidation
 
 from watcher.tests.db import base
diff --git a/watcher/tests/decision_engine/framework/test_default_solution.py b/watcher/tests/decision_engine/test_default_solution.py
similarity index 91%
rename from watcher/tests/decision_engine/framework/test_default_solution.py
rename to watcher/tests/decision_engine/test_default_solution.py
index bc00fe28e..ca27e3026 100644
--- a/watcher/tests/decision_engine/framework/test_default_solution.py
+++ b/watcher/tests/decision_engine/test_default_solution.py
@@ -13,7 +13,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from watcher.decision_engine.framework.default_solution import DefaultSolution
+from watcher.decision_engine.solution.default import DefaultSolution
 from watcher.tests import base
 
 
diff --git a/watcher/tests/decision_engine/strategies/test_dummy_strategy.py b/watcher/tests/decision_engine/test_dummy_strategy.py
similarity index 93%
rename from watcher/tests/decision_engine/strategies/test_dummy_strategy.py
rename to watcher/tests/decision_engine/test_dummy_strategy.py
index 8ae444449..aea1a2307 100644
--- a/watcher/tests/decision_engine/strategies/test_dummy_strategy.py
+++ b/watcher/tests/decision_engine/test_dummy_strategy.py
@@ -13,7 +13,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from watcher.decision_engine.strategies.dummy_strategy import DummyStrategy
+from watcher.decision_engine.strategy.dummy_strategy import DummyStrategy
 from watcher.tests import base
 from watcher.tests.decision_engine.faker_cluster_state import \
     FakerModelCollector
diff --git a/watcher/tests/decision_engine/framework/test_manager.py b/watcher/tests/decision_engine/test_manager.py
similarity index 84%
rename from watcher/tests/decision_engine/framework/test_manager.py
rename to watcher/tests/decision_engine/test_manager.py
index 1ba4b9fad..0288df6c0 100644
--- a/watcher/tests/decision_engine/framework/test_manager.py
+++ b/watcher/tests/decision_engine/test_manager.py
@@ -18,14 +18,12 @@ import mock
 
 from watcher.common import utils
 
-from watcher.decision_engine.framework.events.event_consumer_factory import \
-    EventConsumerFactory
+from watcher.decision_engine.event.consumer_factory import EventConsumerFactory
 
 from watcher.common.messaging.events.event import Event
-from watcher.decision_engine.framework.manager import \
-    DecisionEngineManager
+from watcher.decision_engine.manager import DecisionEngineManager
 
-from watcher.decision_engine.framework.messaging.events import Events
+from watcher.decision_engine.messaging.events import Events
 from watcher.tests import base
 
 
diff --git a/watcher/tests/decision_engine/api/strategy/test_meta_action.py b/watcher/tests/decision_engine/test_meta_action.py
similarity index 92%
rename from watcher/tests/decision_engine/api/strategy/test_meta_action.py
rename to watcher/tests/decision_engine/test_meta_action.py
index f8859b7f3..24c692746 100644
--- a/watcher/tests/decision_engine/api/strategy/test_meta_action.py
+++ b/watcher/tests/decision_engine/test_meta_action.py
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from watcher.decision_engine.api.strategy.meta_action import MetaAction
+from watcher.decision_engine.meta_action.base import MetaAction
 from watcher.tests import base
 
 
diff --git a/watcher/tests/decision_engine/framework/test_rpcapi.py b/watcher/tests/decision_engine/test_rpcapi.py
similarity index 96%
rename from watcher/tests/decision_engine/framework/test_rpcapi.py
rename to watcher/tests/decision_engine/test_rpcapi.py
index cc7dfc24d..f7250543b 100644
--- a/watcher/tests/decision_engine/framework/test_rpcapi.py
+++ b/watcher/tests/decision_engine/test_rpcapi.py
@@ -18,7 +18,7 @@ import mock
 import oslo_messaging as om
 from watcher.common import exception
 from watcher.common import utils
-from watcher.decision_engine.framework.rpcapi import DecisionEngineAPI
+from watcher.decision_engine.rpcapi import DecisionEngineAPI
 from watcher.tests import base
 
 
diff --git a/watcher/tests/decision_engine/test_strategy_loader.py b/watcher/tests/decision_engine/test_strategy_loader.py
index 673ab791b..c35cead80 100644
--- a/watcher/tests/decision_engine/test_strategy_loader.py
+++ b/watcher/tests/decision_engine/test_strategy_loader.py
@@ -19,16 +19,14 @@ from __future__ import unicode_literals
 from mock import patch
 from stevedore.extension import Extension
 from stevedore.extension import ExtensionManager
-from watcher.decision_engine.framework.strategy.strategy_loader import \
-    StrategyLoader
-from watcher.decision_engine.strategies.dummy_strategy import DummyStrategy
+from watcher.decision_engine.strategy.dummy_strategy import DummyStrategy
+from watcher.decision_engine.strategy.loader import StrategyLoader
 from watcher.tests import base
 
 
 class TestLoader(base.BaseTestCase):
 
-    @patch("watcher.decision_engine.framework.strategy."
-           "strategy_loader.ExtensionManager")
+    @patch("watcher.decision_engine.strategy.loader.ExtensionManager")
     def test_strategy_loader(self, m_extension_manager):
         dummy_strategy_name = "dummy"
         m_extension_manager.return_value = ExtensionManager.make_test_instance(