diff --git a/.gitignore b/.gitignore
index 47284c32..d42d3cdf 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /screenlog.0*
 /hal.conf
 /hal.db*
-/build/
+build
 /lib/Zutil.jar
diff --git a/Hal.iml b/Hal.iml
index 20da5823..feac8bfb 100755
--- a/Hal.iml
+++ b/Hal.iml
@@ -7,7 +7,10 @@
       <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" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/tellstick/build" />
       <excludeFolder url="file://$MODULE_DIR$/plugins/zwave/build" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/Jenkinsfile b/Jenkinsfile
index f6de5243..25b9a4d2 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,12 +10,12 @@ node {
 
     stage('Build') {
         sh 'ant clean'
-        sh 'ant build'
+        sh 'ant build-all'
     }
 
     stage('Test') {
         try {
-            sh 'ant test'
+            sh 'ant test-all'
         } finally {
             step([$class: 'JUnitResultArchiver', testResults: 'build/reports/*.xml'])
         }
@@ -23,7 +23,7 @@ node {
 
 
     stage('Package') {
-        sh 'ant package'
+        sh 'ant package-all'
         archiveArtifacts artifacts: 'build/release/**', fingerprint: true
 
         // Tag artifact
diff --git a/build.xml b/build.xml
index f3052714..c553a0e5 100755
--- a/build.xml
+++ b/build.xml
@@ -59,6 +59,9 @@
 		</java>
 	</target>
 
+    <!-- Test targets -->
+    <target name="test-all" depends="test,test-plugins" />
+
 	<target name="test" depends="build-test">
 		<mkdir dir="${reportsDir}" />
 		<junit printsummary="yes" haltonfailure="false" fork="true">
@@ -72,16 +75,28 @@
 		</junit>
 	</target>
 
+    <target name="test-plugins" depends="build-test">
+        <subant target="test" verbose="true">
+            <fileset dir="plugins/" includes="*/build.xml"/>
+        </subant>
+    </target>
 	<!-- ________________________ BUILD TARGETS ________________________ -->
 
-	<!--clean all build paths-->
+	<!-- clean all build paths -->
 	<target name="clean">
 		<delete includeemptydirs="true" failonerror="false">
 			<fileset dir="${buildRoot}" includes="**/*"/>
 		</delete>
+        <!-- clean plugins -->
+        <subant target="clean" verbose="true">
+            <fileset dir="plugins/" includes="*/build.xml"/>
+        </subant>
 	</target>
 
-	<!--build product code-->
+
+	<!-- build product code -->
+    <target name="build-all" depends="build,build-plugins" />
+
 	<target name="build" depends="build-dependencies">
 		<mkdir dir="${compileDir}" />
 		<javac srcdir="${srcDir}" destdir="${compileDir}" debug="yes" debugLevel="lines,vars,source" fork="yes">
@@ -101,6 +116,12 @@
 			 dest="${libDir}" verbose="true" usetimestamp="true"/>
 	</target>
 
+	<target name="build-plugins" depends="build">
+		<subant target="build" verbose="true">
+			<fileset dir="plugins/" includes="*/build.xml"/>
+		</subant>
+	</target>
+
 	<target name="build-test" depends="build">
 		<mkdir dir="${compileTestDir}" />
 		<javac srcdir="${testDir}" destdir="${compileTestDir}" debug="yes" debugLevel="lines,vars,source" fork="yes">
@@ -113,6 +134,9 @@
 		</copy>
 	</target>
 
+    <!-- generate release packages -->
+    <target name="package-all" depends="package,package-plugins" />
+
 	<target name="package" depends="build">
 		<copy todir="${releaseDir}" >
 			<fileset file="${root}/hal.conf.example" />
@@ -120,15 +144,32 @@
 			<fileset file="${root}/logging.properties" />
 			<fileset file="${root}/run.sh" />
 		</copy>
-		<copy  todir="${releaseDir}/lib">
+		<copy todir="${releaseDir}/lib">
 			<fileset dir="${libDir}" excludes="junit-*.jar,hamcrest-*.jar" />
 		</copy>
-		<copy  todir="${releaseDir}/resource/web">
+		<copy todir="${releaseDir}/resource/web">
 			<fileset dir="resource/web" />
 		</copy>
 		<jar destfile="${releaseDir}/${releaseJar}" basedir="${compileDir}" />
 	</target>
 
+	<target name="package-plugins" depends="package">
+		<subant target="package" verbose="true">
+			<fileset dir="plugins/" includes="*/build.xml"/>
+		</subant>
+        <!-- Copy plugin jars -->
+        <copy todir="${releaseDir}/plugins" flatten="true" includeEmptyDirs="false">
+            <fileset dir="plugins/">
+                <include name="*/build/release/**"/>
+            </fileset>
+        </copy>
+        <!-- Copy plugin libs -->
+        <copy todir="${releaseDir}/lib" flatten="true" includeEmptyDirs="false">
+            <fileset dir="plugins/">
+                <include name="*/lib/**"/>
+            </fileset>
+        </copy>
+	</target>
 
 	<!-- ________________________ UTILITY TARGETS ________________________ -->
 
diff --git a/plugins/tellstick/build.xml b/plugins/tellstick/build.xml
new file mode 100755
index 00000000..1307aada
--- /dev/null
+++ b/plugins/tellstick/build.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Tellstick Plugin" >
+
+	<!-- ________________________ PROPERTIES AND SETTINGS ________________________ -->
+
+	<!--common properties-->
+	<property name="root" value="." />
+	<property name="srcDir" value="${root}/src" />
+	<property name="testDir" value="${root}/test" />
+	<property name="libDir" value="${root}/lib" />
+
+	<property name="buildRoot" value="${root}/build" />
+	<property name="compileDir" value="${buildRoot}/production" />
+	<property name="compileTestDir" value="${buildRoot}/test" />
+	<property name="releaseDir" value="${buildRoot}/release" />
+	<property name="releaseJar" value="tellstick.jar" />
+    <property name="reportsDir" value="../../${buildRoot}/reports" /> <!-- Use Hal reports folder -->
+
+	<!-- ________________________ CLASSPATH ________________________ -->
+
+	<!--define standard arguments for javac-->
+	<presetdef name="javac">
+		<javac includeantruntime="false" />
+	</presetdef>
+
+	<!--classpath included when building-->
+	<path id="classpath.build">
+        <fileset dir="${libDir}">
+            <include name="**/*.jar"/>
+        </fileset>
+        <pathelement location="${compileDir}" />
+        <!-- Hal core -->
+        <pathelement location="../../build/production" />
+        <fileset dir="../../lib">
+            <include name="**/*.jar"/>
+        </fileset>
+	</path>
+
+    <path id="classpath.test">
+        <pathelement location="${compileTestDir}" />
+        <pathelement location="../../${compileTestDir}" />
+        <!--include libraries used for building-->
+        <path refid="classpath.build"/>
+    </path>
+
+
+    <!-- ________________________ EXECUTION TARGETS ________________________ -->
+
+    <target name="test" depends="build-test">
+        <mkdir dir="${reportsDir}" />
+        <junit printsummary="yes" haltonfailure="false" fork="true">
+            <classpath refid="classpath.test" />
+            <formatter type="plain" usefile="false" /> <!-- to screen -->
+            <formatter type="xml" /> <!-- to file -->
+
+            <batchtest todir="${reportsDir}" skipNonTests="true">
+                <fileset dir="${compileTestDir}" includes="**/*Test*.class" />
+            </batchtest>
+        </junit>
+    </target>
+
+	<!-- ________________________ BUILD TARGETS ________________________ -->
+
+	<!--clean all build paths-->
+	<target name="clean">
+		<delete includeemptydirs="true" failonerror="false">
+			<fileset dir="${buildRoot}" includes="**/*"/>
+		</delete>
+	</target>
+
+	<!--build product code-->
+	<target name="build">
+		<mkdir dir="${compileDir}" />
+		<javac srcdir="${srcDir}" destdir="${compileDir}" debug="yes" debugLevel="lines,vars,source" fork="yes">
+			<classpath refid="classpath.build" />
+			<include name="**/*.java" />
+		</javac>
+		<copy todir="${compileDir}">
+			<fileset dir="${srcDir}"
+					 excludes="**/*.java" />
+		</copy>
+	</target>
+
+	<target name="build-test" depends="build">
+		<mkdir dir="${compileTestDir}" />
+		<javac srcdir="${testDir}" destdir="${compileTestDir}" debug="yes" debugLevel="lines,vars,source" fork="yes">
+			<classpath refid="classpath.test" />
+			<include name="**/*.java" />
+		</javac>
+	</target>
+
+	<target name="package" depends="build">
+		<jar destfile="${releaseDir}/${releaseJar}" basedir="${compileDir}" />
+	</target>
+
+</project>
diff --git a/src/se/hal/plugin/tellstick/TellstickDevice.java b/plugins/tellstick/src/se/hal/plugin/tellstick/TellstickDevice.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/TellstickDevice.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/TellstickDevice.java
diff --git a/src/se/hal/plugin/tellstick/TellstickDeviceGroup.java b/plugins/tellstick/src/se/hal/plugin/tellstick/TellstickDeviceGroup.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/TellstickDeviceGroup.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/TellstickDeviceGroup.java
diff --git a/src/se/hal/plugin/tellstick/TellstickParser.java b/plugins/tellstick/src/se/hal/plugin/tellstick/TellstickParser.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/TellstickParser.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/TellstickParser.java
diff --git a/src/se/hal/plugin/tellstick/TellstickProtocol.java b/plugins/tellstick/src/se/hal/plugin/tellstick/TellstickProtocol.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/TellstickProtocol.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/TellstickProtocol.java
diff --git a/src/se/hal/plugin/tellstick/TellstickSerialComm.java b/plugins/tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/TellstickSerialComm.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java
diff --git a/src/se/hal/plugin/tellstick/cmd/TellstickCmd.java b/plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmd.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/cmd/TellstickCmd.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmd.java
diff --git a/src/se/hal/plugin/tellstick/cmd/TellstickCmdExtendedSend.java b/plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdExtendedSend.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/cmd/TellstickCmdExtendedSend.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdExtendedSend.java
diff --git a/src/se/hal/plugin/tellstick/cmd/TellstickCmdSend.java b/plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdSend.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/cmd/TellstickCmdSend.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/cmd/TellstickCmdSend.java
diff --git a/src/se/hal/plugin/tellstick/device/NexaSelfLearning.java b/plugins/tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearning.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/device/NexaSelfLearning.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearning.java
diff --git a/src/se/hal/plugin/tellstick/device/NexaSelfLearningDimmer.java b/plugins/tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearningDimmer.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/device/NexaSelfLearningDimmer.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearningDimmer.java
diff --git a/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java b/plugins/tellstick/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java
diff --git a/src/se/hal/plugin/tellstick/plugin.json b/plugins/tellstick/src/se/hal/plugin/tellstick/plugin.json
similarity index 100%
rename from src/se/hal/plugin/tellstick/plugin.json
rename to plugins/tellstick/src/se/hal/plugin/tellstick/plugin.json
diff --git a/src/se/hal/plugin/tellstick/protocol/NexaSelfLearningProtocol.java b/plugins/tellstick/src/se/hal/plugin/tellstick/protocol/NexaSelfLearningProtocol.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/protocol/NexaSelfLearningProtocol.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/protocol/NexaSelfLearningProtocol.java
diff --git a/src/se/hal/plugin/tellstick/protocol/Oregon0x1A2DProtocol.java b/plugins/tellstick/src/se/hal/plugin/tellstick/protocol/Oregon0x1A2DProtocol.java
similarity index 100%
rename from src/se/hal/plugin/tellstick/protocol/Oregon0x1A2DProtocol.java
rename to plugins/tellstick/src/se/hal/plugin/tellstick/protocol/Oregon0x1A2DProtocol.java
diff --git a/test/se/hal/plugin/tellstick/TelstickSerialCommEventTest.java b/plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommEventTest.java
similarity index 100%
rename from test/se/hal/plugin/tellstick/TelstickSerialCommEventTest.java
rename to plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommEventTest.java
diff --git a/test/se/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java b/plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java
similarity index 100%
rename from test/se/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java
rename to plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommNexaOnOffTest.java
diff --git a/test/se/hal/plugin/tellstick/TelstickSerialCommSensorTest.java b/plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommSensorTest.java
similarity index 100%
rename from test/se/hal/plugin/tellstick/TelstickSerialCommSensorTest.java
rename to plugins/tellstick/test/se/hal/plugin/tellstick/TelstickSerialCommSensorTest.java
diff --git a/test/se/hal/plugin/tellstick/protocol/NexaSelfLearningTest.java b/plugins/tellstick/test/se/hal/plugin/tellstick/protocol/NexaSelfLearningTest.java
similarity index 100%
rename from test/se/hal/plugin/tellstick/protocol/NexaSelfLearningTest.java
rename to plugins/tellstick/test/se/hal/plugin/tellstick/protocol/NexaSelfLearningTest.java
diff --git a/plugins/zwave/build.xml b/plugins/zwave/build.xml
index ff374fd8..acae58a1 100755
--- a/plugins/zwave/build.xml
+++ b/plugins/zwave/build.xml
@@ -34,6 +34,10 @@
         </fileset>
 	</path>
 
+	<!-- ________________________ EXECUTION TARGETS ________________________ -->
+
+	<target name="test" />
+
 	<!-- ________________________ BUILD TARGETS ________________________ -->
 
 	<!--clean all build paths-->
diff --git a/test/se/hal/daemon/SensorDataAggregationDeamonTest.java b/test/se/hal/daemon/SensorDataAggregationDeamonTest.java
old mode 100644
new mode 100755
index 7dc5eb06..216a23c9
--- a/test/se/hal/daemon/SensorDataAggregationDeamonTest.java
+++ b/test/se/hal/daemon/SensorDataAggregationDeamonTest.java
@@ -6,7 +6,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import se.hal.HalContext;
-import se.hal.plugin.tellstick.device.Oregon0x1A2D;
+import se.hal.plugin.netscan.NetworkDevice;
 import se.hal.util.UTCTimeUtility;
 import zutil.db.DBConnection;
 import zutil.db.DBUpgradeHandler;
@@ -43,7 +43,7 @@ public class SensorDataAggregationDeamonTest {
 		System.out.println("Adding user to database");
 		db.exec("INSERT INTO user(id, external, username) VALUES(222, 0, 'test')");	//adding user
 		System.out.println("Adding sensor to database");
-		db.exec("INSERT INTO sensor(id, user_id, external_id, type) VALUES(111, 222, 333, '"+Oregon0x1A2D.class.getName()+"')");	//adding sensor
+		db.exec("INSERT INTO sensor(id, user_id, external_id, type) VALUES(111, 222, 333, '"+NetworkDevice.class.getName()+"')");	//adding sensor
 		System.out.println("Generating raw data and saving it to the database...");
 		PreparedStatement stmt = db.getPreparedStatement("INSERT INTO sensor_data_raw (timestamp, sensor_id, data) VALUES(?, ?, ?)");
 		try{
@@ -77,7 +77,7 @@ public class SensorDataAggregationDeamonTest {
 		
 		//TODO: verify the aggregation
 		
-		System.out.println("Finnished testing raw data aggregation");
+		System.out.println("Finished testing raw data aggregation");
 	}