diff --git a/navalplanner-webapp/src/main/webapp/planner/editTask.zul b/navalplanner-webapp/src/main/webapp/planner/editTask.zul
index f2ed666ec..9ecd02022 100644
--- a/navalplanner-webapp/src/main/webapp/planner/editTask.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/editTask.zul
@@ -19,19 +19,19 @@
 -->
 
 <?component name="tabPanelTaskProperties"
-    macroURI="/planner/_tabPanelTaskProperties.zul"
+    macroURI="/planner/taskpanels/_tabPanelTaskProperties.zul"
     inline="true" ?>
 
 <?component name="tabPanelNonLimitingResourceAllocation"
-    macroURI="/planner/_tabPanelNonLimitingResourceAllocation.zul"
+    macroURI="/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul"
     inline="true" ?>
 
 <?component name="tabPanelLimitingResourceAllocation"
-    macroURI="/planner/_tabPanelLimitingResourceAllocation.zul"
+    macroURI="/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul"
     inline="true" ?>
 
 <?component name="tabPanelSubcontract"
-    macroURI="/planner/_tabPanelSubcontract.zul"
+    macroURI="/planner/taskpanels/_tabPanelSubcontract.zul"
     inline="true" ?>
 
 <zk>
diff --git a/navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul
similarity index 100%
rename from navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul
rename to navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul
diff --git a/navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul
similarity index 100%
rename from navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul
rename to navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul
diff --git a/navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul
similarity index 100%
rename from navalplanner-webapp/src/main/webapp/planner/_tabPanelSubcontract.zul
rename to navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul
diff --git a/navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul
similarity index 100%
rename from navalplanner-webapp/src/main/webapp/planner/_tabPanelTaskProperties.zul
rename to navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelTaskProperties.zul