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 37ef09392..139e5bdc9 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
@@ -41,6 +41,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.orders.materials.AssignedMaterialsToOrderElementController;
 import org.navalplanner.web.planner.order.IOrderPlanningGate;
 import org.navalplanner.web.tree.TreeComponent;
 import org.navalplanner.web.users.OrderAuthorizationController;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
index af1778826..d6328b916 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
@@ -25,6 +25,7 @@ import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.orders.entities.OrderLine;
 import org.navalplanner.business.orders.entities.OrderLineGroup;
 import org.navalplanner.web.common.Util;
+import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.SuspendNotAllowedException;
 import org.zkoss.zk.ui.event.Event;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java
similarity index 99%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java
index f09f7ef11..a7e229e91 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.orders;
+package org.navalplanner.web.orders.materials;
 
 import static org.navalplanner.web.I18nHelper._;
 
@@ -37,6 +37,7 @@ import org.navalplanner.business.materials.entities.MaterialAssignment;
 import org.navalplanner.business.materials.entities.MaterialCategory;
 import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.web.common.Util;
+import org.navalplanner.web.orders.IOrderElementModel;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.SuspendNotAllowedException;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementModel.java
similarity index 99%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementModel.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementModel.java
index 04739371e..2713bb420 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementModel.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.orders;
+package org.navalplanner.web.orders.materials;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -33,6 +33,7 @@ import org.navalplanner.business.materials.entities.MaterialAssignment;
 import org.navalplanner.business.materials.entities.MaterialCategory;
 import org.navalplanner.business.orders.daos.IOrderElementDAO;
 import org.navalplanner.business.orders.entities.OrderElement;
+import org.navalplanner.web.orders.IOrderElementModel;
 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/orders/IAssignedMaterialsToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/IAssignedMaterialsToOrderElementModel.java
similarity index 96%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedMaterialsToOrderElementModel.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/IAssignedMaterialsToOrderElementModel.java
index d62940ac7..ab17f763d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedMaterialsToOrderElementModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/IAssignedMaterialsToOrderElementModel.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.orders;
+package org.navalplanner.web.orders.materials;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -27,6 +27,7 @@ import org.navalplanner.business.materials.entities.Material;
 import org.navalplanner.business.materials.entities.MaterialAssignment;
 import org.navalplanner.business.materials.entities.MaterialCategory;
 import org.navalplanner.business.orders.entities.OrderElement;
+import org.navalplanner.web.orders.IOrderElementModel;
 import org.zkoss.zul.TreeModel;
 
 
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
index 8bc312d69..c84cd6da8 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
@@ -19,7 +19,7 @@
 -->
 
 <vbox id="${arg.id}"
-    apply="org.navalplanner.web.orders.AssignedMaterialsToOrderElementController" >
+    apply="org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController" >
 
     <zscript>
         Object[] unitTypes = org.navalplanner.business.materials.entities.UnitTypeEnum