diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/AdvanceMeasurementDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/AdvanceMeasurementDTO.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/AdvanceMeasurementDTO.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/AdvanceMeasurementDTO.java
index d3a149be7..2ad0716e6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/AdvanceMeasurementDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/AdvanceMeasurementDTO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.api;
+package org.navalplanner.ws.common.api;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/CriterionRequirementDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/CriterionRequirementDTO.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/CriterionRequirementDTO.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/CriterionRequirementDTO.java
index 5efad3dda..a7094c628 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/CriterionRequirementDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/CriterionRequirementDTO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.api;
+package org.navalplanner.ws.common.api;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/DirectCriterionRequirementDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/DirectCriterionRequirementDTO.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/DirectCriterionRequirementDTO.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/DirectCriterionRequirementDTO.java
index ab9ce5438..80941bd49 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/DirectCriterionRequirementDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/DirectCriterionRequirementDTO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.api;
+package org.navalplanner.ws.common.api;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/HoursGroupDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/HoursGroupDTO.java
similarity index 96%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/HoursGroupDTO.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/HoursGroupDTO.java
index 84eca3fa5..f04aa3cd6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/HoursGroupDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/HoursGroupDTO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.api;
+package org.navalplanner.ws.common.api;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlElements;
 
 import org.navalplanner.business.orders.entities.HoursGroup;
-import org.navalplanner.ws.common.api.ResourceEnumDTO;
 
 /**
  * DTO for {@link HoursGroup} entity.
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/IndirectCriterionRequirementDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/IndirectCriterionRequirementDTO.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/IndirectCriterionRequirementDTO.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/IndirectCriterionRequirementDTO.java
index 1cc2e18b4..63402df29 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/IndirectCriterionRequirementDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/IndirectCriterionRequirementDTO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.api;
+package org.navalplanner.ws.common.api;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/LabelDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/LabelDTO.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/LabelDTO.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/LabelDTO.java
index 9fba344b3..ecf7030fa 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/LabelDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/LabelDTO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.api;
+package org.navalplanner.ws.common.api;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/MaterialAssignmentDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/MaterialAssignmentDTO.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/MaterialAssignmentDTO.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/MaterialAssignmentDTO.java
index a86d43de2..1b0b4f62c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/MaterialAssignmentDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/MaterialAssignmentDTO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.api;
+package org.navalplanner.ws.common.api;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderDTO.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderDTO.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderDTO.java
index f6fbcbce6..02a87bff3 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderDTO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.api;
+package org.navalplanner.ws.common.api;
 
 import java.util.Date;
 import java.util.List;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderElementDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderElementDTO.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderElementDTO.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderElementDTO.java
index 72f6397c6..55213085b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderElementDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderElementDTO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.api;
+package org.navalplanner.ws.common.api;
 
 import java.util.Date;
 import java.util.HashSet;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderLineDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderLineDTO.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderLineDTO.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderLineDTO.java
index 1e274cb07..ac4e9d5be 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderLineDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderLineDTO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.api;
+package org.navalplanner.ws.common.api;
 
 import java.util.Date;
 import java.util.HashSet;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderLineGroupDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderLineGroupDTO.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderLineGroupDTO.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderLineGroupDTO.java
index 3c1b6bcd2..21242c3a5 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/OrderLineGroupDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/api/OrderLineGroupDTO.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.api;
+package org.navalplanner.ws.common.api;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/ConfigurationOrderElementConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ConfigurationOrderElementConverter.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/ConfigurationOrderElementConverter.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ConfigurationOrderElementConverter.java
index 4724325bf..d68201b84 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/ConfigurationOrderElementConverter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/ConfigurationOrderElementConverter.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.impl;
+package org.navalplanner.ws.common.impl;
 
 
 /**
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementConverter.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java
index 420969a43..90f05461c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementConverter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.ws.orders.impl;
+package org.navalplanner.ws.common.impl;
 
 import static org.navalplanner.web.I18nHelper._;
 
@@ -56,20 +56,19 @@ import org.navalplanner.business.requirements.entities.DirectCriterionRequiremen
 import org.navalplanner.business.requirements.entities.IndirectCriterionRequirement;
 import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.ResourceEnum;
+import org.navalplanner.ws.common.api.AdvanceMeasurementDTO;
+import org.navalplanner.ws.common.api.CriterionRequirementDTO;
+import org.navalplanner.ws.common.api.DirectCriterionRequirementDTO;
+import org.navalplanner.ws.common.api.HoursGroupDTO;
 import org.navalplanner.ws.common.api.IncompatibleTypeException;
+import org.navalplanner.ws.common.api.IndirectCriterionRequirementDTO;
+import org.navalplanner.ws.common.api.LabelDTO;
+import org.navalplanner.ws.common.api.MaterialAssignmentDTO;
+import org.navalplanner.ws.common.api.OrderDTO;
+import org.navalplanner.ws.common.api.OrderElementDTO;
+import org.navalplanner.ws.common.api.OrderLineDTO;
+import org.navalplanner.ws.common.api.OrderLineGroupDTO;
 import org.navalplanner.ws.common.api.ResourceEnumDTO;
-import org.navalplanner.ws.common.impl.ResourceEnumConverter;
-import org.navalplanner.ws.orders.api.AdvanceMeasurementDTO;
-import org.navalplanner.ws.orders.api.CriterionRequirementDTO;
-import org.navalplanner.ws.orders.api.DirectCriterionRequirementDTO;
-import org.navalplanner.ws.orders.api.HoursGroupDTO;
-import org.navalplanner.ws.orders.api.IndirectCriterionRequirementDTO;
-import org.navalplanner.ws.orders.api.LabelDTO;
-import org.navalplanner.ws.orders.api.MaterialAssignmentDTO;
-import org.navalplanner.ws.orders.api.OrderDTO;
-import org.navalplanner.ws.orders.api.OrderElementDTO;
-import org.navalplanner.ws.orders.api.OrderLineDTO;
-import org.navalplanner.ws.orders.api.OrderLineGroupDTO;
 
 /**
  * Converter from/to {@link OrderElement} entities to/from DTOs.
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/IOrderElementService.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/IOrderElementService.java
index bb84aa787..c4eaaaf31 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/IOrderElementService.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/IOrderElementService.java
@@ -24,6 +24,8 @@ import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.ws.common.api.IncompatibleTypeException;
 import org.navalplanner.ws.common.api.InstanceConstraintViolationsListDTO;
+import org.navalplanner.ws.common.api.OrderDTO;
+import org.navalplanner.ws.common.api.OrderElementDTO;
 
 /**
  * Service for managing {@link OrderElement} entities.
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementServiceREST.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementServiceREST.java
index c763dd61b..9ef8f4da6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementServiceREST.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementServiceREST.java
@@ -39,11 +39,13 @@ import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.ws.common.api.IncompatibleTypeException;
 import org.navalplanner.ws.common.api.InstanceConstraintViolationsDTO;
 import org.navalplanner.ws.common.api.InstanceConstraintViolationsListDTO;
+import org.navalplanner.ws.common.api.OrderDTO;
+import org.navalplanner.ws.common.api.OrderElementDTO;
+import org.navalplanner.ws.common.impl.ConfigurationOrderElementConverter;
 import org.navalplanner.ws.common.impl.ConstraintViolationConverter;
+import org.navalplanner.ws.common.impl.OrderElementConverter;
 import org.navalplanner.ws.common.impl.Util;
 import org.navalplanner.ws.orders.api.IOrderElementService;
-import org.navalplanner.ws.orders.api.OrderDTO;
-import org.navalplanner.ws.orders.api.OrderElementDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java
index 540aaecc4..144f2cd3c 100644
--- a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java
+++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java
@@ -66,21 +66,21 @@ import org.navalplanner.business.requirements.entities.DirectCriterionRequiremen
 import org.navalplanner.business.requirements.entities.IndirectCriterionRequirement;
 import org.navalplanner.business.resources.entities.PredefinedCriterionTypes;
 import org.navalplanner.business.resources.entities.ResourceEnum;
+import org.navalplanner.ws.common.api.AdvanceMeasurementDTO;
 import org.navalplanner.ws.common.api.ConstraintViolationDTO;
+import org.navalplanner.ws.common.api.CriterionRequirementDTO;
+import org.navalplanner.ws.common.api.DirectCriterionRequirementDTO;
+import org.navalplanner.ws.common.api.HoursGroupDTO;
 import org.navalplanner.ws.common.api.IncompatibleTypeException;
+import org.navalplanner.ws.common.api.IndirectCriterionRequirementDTO;
 import org.navalplanner.ws.common.api.InstanceConstraintViolationsDTO;
+import org.navalplanner.ws.common.api.LabelDTO;
+import org.navalplanner.ws.common.api.MaterialAssignmentDTO;
+import org.navalplanner.ws.common.api.OrderDTO;
+import org.navalplanner.ws.common.api.OrderLineDTO;
+import org.navalplanner.ws.common.api.OrderLineGroupDTO;
 import org.navalplanner.ws.common.api.ResourceEnumDTO;
-import org.navalplanner.ws.orders.api.AdvanceMeasurementDTO;
-import org.navalplanner.ws.orders.api.CriterionRequirementDTO;
-import org.navalplanner.ws.orders.api.DirectCriterionRequirementDTO;
-import org.navalplanner.ws.orders.api.HoursGroupDTO;
 import org.navalplanner.ws.orders.api.IOrderElementService;
-import org.navalplanner.ws.orders.api.IndirectCriterionRequirementDTO;
-import org.navalplanner.ws.orders.api.LabelDTO;
-import org.navalplanner.ws.orders.api.MaterialAssignmentDTO;
-import org.navalplanner.ws.orders.api.OrderDTO;
-import org.navalplanner.ws.orders.api.OrderLineDTO;
-import org.navalplanner.ws.orders.api.OrderLineGroupDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;