diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConcurrentModificationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/concurrentdetection/ConcurrentModificationController.java
similarity index 97%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConcurrentModificationController.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/common/concurrentdetection/ConcurrentModificationController.java
index ad77a97aa..738c27fcf 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConcurrentModificationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/concurrentdetection/ConcurrentModificationController.java
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.navalplanner.web.common;
+package org.navalplanner.web.common.concurrentdetection;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul b/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
index f28efaee4..7613d4752 100644
--- a/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
+++ b/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
@@ -27,7 +27,7 @@
         <!--caption>
             Erro ${requestScope['javax.servlet.error.status_code']}
         </caption-->
-        <vbox apply="org.navalplanner.web.common.ConcurrentModificationController"
+        <vbox apply="org.navalplanner.web.common.concurrentdetection.ConcurrentModificationController"
             sclass="errorbox">
             <label value="${i18n:_('Another user has modified the same data, so the operation can\'t be safely completed.')}" />
             <label value="${i18n:_('Please try it again.')}" />