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 6ad4ddc88..08f4b35f6 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
@@ -26,6 +26,7 @@ import org.navalplanner.business.orders.entities.Order;
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.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 3193c7881..7ec88e26c 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
@@ -29,6 +29,7 @@ import org.navalplanner.business.orders.entities.Order;
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.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/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
index a23b349a1..2d1a4a01d 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
@@ -48,6 +48,8 @@ import org.navalplanner.web.common.ViewSwitcher;
import org.navalplanner.web.planner.ISaveCommand.IAfterSaveListener;
import org.navalplanner.web.planner.ITaskElementAdapter.IOnMoveListener;
import org.navalplanner.web.planner.allocation.ResourceAllocationController;
+import org.navalplanner.web.planner.calendar.CalendarAllocationController;
+import org.navalplanner.web.planner.calendar.ICalendarAllocationCommand;
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/CalendarAllocationCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CalendarAllocationCommand.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java
index fcc306fcf..35b04df1e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CalendarAllocationCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationCommand.java
@@ -18,7 +18,7 @@
* along with this program. If not, see .
*/
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.calendar;
import static org.navalplanner.web.I18nHelper._;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CalendarAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationController.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CalendarAllocationController.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationController.java
index b9eeeb1df..a1bc1f3e8 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CalendarAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationController.java
@@ -18,7 +18,7 @@
* along with this program. If not, see .
*/
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.calendar;
import java.util.List;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CalendarAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationModel.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CalendarAllocationModel.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationModel.java
index 1b7091537..1e44c18d8 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CalendarAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/CalendarAllocationModel.java
@@ -18,7 +18,7 @@
* along with this program. If not, see .
*/
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.calendar;
import java.util.List;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ICalendarAllocationCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/ICalendarAllocationCommand.java
similarity index 96%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ICalendarAllocationCommand.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/ICalendarAllocationCommand.java
index fd7bddb4d..344732bc1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ICalendarAllocationCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/ICalendarAllocationCommand.java
@@ -18,7 +18,7 @@
* along with this program. If not, see .
*/
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.calendar;
import org.navalplanner.business.planner.entities.TaskElement;
import org.zkoss.ganttz.extensions.ICommandOnTask;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ICalendarAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/ICalendarAllocationModel.java
similarity index 96%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ICalendarAllocationModel.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/ICalendarAllocationModel.java
index a9e3f9123..6720388c4 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ICalendarAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/calendar/ICalendarAllocationModel.java
@@ -18,7 +18,7 @@
* along with this program. If not, see .
*/
-package org.navalplanner.web.planner;
+package org.navalplanner.web.planner.calendar;
import java.util.List;