diff --git a/Hal.iml b/Hal.iml
index 37836c6d..75f455bc 100755
--- a/Hal.iml
+++ b/Hal.iml
@@ -15,7 +15,6 @@
       <sourceFolder url="file://$MODULE_DIR$/lib/sphinx4-5prealpha-src/sphinx4-data/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/lib/sphinx4-5prealpha-src/sphinx4-samples/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/lib/java-speech-api-master/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/web-resource" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/lib/sphinx4-5prealpha-src/sphinx4-data" />
       <excludeFolder url="file://$MODULE_DIR$/lib/sphinx4-5prealpha-src/sphinx4-samples" />
       <excludeFolder url="file://$MODULE_DIR$/lib/sphinx4-5prealpha-src/tests" />
diff --git a/build.xml b/build.xml
index ae1045ba..8ef0b06c 100755
--- a/build.xml
+++ b/build.xml
@@ -73,7 +73,7 @@
         <copy file="${gitRoot}/logging.properties" todir="${releaseDir}" />
         <copy file="${gitRoot}/run.sh" todir="${releaseDir}" />
         <copydir src="${libDir}" dest="${releaseDir}/lib" excludes="junit-*.jar" />
-        <copydir src="${gitRoot}/web-resource" dest="${releaseDir}/web-resource" />
+        <copydir src="resource/web" dest="${releaseDir}/resource/web" />
         <jar destfile="${releaseDir}/hal.jar" basedir="${buildDir}" />
     </target>
 
diff --git a/web-resource/css/bootstrap-switch.css b/resource/web/css/bootstrap-switch.css
similarity index 100%
rename from web-resource/css/bootstrap-switch.css
rename to resource/web/css/bootstrap-switch.css
diff --git a/web-resource/css/bootstrap-switch.min.css b/resource/web/css/bootstrap-switch.min.css
similarity index 100%
rename from web-resource/css/bootstrap-switch.min.css
rename to resource/web/css/bootstrap-switch.min.css
diff --git a/web-resource/css/bootstrap-theme.css b/resource/web/css/bootstrap-theme.css
similarity index 100%
rename from web-resource/css/bootstrap-theme.css
rename to resource/web/css/bootstrap-theme.css
diff --git a/web-resource/css/bootstrap-theme.css.map b/resource/web/css/bootstrap-theme.css.map
similarity index 100%
rename from web-resource/css/bootstrap-theme.css.map
rename to resource/web/css/bootstrap-theme.css.map
diff --git a/web-resource/css/bootstrap-theme.min.css b/resource/web/css/bootstrap-theme.min.css
similarity index 100%
rename from web-resource/css/bootstrap-theme.min.css
rename to resource/web/css/bootstrap-theme.min.css
diff --git a/web-resource/css/bootstrap-theme.min.css.map b/resource/web/css/bootstrap-theme.min.css.map
similarity index 100%
rename from web-resource/css/bootstrap-theme.min.css.map
rename to resource/web/css/bootstrap-theme.min.css.map
diff --git a/web-resource/css/bootstrap.css b/resource/web/css/bootstrap.css
similarity index 100%
rename from web-resource/css/bootstrap.css
rename to resource/web/css/bootstrap.css
diff --git a/web-resource/css/bootstrap.css.map b/resource/web/css/bootstrap.css.map
similarity index 100%
rename from web-resource/css/bootstrap.css.map
rename to resource/web/css/bootstrap.css.map
diff --git a/web-resource/css/bootstrap.min.css b/resource/web/css/bootstrap.min.css
similarity index 100%
rename from web-resource/css/bootstrap.min.css
rename to resource/web/css/bootstrap.min.css
diff --git a/web-resource/css/bootstrap.min.css.map b/resource/web/css/bootstrap.min.css.map
similarity index 100%
rename from web-resource/css/bootstrap.min.css.map
rename to resource/web/css/bootstrap.min.css.map
diff --git a/web-resource/css/hal.css b/resource/web/css/hal.css
similarity index 100%
rename from web-resource/css/hal.css
rename to resource/web/css/hal.css
diff --git a/web-resource/css/morris.css b/resource/web/css/morris.css
similarity index 100%
rename from web-resource/css/morris.css
rename to resource/web/css/morris.css
diff --git a/web-resource/event_config.tmpl b/resource/web/event_config.tmpl
similarity index 100%
rename from web-resource/event_config.tmpl
rename to resource/web/event_config.tmpl
diff --git a/web-resource/event_detail.tmpl b/resource/web/event_detail.tmpl
similarity index 100%
rename from web-resource/event_detail.tmpl
rename to resource/web/event_detail.tmpl
diff --git a/web-resource/event_overview.tmpl b/resource/web/event_overview.tmpl
similarity index 100%
rename from web-resource/event_overview.tmpl
rename to resource/web/event_overview.tmpl
diff --git a/web-resource/fonts/glyphicons-halflings-regular.eot b/resource/web/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from web-resource/fonts/glyphicons-halflings-regular.eot
rename to resource/web/fonts/glyphicons-halflings-regular.eot
diff --git a/web-resource/fonts/glyphicons-halflings-regular.svg b/resource/web/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from web-resource/fonts/glyphicons-halflings-regular.svg
rename to resource/web/fonts/glyphicons-halflings-regular.svg
diff --git a/web-resource/fonts/glyphicons-halflings-regular.ttf b/resource/web/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from web-resource/fonts/glyphicons-halflings-regular.ttf
rename to resource/web/fonts/glyphicons-halflings-regular.ttf
diff --git a/web-resource/fonts/glyphicons-halflings-regular.woff b/resource/web/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from web-resource/fonts/glyphicons-halflings-regular.woff
rename to resource/web/fonts/glyphicons-halflings-regular.woff
diff --git a/web-resource/fonts/glyphicons-halflings-regular.woff2 b/resource/web/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from web-resource/fonts/glyphicons-halflings-regular.woff2
rename to resource/web/fonts/glyphicons-halflings-regular.woff2
diff --git a/web-resource/js/bootstrap-switch.js b/resource/web/js/bootstrap-switch.js
similarity index 100%
rename from web-resource/js/bootstrap-switch.js
rename to resource/web/js/bootstrap-switch.js
diff --git a/web-resource/js/bootstrap-switch.min.js b/resource/web/js/bootstrap-switch.min.js
similarity index 100%
rename from web-resource/js/bootstrap-switch.min.js
rename to resource/web/js/bootstrap-switch.min.js
diff --git a/web-resource/js/bootstrap.js b/resource/web/js/bootstrap.js
similarity index 100%
rename from web-resource/js/bootstrap.js
rename to resource/web/js/bootstrap.js
diff --git a/web-resource/js/bootstrap.min.js b/resource/web/js/bootstrap.min.js
similarity index 100%
rename from web-resource/js/bootstrap.min.js
rename to resource/web/js/bootstrap.min.js
diff --git a/web-resource/js/hal.js b/resource/web/js/hal.js
similarity index 100%
rename from web-resource/js/hal.js
rename to resource/web/js/hal.js
diff --git a/web-resource/js/jquery-1.11.3.min.js b/resource/web/js/jquery-1.11.3.min.js
similarity index 100%
rename from web-resource/js/jquery-1.11.3.min.js
rename to resource/web/js/jquery-1.11.3.min.js
diff --git a/web-resource/js/moment.js b/resource/web/js/moment.js
similarity index 100%
rename from web-resource/js/moment.js
rename to resource/web/js/moment.js
diff --git a/web-resource/js/morris.js b/resource/web/js/morris.js
similarity index 100%
rename from web-resource/js/morris.js
rename to resource/web/js/morris.js
diff --git a/web-resource/js/morris.min.js b/resource/web/js/morris.min.js
similarity index 100%
rename from web-resource/js/morris.min.js
rename to resource/web/js/morris.min.js
diff --git a/web-resource/js/raphael.min.js b/resource/web/js/raphael.min.js
similarity index 100%
rename from web-resource/js/raphael.min.js
rename to resource/web/js/raphael.min.js
diff --git a/web-resource/main_alerts.tmpl b/resource/web/main_alerts.tmpl
similarity index 100%
rename from web-resource/main_alerts.tmpl
rename to resource/web/main_alerts.tmpl
diff --git a/web-resource/main_index.tmpl b/resource/web/main_index.tmpl
similarity index 100%
rename from web-resource/main_index.tmpl
rename to resource/web/main_index.tmpl
diff --git a/web-resource/pc_heatmap.tmpl b/resource/web/pc_heatmap.tmpl
similarity index 100%
rename from web-resource/pc_heatmap.tmpl
rename to resource/web/pc_heatmap.tmpl
diff --git a/web-resource/pc_overview.tmpl b/resource/web/pc_overview.tmpl
similarity index 100%
rename from web-resource/pc_overview.tmpl
rename to resource/web/pc_overview.tmpl
diff --git a/web-resource/sensor_config.tmpl b/resource/web/sensor_config.tmpl
similarity index 100%
rename from web-resource/sensor_config.tmpl
rename to resource/web/sensor_config.tmpl
diff --git a/web-resource/sensor_detail.tmpl b/resource/web/sensor_detail.tmpl
similarity index 100%
rename from web-resource/sensor_detail.tmpl
rename to resource/web/sensor_detail.tmpl
diff --git a/web-resource/sensor_overview.tmpl b/resource/web/sensor_overview.tmpl
similarity index 100%
rename from web-resource/sensor_overview.tmpl
rename to resource/web/sensor_overview.tmpl
diff --git a/web-resource/user_config.tmpl b/resource/web/user_config.tmpl
similarity index 100%
rename from web-resource/user_config.tmpl
rename to resource/web/user_config.tmpl
diff --git a/src/se/hal/HalServer.java b/src/se/hal/HalServer.java
index 7233d749..327ced7a 100755
--- a/src/se/hal/HalServer.java
+++ b/src/se/hal/HalServer.java
@@ -86,7 +86,7 @@ public class HalServer {
                 new UserConfigHttpPage(),
         };
         HttpServer http = new HttpServer(HalContext.getIntegerProperty("http_port"));
-        http.setDefaultPage(new HttpFilePage(FileUtil.find("web-resource/")));
+        http.setDefaultPage(new HttpFilePage(FileUtil.find("resource/web/")));
         http.setPage("/", pages[0]);
         http.setPage(HalAlertManager.getInstance().getUrl(), HalAlertManager.getInstance());
         for(HalHttpPage page : pages){
diff --git a/src/se/hal/intf/HalHttpPage.java b/src/se/hal/intf/HalHttpPage.java
index 06928765..eab14b90 100755
--- a/src/se/hal/intf/HalHttpPage.java
+++ b/src/se/hal/intf/HalHttpPage.java
@@ -18,7 +18,7 @@ import java.util.Map;
  * Created by Ziver on 2015-12-10.
  */
 public abstract class HalHttpPage implements HttpPage{
-    private static final String TEMPLATE = "web-resource/main_index.tmpl";
+    private static final String TEMPLATE = "resource/web/main_index.tmpl";
     private static HalNavigation rootNav = new HalNavigation();
     private static HalNavigation userNav = new HalNavigation();
 
diff --git a/src/se/hal/page/EventConfigHttpPage.java b/src/se/hal/page/EventConfigHttpPage.java
index c322325e..b1ee18fe 100755
--- a/src/se/hal/page/EventConfigHttpPage.java
+++ b/src/se/hal/page/EventConfigHttpPage.java
@@ -14,7 +14,7 @@ import zutil.ui.Configurator.ConfigurationParam;
 import java.util.Map;
 
 public class EventConfigHttpPage extends HalHttpPage {
-    private static final String TEMPLATE = "web-resource/event_config.tmpl";
+    private static final String TEMPLATE = "resource/web/event_config.tmpl";
 
     private class EventDataParams{
         public Class clazz;
diff --git a/src/se/hal/page/EventOverviewHttpPage.java b/src/se/hal/page/EventOverviewHttpPage.java
index 5fae9cf8..46eace8d 100755
--- a/src/se/hal/page/EventOverviewHttpPage.java
+++ b/src/se/hal/page/EventOverviewHttpPage.java
@@ -18,8 +18,8 @@ import java.util.Map;
 
 public class EventOverviewHttpPage extends HalHttpPage {
     private static final int HISTORY_LIMIT = 200;
-    private static final String OVERVIEW_TEMPLATE = "web-resource/event_overview.tmpl";
-    private static final String DETAIL_TEMPLATE = "web-resource/event_detail.tmpl";
+    private static final String OVERVIEW_TEMPLATE = "resource/web/event_overview.tmpl";
+    private static final String DETAIL_TEMPLATE = "resource/web/event_detail.tmpl";
 
 
     public EventOverviewHttpPage(){
diff --git a/src/se/hal/page/HalAlertManager.java b/src/se/hal/page/HalAlertManager.java
index 74b18d92..2c0bfc96 100755
--- a/src/se/hal/page/HalAlertManager.java
+++ b/src/se/hal/page/HalAlertManager.java
@@ -17,7 +17,7 @@ import java.util.logging.Logger;
  */
 public class HalAlertManager implements HttpPage {
     private static final Logger logger = LogUtil.getLogger();
-    private static final String TMPL_PATH = "web-resource/main_alerts.tmpl";
+    private static final String TMPL_PATH = "resource/web/main_alerts.tmpl";
     private static final String PAGE_NAME = "alert";
     private static HalAlertManager instance;
 
diff --git a/src/se/hal/page/PCHeatMapHttpPage.java b/src/se/hal/page/PCHeatMapHttpPage.java
index 59d337f6..0076e699 100755
--- a/src/se/hal/page/PCHeatMapHttpPage.java
+++ b/src/se/hal/page/PCHeatMapHttpPage.java
@@ -7,7 +7,7 @@ import zutil.parser.Templator;
 import java.util.Map;
 
 public class PCHeatMapHttpPage extends HalHttpPage {
-	private static final String TEMPLATE = "web-resource/pc_heatmap.tmpl";
+	private static final String TEMPLATE = "resource/web/pc_heatmap.tmpl";
 
 
 	public PCHeatMapHttpPage() {
diff --git a/src/se/hal/page/PCOverviewHttpPage.java b/src/se/hal/page/PCOverviewHttpPage.java
index f73df72a..249d221a 100755
--- a/src/se/hal/page/PCOverviewHttpPage.java
+++ b/src/se/hal/page/PCOverviewHttpPage.java
@@ -17,7 +17,7 @@ import java.util.List;
 import java.util.Map;
 
 public class PCOverviewHttpPage extends HalHttpPage {
-	private static final String TEMPLATE = "web-resource/pc_overview.tmpl";
+	private static final String TEMPLATE = "resource/web/pc_overview.tmpl";
 
 	public PCOverviewHttpPage() {
 		super("Power;Challenge", "pc_overview");
diff --git a/src/se/hal/page/SensorConfigHttpPage.java b/src/se/hal/page/SensorConfigHttpPage.java
index f7a4d514..8aadbb4f 100755
--- a/src/se/hal/page/SensorConfigHttpPage.java
+++ b/src/se/hal/page/SensorConfigHttpPage.java
@@ -14,7 +14,7 @@ import zutil.ui.Configurator.ConfigurationParam;
 import java.util.Map;
 
 public class SensorConfigHttpPage extends HalHttpPage {
-    private static final String TEMPLATE = "web-resource/sensor_config.tmpl";
+    private static final String TEMPLATE = "resource/web/sensor_config.tmpl";
 
     private class SensorDataParams{
         public Class clazz;
diff --git a/src/se/hal/page/SensorOverviewHttpPage.java b/src/se/hal/page/SensorOverviewHttpPage.java
index 0766234c..dc09e6f5 100755
--- a/src/se/hal/page/SensorOverviewHttpPage.java
+++ b/src/se/hal/page/SensorOverviewHttpPage.java
@@ -18,8 +18,8 @@ import java.util.Map;
 
 public class SensorOverviewHttpPage extends HalHttpPage {
     private static final int HISTORY_LIMIT = 200;
-    private static final String OVERVIEW_TEMPLATE = "web-resource/sensor_overview.tmpl";
-    private static final String DETAIL_TEMPLATE = "web-resource/sensor_detail.tmpl";
+    private static final String OVERVIEW_TEMPLATE = "resource/web/sensor_overview.tmpl";
+    private static final String DETAIL_TEMPLATE = "resource/web/sensor_detail.tmpl";
 
 
     public SensorOverviewHttpPage(){
diff --git a/src/se/hal/page/UserConfigHttpPage.java b/src/se/hal/page/UserConfigHttpPage.java
index d4f3378b..d10a624a 100755
--- a/src/se/hal/page/UserConfigHttpPage.java
+++ b/src/se/hal/page/UserConfigHttpPage.java
@@ -10,7 +10,7 @@ import zutil.parser.Templator;
 import java.util.Map;
 
 public class UserConfigHttpPage extends HalHttpPage {
-    private static final String TEMPLATE = "web-resource/user_config.tmpl";
+    private static final String TEMPLATE = "resource/web/user_config.tmpl";
 
 
     public UserConfigHttpPage() {