diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/ResourceLoadComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java
similarity index 98%
rename from ganttzk/src/main/java/org/zkoss/ganttz/ResourceLoadComponent.java
rename to ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java
index be9c40751..2b32c42a3 100755
--- a/ganttzk/src/main/java/org/zkoss/ganttz/ResourceLoadComponent.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java
@@ -1,4 +1,4 @@
-package org.zkoss.ganttz;
+package org.zkoss.ganttz.resourceload;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/ResourceLoadList.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java
similarity index 88%
rename from ganttzk/src/main/java/org/zkoss/ganttz/ResourceLoadList.java
rename to ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java
index d5309a95f..5c61c1dce 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/ResourceLoadList.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java
@@ -1,7 +1,9 @@
-package org.zkoss.ganttz;
+package org.zkoss.ganttz.resourceload;
 
 import java.util.List;
 
+import org.zkoss.ganttz.GanttPanel;
+import org.zkoss.ganttz.Planner;
 import org.zkoss.ganttz.data.ResourceLoad;
 import org.zkoss.zk.ui.ext.AfterCompose;
 import org.zkoss.zul.impl.XulElement;
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
similarity index 91%
rename from ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java
rename to ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
index a22190753..9bf55596f 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
@@ -1,5 +1,8 @@
-package org.zkoss.ganttz;
+package org.zkoss.ganttz.resourceload;
 
+import org.zkoss.ganttz.Planner;
+import org.zkoss.ganttz.TimeTracker;
+import org.zkoss.ganttz.TimeTrackerComponent;
 import org.zkoss.ganttz.data.ResourceLoad;
 import org.zkoss.zk.ui.ext.AfterCompose;
 import org.zkoss.zul.impl.XulElement;
diff --git a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml
index 591fc49fc..f76a66777 100755
--- a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml
+++ b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml
@@ -22,7 +22,7 @@
 
 	<component>
 		<component-name>resourcesLoadPanel</component-name>
-		<component-class>org.zkoss.ganttz.ResourcesLoadPanel</component-class>
+		<component-class>org.zkoss.ganttz.resourceload.ResourcesLoadPanel</component-class>
 		<mold>
 			<mold-name>default</mold-name>
 			<mold-uri>~./ganttz/resourcesLoadPanel.dsp</mold-uri>
@@ -52,7 +52,7 @@
 
 	<component>
 		<component-name>resourceload</component-name>
-		<component-class>org.zkoss.ganttz.ResourceLoadComponent
+		<component-class>org.zkoss.ganttz.resourceload.ResourceLoadComponent
 		</component-class>
 		<mold>
 			<mold-name>default</mold-name>
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java
index 15b9b64fa..0e563662a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java
@@ -7,7 +7,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
-import org.zkoss.ganttz.ResourcesLoadPanel;
 import org.zkoss.ganttz.TaskEditFormComposer;
 import org.zkoss.ganttz.adapters.AutoAdapter;
 import org.zkoss.ganttz.adapters.DomainDependency;
@@ -25,6 +24,7 @@ import org.zkoss.ganttz.extensions.IContext;
 import org.zkoss.ganttz.extensions.IContextWithPlannerTask;
 import org.zkoss.ganttz.extensions.ITab;
 import org.zkoss.ganttz.extensions.ITabFactory;
+import org.zkoss.ganttz.resourceload.ResourcesLoadPanel;
 import org.zkoss.zk.ui.Component;
 
 /**