diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeController.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeController.java
index 3dfb36dc..13d6cc71 100644
--- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeController.java
+++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeController.java
@@ -22,6 +22,7 @@ import com.zsmartsystems.zigbee.zcl.clusters.*;
 import com.zsmartsystems.zigbee.zdo.field.NodeDescriptor;
 import se.hal.HalContext;
 import se.hal.intf.*;
+import se.hal.plugin.zigbee.db.ZigBeeHalDataStore;
 import se.hal.plugin.zigbee.device.*;
 import zutil.Timer;
 import zutil.log.LogUtil;
diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigBeeHalDataStore.java
similarity index 99%
rename from plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java
rename to plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigBeeHalDataStore.java
index 51989c71..d0a6f7f8 100644
--- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java
+++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigBeeHalDataStore.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package se.hal.plugin.zigbee;
+package se.hal.plugin.zigbee.db;
 
 import com.zsmartsystems.zigbee.IeeeAddress;
 import com.zsmartsystems.zigbee.database.ZigBeeNetworkDataStore;
diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeMemoryDataStore.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigBeeMemoryDataStore.java
similarity index 98%
rename from plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeMemoryDataStore.java
rename to plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigBeeMemoryDataStore.java
index 3837bcf1..955a2421 100644
--- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeMemoryDataStore.java
+++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigBeeMemoryDataStore.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package se.hal.plugin.zigbee;
+package se.hal.plugin.zigbee.db;
 
 import com.zsmartsystems.zigbee.IeeeAddress;
 import com.zsmartsystems.zigbee.database.ZigBeeNetworkDataStore;
diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeHalDatabaseUpgrade.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigbeeHalDatabaseUpgrade.java
similarity index 94%
rename from plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeHalDatabaseUpgrade.java
rename to plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigbeeHalDatabaseUpgrade.java
index b48d1dc9..6b8d9c70 100644
--- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeHalDatabaseUpgrade.java
+++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/db/ZigbeeHalDatabaseUpgrade.java
@@ -1,4 +1,4 @@
-package se.hal.plugin.zigbee;
+package se.hal.plugin.zigbee.db;
 
 import se.hal.HalContext;
 import se.hal.intf.HalDatabaseUpgrade;
diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json
index f53682b9..acdb1f73 100644
--- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json
+++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json
@@ -3,7 +3,7 @@
 	"name": "Hal-Zigbee",
 	"description": "A Zigbee plugin for directly connecting to a controller device over serial port.",
 	"interfaces": [
-		{"se.hal.intf.HalDatabaseUpgrade":  "se.hal.plugin.zigbee.ZigbeeHalDatabaseUpgrade"},
+		{"se.hal.intf.HalDatabaseUpgrade":  "se.hal.plugin.zigbee.db.ZigbeeHalDatabaseUpgrade"},
 
 		{"se.hal.intf.HalEventConfig":  "se.hal.plugin.zigbee.device.ZigbeeOnOffConfig"},
 		{"se.hal.intf.HalSensorConfig": "se.hal.plugin.zigbee.device.ZigbeeHumidityConfig"},