diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index d7d351839..9c6efdc9f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -35,7 +35,7 @@ import org.navalplanner.web.common.Level;
 import org.navalplanner.web.common.MessagesForUser;
 import org.navalplanner.web.common.OnlyOneVisible;
 import org.navalplanner.web.common.Util;
-import org.navalplanner.web.planner.IOrderPlanningGate;
+import org.navalplanner.web.planner.order.IOrderPlanningGate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationCommand.java
index 795ca1a9e..b9b867dbc 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationCommand.java
@@ -21,7 +21,7 @@
 package org.navalplanner.web.planner.allocation;
 
 import org.navalplanner.business.planner.entities.TaskElement;
-import org.navalplanner.web.planner.PlanningState;
+import org.navalplanner.web.planner.order.PlanningState;
 import org.zkoss.ganttz.extensions.ICommandOnTask;
 
 /**
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java
index c9eb98d86..e740c0de0 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java
@@ -28,7 +28,7 @@ import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.Worker;
-import org.navalplanner.web.planner.PlanningState;
+import org.navalplanner.web.planner.order.PlanningState;
 
 /**
  * Contract for {@link Task}.
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java
index cfede6602..4c89648f3 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java
@@ -24,7 +24,7 @@ import static org.navalplanner.web.I18nHelper._;
 
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.planner.entities.TaskElement;
-import org.navalplanner.web.planner.PlanningState;
+import org.navalplanner.web.planner.order.PlanningState;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
index d03b1e822..506839e4d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
@@ -46,9 +46,9 @@ import org.navalplanner.web.common.MessagesForUser;
 import org.navalplanner.web.common.Util;
 import org.navalplanner.web.common.ViewSwitcher;
 import org.navalplanner.web.common.components.WorkerSearch;
-import org.navalplanner.web.planner.PlanningState;
 import org.navalplanner.web.planner.allocation.AdvancedAllocationController.IAdvanceAllocationResultReceiver;
 import org.navalplanner.web.planner.allocation.AdvancedAllocationController.Restriction;
+import org.navalplanner.web.planner.order.PlanningState;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.zkoss.ganttz.util.OnZKDesktopRegistry;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
index 61302109c..004973938 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
@@ -37,7 +37,7 @@ import org.navalplanner.business.resources.entities.CriterionSatisfaction;
 import org.navalplanner.business.resources.entities.CriterionType;
 import org.navalplanner.business.resources.entities.Resource;
 import org.navalplanner.business.resources.entities.Worker;
-import org.navalplanner.web.planner.PlanningState;
+import org.navalplanner.web.planner.order.PlanningState;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java
index 583502977..deefb47f7 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/AddMilestoneCommand.java
@@ -26,7 +26,7 @@ import org.navalplanner.business.planner.daos.ITaskElementDAO;
 import org.navalplanner.business.planner.entities.TaskElement;
 import org.navalplanner.business.planner.entities.TaskGroup;
 import org.navalplanner.business.planner.entities.TaskMilestone;
-import org.navalplanner.web.planner.PlanningState;
+import org.navalplanner.web.planner.order.PlanningState;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/IAddMilestoneCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/IAddMilestoneCommand.java
index ab72dfba1..42cd5ba31 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/IAddMilestoneCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/milestone/IAddMilestoneCommand.java
@@ -21,7 +21,7 @@
 package org.navalplanner.web.planner.milestone;
 
 import org.navalplanner.business.planner.entities.TaskElement;
-import org.navalplanner.web.planner.PlanningState;
+import org.navalplanner.web.planner.order.PlanningState;
 import org.zkoss.ganttz.extensions.ICommandOnTask;
 
 /**
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningGate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningGate.java
similarity index 96%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningGate.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningGate.java
index 388e84729..bb236de70 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningGate.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningGate.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.order;
 
 import org.navalplanner.business.orders.entities.Order;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningModel.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningModel.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningModel.java
index 8671401d9..2095b96fc 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningModel.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.order;
 
 import java.util.List;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ISaveCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/ISaveCommand.java
similarity index 96%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ISaveCommand.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/ISaveCommand.java
index 98648a531..2753d1331 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ISaveCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/ISaveCommand.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.order;
 
 import org.navalplanner.business.planner.entities.TaskElement;
 import org.zkoss.ganttz.extensions.ICommand;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
similarity index 99%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
index e673f2b83..2349c9265 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.order;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
similarity index 99%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
index 83cbc713b..6e68b3591 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.order;
 
 import static org.navalplanner.web.I18nHelper._;
 
@@ -45,7 +45,7 @@ import org.navalplanner.business.planner.entities.TaskMilestone;
 import org.navalplanner.business.resources.daos.IResourceDAO;
 import org.navalplanner.business.resources.entities.Resource;
 import org.navalplanner.web.common.ViewSwitcher;
-import org.navalplanner.web.planner.ISaveCommand.IAfterSaveListener;
+import org.navalplanner.web.planner.ITaskElementAdapter;
 import org.navalplanner.web.planner.ITaskElementAdapter.IOnMoveListener;
 import org.navalplanner.web.planner.allocation.IResourceAllocationCommand;
 import org.navalplanner.web.planner.allocation.ResourceAllocationController;
@@ -54,6 +54,7 @@ import org.navalplanner.web.planner.calendar.ICalendarAllocationCommand;
 import org.navalplanner.web.planner.loadchart.LoadChart;
 import org.navalplanner.web.planner.loadchart.LoadChartFiller;
 import org.navalplanner.web.planner.milestone.IAddMilestoneCommand;
+import org.navalplanner.web.planner.order.ISaveCommand.IAfterSaveListener;
 import org.navalplanner.web.planner.splitting.IMergeTaskCommand;
 import org.navalplanner.web.planner.splitting.ISplitTaskCommand;
 import org.navalplanner.web.planner.splitting.SplittingController;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/PlanningState.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningState.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/PlanningState.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningState.java
index 5b123d0bb..f876d7972 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/PlanningState.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningState.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.order;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/SaveCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/SaveCommand.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java
index f4ce78e93..074ba9806 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/SaveCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.order;
 
 import static org.navalplanner.web.I18nHelper._;
 
@@ -39,6 +39,7 @@ import org.navalplanner.business.planner.entities.ResourceAllocation;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.planner.entities.TaskElement;
 import org.navalplanner.business.planner.entities.TaskGroup;
+import org.navalplanner.web.planner.order.ISaveCommand.IAfterSaveListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/IMergeTaskCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/IMergeTaskCommand.java
index 710722515..a0b74b37f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/IMergeTaskCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/IMergeTaskCommand.java
@@ -21,7 +21,7 @@
 package org.navalplanner.web.planner.splitting;
 
 import org.navalplanner.business.planner.entities.TaskElement;
-import org.navalplanner.web.planner.PlanningState;
+import org.navalplanner.web.planner.order.PlanningState;
 import org.zkoss.ganttz.extensions.ICommandOnTask;
 
 public interface IMergeTaskCommand extends ICommandOnTask<TaskElement> {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ISplitTaskCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ISplitTaskCommand.java
index c72101922..fb73be9ea 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ISplitTaskCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ISplitTaskCommand.java
@@ -21,7 +21,7 @@
 package org.navalplanner.web.planner.splitting;
 
 import org.navalplanner.business.planner.entities.TaskElement;
-import org.navalplanner.web.planner.PlanningState;
+import org.navalplanner.web.planner.order.PlanningState;
 import org.zkoss.ganttz.extensions.ICommandOnTask;
 
 public interface ISplitTaskCommand extends ICommandOnTask<TaskElement> {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java
index bf4c8b947..f40a471c6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java
@@ -23,7 +23,7 @@ package org.navalplanner.web.planner.splitting;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.planner.entities.TaskElement;
 import org.navalplanner.business.planner.entities.TaskGroup;
-import org.navalplanner.web.planner.PlanningState;
+import org.navalplanner.web.planner.order.PlanningState;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplitTaskCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplitTaskCommand.java
index d8585e9fe..cbfd78542 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplitTaskCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplitTaskCommand.java
@@ -25,7 +25,7 @@ import java.util.List;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.planner.entities.TaskElement;
 import org.navalplanner.business.planner.entities.TaskGroup;
-import org.navalplanner.web.planner.PlanningState;
+import org.navalplanner.web.planner.order.PlanningState;
 import org.navalplanner.web.planner.splitting.SplittingController.IActionOnOk;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
index a40ace68a..f99de052b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
@@ -27,8 +27,8 @@ import java.util.List;
 import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.web.orders.OrderCRUDController;
 import org.navalplanner.web.planner.CompanyPlanningController;
-import org.navalplanner.web.planner.IOrderPlanningGate;
-import org.navalplanner.web.planner.OrderPlanningController;
+import org.navalplanner.web.planner.order.IOrderPlanningGate;
+import org.navalplanner.web.planner.order.OrderPlanningController;
 import org.navalplanner.web.planner.tabs.Mode.ModeTypeChangedListener;
 import org.navalplanner.web.resourceload.ResourceLoadController;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
index 79752c074..f44f73d6c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
@@ -28,7 +28,7 @@ import java.util.Map;
 
 import org.navalplanner.web.common.Util;
 import org.navalplanner.web.orders.OrderCRUDController;
-import org.navalplanner.web.planner.IOrderPlanningGate;
+import org.navalplanner.web.planner.order.IOrderPlanningGate;
 import org.navalplanner.web.planner.tabs.CreatedOnDemandTab.IComponentCreator;
 import org.zkoss.ganttz.extensions.ITab;
 import org.zkoss.zk.ui.Component;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
index 0a10615b9..2d819db58 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
@@ -33,7 +33,7 @@ import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.planner.entities.TaskElement;
 import org.navalplanner.web.planner.CompanyPlanningController;
-import org.navalplanner.web.planner.OrderPlanningController;
+import org.navalplanner.web.planner.order.OrderPlanningController;
 import org.navalplanner.web.planner.tabs.CreatedOnDemandTab.IComponentCreator;
 import org.zkoss.ganttz.extensions.ICommandOnTask;
 import org.zkoss.ganttz.extensions.IContextWithPlannerTask;
diff --git a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml
index b13275d8b..d26692fd7 100644
--- a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml
+++ b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml
@@ -23,7 +23,7 @@
     <context:annotation-config />
     <bean class="org.navalplanner.web.common.entrypoints.RedirectorSynthetiser"></bean>
 
-    <bean class="org.navalplanner.web.planner.OrderPlanningModel" scope="prototype">
+    <bean class="org.navalplanner.web.planner.order.OrderPlanningModel" scope="prototype">
       <lookup-method name="getTaskElementAdapter" bean="taskElementAdapter"/>
       <lookup-method name="getSaveCommand" bean="saveCommand"/>
       <lookup-method name="getResourceAllocationCommand" bean="resourceAllocationCommand"/>