diff --git a/Hal.iml b/Hal.iml
index d6b3cb19..031dc73e 100755
--- a/Hal.iml
+++ b/Hal.iml
@@ -6,18 +6,22 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/resource" type="java-resource" relativeOutputPath="resource" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/zwave/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/tellstick/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/tellstick/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/plugins/raspberry/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/hal-zwave/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/hal-tellstick/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/hal-tellstick/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/hal-raspberry/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/hal-zigbee/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/hal-raspberry/build" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/hal-tellstick/build" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/hal-zigbee/build" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/hal-zwave/build" />
       <excludeFolder url="file://$MODULE_DIR$/plugins/raspberry/build" />
       <excludeFolder url="file://$MODULE_DIR$/plugins/tellstick/build" />
       <excludeFolder url="file://$MODULE_DIR$/plugins/zwave/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="wzwave" exported="" />
     <orderEntry type="module" module-name="Zutil" exported="" />
     <orderEntry type="module-library" exported="">
       <library name="lib">
@@ -36,29 +40,23 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="lib ZWave">
+      <library>
         <CLASSES>
-          <root url="file://$MODULE_DIR$/plugins/zwave/lib" />
-        </CLASSES>
-        <JAVADOC />
-        <NATIVE>
-          <root url="file://$MODULE_DIR$/plugins/zwave/lib" />
-        </NATIVE>
-        <SOURCES>
-          <root url="jar://$USER_HOME$/.ideaLibSources/netty-all-4.0.46.Final-sources.jar!/" />
-          <root url="jar://$USER_HOME$/.ideaLibSources/wzwave-0.0.3-sources.jar!/" />
-        </SOURCES>
-        <jarDirectory url="file://$MODULE_DIR$/plugins/zwave/lib" recursive="false" />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" exported="">
-      <library name="lib Raspberry">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/plugins/raspberry/lib" />
+          <root url="file://$MODULE_DIR$/plugins/hal-raspberry/lib" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
-        <jarDirectory url="file://$MODULE_DIR$/plugins/raspberry/lib" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/plugins/hal-raspberry/lib" recursive="false" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/plugins/hal-zwave/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$MODULE_DIR$/plugins/hal-zwave/lib" recursive="false" />
       </library>
     </orderEntry>
     <orderEntry type="module-library" scope="TEST">
diff --git a/plugins/raspberry/build.xml b/plugins/hal-raspberry/build.xml
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/build.xml
rename to plugins/hal-raspberry/build.xml
diff --git a/plugins/raspberry/lib/pi4j-core-1.1.jar b/plugins/hal-raspberry/lib/pi4j-core-1.1.jar
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/lib/pi4j-core-1.1.jar
rename to plugins/hal-raspberry/lib/pi4j-core-1.1.jar
diff --git a/plugins/raspberry/lib/pi4j-device-1.1.jar b/plugins/hal-raspberry/lib/pi4j-device-1.1.jar
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/lib/pi4j-device-1.1.jar
rename to plugins/hal-raspberry/lib/pi4j-device-1.1.jar
diff --git a/plugins/raspberry/lib/pi4j-gpio-extension-1.1.jar b/plugins/hal-raspberry/lib/pi4j-gpio-extension-1.1.jar
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/lib/pi4j-gpio-extension-1.1.jar
rename to plugins/hal-raspberry/lib/pi4j-gpio-extension-1.1.jar
diff --git a/plugins/raspberry/lib/pi4j-service-1.1.jar b/plugins/hal-raspberry/lib/pi4j-service-1.1.jar
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/lib/pi4j-service-1.1.jar
rename to plugins/hal-raspberry/lib/pi4j-service-1.1.jar
diff --git a/plugins/raspberry/lib/pi4j.LICENSE.txt b/plugins/hal-raspberry/lib/pi4j.LICENSE.txt
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/lib/pi4j.LICENSE.txt
rename to plugins/hal-raspberry/lib/pi4j.LICENSE.txt
diff --git a/plugins/raspberry/lib/pi4j.NOTICE.txt b/plugins/hal-raspberry/lib/pi4j.NOTICE.txt
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/lib/pi4j.NOTICE.txt
rename to plugins/hal-raspberry/lib/pi4j.NOTICE.txt
diff --git a/plugins/raspberry/src/se/hal/plugin/raspberry/RPiController.java b/plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiController.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/src/se/hal/plugin/raspberry/RPiController.java
rename to plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiController.java
diff --git a/plugins/raspberry/src/se/hal/plugin/raspberry/RPiPowerConsumptionSensor.java b/plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiPowerConsumptionSensor.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/src/se/hal/plugin/raspberry/RPiPowerConsumptionSensor.java
rename to plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiPowerConsumptionSensor.java
diff --git a/plugins/raspberry/src/se/hal/plugin/raspberry/RPiSensor.java b/plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiSensor.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/src/se/hal/plugin/raspberry/RPiSensor.java
rename to plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiSensor.java
diff --git a/plugins/raspberry/src/se/hal/plugin/raspberry/RPiTemperatureSensor.java b/plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiTemperatureSensor.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/src/se/hal/plugin/raspberry/RPiTemperatureSensor.java
rename to plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiTemperatureSensor.java
diff --git a/plugins/raspberry/src/se/hal/plugin/raspberry/RPiUtility.java b/plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiUtility.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/src/se/hal/plugin/raspberry/RPiUtility.java
rename to plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiUtility.java
diff --git a/plugins/raspberry/src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java b/plugins/hal-raspberry/src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java
rename to plugins/hal-raspberry/src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java
diff --git a/plugins/raspberry/src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java b/plugins/hal-raspberry/src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java
rename to plugins/hal-raspberry/src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java
diff --git a/plugins/raspberry/src/se/hal/plugin/raspberry/plugin.json b/plugins/hal-raspberry/src/se/hal/plugin/raspberry/plugin.json
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/raspberry/src/se/hal/plugin/raspberry/plugin.json
rename to plugins/hal-raspberry/src/se/hal/plugin/raspberry/plugin.json
diff --git a/plugins/tellstick/build.xml b/plugins/hal-tellstick/build.xml
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/build.xml
rename to plugins/hal-tellstick/build.xml
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/TellstickDevice.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickDevice.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/TellstickDevice.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickDevice.java
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/TellstickDeviceGroup.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickDeviceGroup.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/TellstickDeviceGroup.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickDeviceGroup.java
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/TellstickParser.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickParser.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/TellstickParser.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickParser.java
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/TellstickProtocol.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickProtocol.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/TellstickProtocol.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickProtocol.java
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmd.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmd.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmd.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmd.java
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdExtendedSend.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdExtendedSend.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdExtendedSend.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdExtendedSend.java
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdSend.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdSend.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdSend.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdSend.java
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearning.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearning.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearning.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearning.java
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearningDimmer.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearningDimmer.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearningDimmer.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearningDimmer.java
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/plugin.json b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/plugin.json
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/plugin.json
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/plugin.json
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/protocol/NexaSelfLearningProtocol.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/protocol/NexaSelfLearningProtocol.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/protocol/NexaSelfLearningProtocol.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/protocol/NexaSelfLearningProtocol.java
diff --git a/plugins/tellstick/src/se/hal/plugin/tellstick/protocol/Oregon0x1A2DProtocol.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/protocol/Oregon0x1A2DProtocol.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/src/se/hal/plugin/tellstick/protocol/Oregon0x1A2DProtocol.java
rename to plugins/hal-tellstick/src/se/hal/plugin/tellstick/protocol/Oregon0x1A2DProtocol.java
diff --git a/plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommEventTest.java b/plugins/hal-tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommEventTest.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommEventTest.java
rename to plugins/hal-tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommEventTest.java
diff --git a/plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java b/plugins/hal-tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java
rename to plugins/hal-tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java
diff --git a/plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommSensorTest.java b/plugins/hal-tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommSensorTest.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommSensorTest.java
rename to plugins/hal-tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommSensorTest.java
diff --git a/plugins/tellstick/test/se/hal/plugin/tellstick/protocol/NexaSelfLearningTest.java b/plugins/hal-tellstick/test/se/hal/plugin/tellstick/protocol/NexaSelfLearningTest.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/tellstick/test/se/hal/plugin/tellstick/protocol/NexaSelfLearningTest.java
rename to plugins/hal-tellstick/test/se/hal/plugin/tellstick/protocol/NexaSelfLearningTest.java
diff --git a/plugins/hal-zwave/lib/zwave4j-0.3.jar b/plugins/hal-zwave/lib/zwave4j-0.3.jar
new file mode 100644
index 00000000..ff97ca6c
Binary files /dev/null and b/plugins/hal-zwave/lib/zwave4j-0.3.jar differ
diff --git a/plugins/zwave/src/se/hal/plugin/zwave/HalZWaveController.java b/plugins/hal-zwave/src/se/hal/plugin/zwave/HalZWaveController.java
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/zwave/src/se/hal/plugin/zwave/HalZWaveController.java
rename to plugins/hal-zwave/src/se/hal/plugin/zwave/HalZWaveController.java