diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningModel.java
index bf48a4af9..8671401d9 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningModel.java
@@ -27,6 +27,7 @@ import org.navalplanner.business.planner.entities.TaskElement;
 import org.navalplanner.web.common.ViewSwitcher;
 import org.navalplanner.web.planner.allocation.ResourceAllocationController;
 import org.navalplanner.web.planner.calendar.CalendarAllocationController;
+import org.navalplanner.web.planner.splitting.SplittingController;
 import org.navalplanner.web.planner.taskedition.EditTaskController;
 import org.zkoss.ganttz.Planner;
 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/OrderPlanningController.java
index 25db110db..e673f2b83 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java
@@ -30,6 +30,7 @@ import org.navalplanner.business.planner.entities.TaskElement;
 import org.navalplanner.web.common.ViewSwitcher;
 import org.navalplanner.web.planner.allocation.ResourceAllocationController;
 import org.navalplanner.web.planner.calendar.CalendarAllocationController;
+import org.navalplanner.web.planner.splitting.SplittingController;
 import org.navalplanner.web.planner.taskedition.EditTaskController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
index ae7b4277f..4cfe491d4 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
@@ -51,6 +51,9 @@ import org.navalplanner.web.planner.allocation.ResourceAllocationController;
 import org.navalplanner.web.planner.calendar.CalendarAllocationController;
 import org.navalplanner.web.planner.calendar.ICalendarAllocationCommand;
 import org.navalplanner.web.planner.milestone.IAddMilestoneCommand;
+import org.navalplanner.web.planner.splitting.IMergeTaskCommand;
+import org.navalplanner.web.planner.splitting.ISplitTaskCommand;
+import org.navalplanner.web.planner.splitting.SplittingController;
 import org.navalplanner.web.planner.taskedition.EditTaskController;
 import org.navalplanner.web.planner.taskedition.IEditTaskCommand;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IMergeTaskCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/IMergeTaskCommand.java
similarity index 91%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IMergeTaskCommand.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/IMergeTaskCommand.java
index 3a055d68e..710722515 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IMergeTaskCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/IMergeTaskCommand.java
@@ -18,9 +18,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.splitting;
 
 import org.navalplanner.business.planner.entities.TaskElement;
+import org.navalplanner.web.planner.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/ISplitTaskCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ISplitTaskCommand.java
similarity index 92%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ISplitTaskCommand.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ISplitTaskCommand.java
index 90df81a71..c72101922 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ISplitTaskCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ISplitTaskCommand.java
@@ -18,9 +18,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.splitting;
 
 import org.navalplanner.business.planner.entities.TaskElement;
+import org.navalplanner.web.planner.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/MergeTaskCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java
similarity index 95%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/MergeTaskCommand.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java
index 6591bd396..bf4c8b947 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/MergeTaskCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java
@@ -18,11 +18,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner;
+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.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/ShareBean.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ShareBean.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ShareBean.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ShareBean.java
index f85459f21..ed6bac281 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ShareBean.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ShareBean.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.splitting;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/SplitTaskCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplitTaskCommand.java
similarity index 94%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/SplitTaskCommand.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplitTaskCommand.java
index 674e3b8d9..d8585e9fe 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/SplitTaskCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplitTaskCommand.java
@@ -18,14 +18,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.splitting;
 
 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.SplittingController.IActionOnOk;
+import org.navalplanner.web.planner.PlanningState;
+import org.navalplanner.web.planner.splitting.SplittingController.IActionOnOk;
 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/SplittingController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplittingController.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/SplittingController.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplittingController.java
index 1469d0353..5cf248ce6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/SplittingController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/SplittingController.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.splitting;
 
 import java.util.List;