diff --git a/src/se/hal/ControllerManager.java b/src/se/hal/ControllerManager.java
index b18f0c00..ce26f5f1 100755
--- a/src/se/hal/ControllerManager.java
+++ b/src/se/hal/ControllerManager.java
@@ -8,7 +8,8 @@ import zutil.log.LogUtil;
 import zutil.plugin.PluginData;
 import zutil.plugin.PluginManager;
 import zutil.ui.Configurator;
-import zutil.ui.Configurator.*;
+import zutil.ui.Configurator.PostConfigurationActionListener;
+import zutil.ui.Configurator.PreConfigurationActionListener;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
diff --git a/src/se/hal/HalContext.java b/src/se/hal/HalContext.java
index 8d45ca29..29ff8ce3 100755
--- a/src/se/hal/HalContext.java
+++ b/src/se/hal/HalContext.java
@@ -17,8 +17,6 @@ import java.sql.Statement;
 import java.util.Properties;
 import java.util.logging.Logger;
 
-import se.hal.struct.Sensor;
-
 public class HalContext {
     private static final Logger logger = LogUtil.getLogger();
 
diff --git a/src/se/hal/HalServer.java b/src/se/hal/HalServer.java
index 03829f26..7233d749 100755
--- a/src/se/hal/HalServer.java
+++ b/src/se/hal/HalServer.java
@@ -1,27 +1,23 @@
 package se.hal;
 
 
-import se.hal.deamon.SensorDataAggregatorDaemon;
-import se.hal.deamon.SensorDataCleanupDaemon;
 import se.hal.deamon.PCDataSynchronizationClient;
 import se.hal.deamon.PCDataSynchronizationDaemon;
+import se.hal.deamon.SensorDataAggregatorDaemon;
+import se.hal.deamon.SensorDataCleanupDaemon;
 import se.hal.intf.HalDaemon;
 import se.hal.intf.HalHttpPage;
 import se.hal.page.*;
-import se.hal.page.HalAlertManager.*;
 import se.hal.struct.Event;
 import se.hal.struct.Sensor;
 import zutil.db.DBConnection;
-import zutil.db.bean.DBBean;
 import zutil.io.file.FileUtil;
-import zutil.log.CompactLogFormatter;
 import zutil.log.LogUtil;
 import zutil.net.http.HttpServer;
 import zutil.net.http.pages.HttpFilePage;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
-import java.util.logging.Level;
 
 /**
  * Created by Ziver on 2015-12-03.
diff --git a/src/se/hal/deamon/PCDataSynchronizationClient.java b/src/se/hal/deamon/PCDataSynchronizationClient.java
index 6f86135e..64d3a25e 100755
--- a/src/se/hal/deamon/PCDataSynchronizationClient.java
+++ b/src/se/hal/deamon/PCDataSynchronizationClient.java
@@ -1,12 +1,14 @@
 package se.hal.deamon;
 
 import se.hal.HalContext;
-import se.hal.deamon.PCDataSynchronizationDaemon.*;
+import se.hal.deamon.PCDataSynchronizationDaemon.PeerDataRspDTO;
+import se.hal.deamon.PCDataSynchronizationDaemon.SensorDTO;
+import se.hal.deamon.PCDataSynchronizationDaemon.SensorDataDTO;
+import se.hal.deamon.PCDataSynchronizationDaemon.SensorDataListDTO;
 import se.hal.intf.HalDaemon;
 import se.hal.struct.Sensor;
 import se.hal.struct.User;
 import zutil.db.DBConnection;
-import zutil.db.bean.DBBeanSQLResultHandler;
 import zutil.log.LogUtil;
 import zutil.parser.json.JSONParser;
 
diff --git a/src/se/hal/deamon/PCDataSynchronizationDaemon.java b/src/se/hal/deamon/PCDataSynchronizationDaemon.java
index e3c209c5..7feee554 100755
--- a/src/se/hal/deamon/PCDataSynchronizationDaemon.java
+++ b/src/se/hal/deamon/PCDataSynchronizationDaemon.java
@@ -1,7 +1,8 @@
 package se.hal.deamon;
 
 import se.hal.HalContext;
-import se.hal.deamon.PCDataSynchronizationClient.*;
+import se.hal.deamon.PCDataSynchronizationClient.PeerDataReqDTO;
+import se.hal.deamon.PCDataSynchronizationClient.SensorDataReqDTO;
 import se.hal.intf.HalDaemon;
 import se.hal.struct.Sensor;
 import se.hal.struct.User;
diff --git a/src/se/hal/deamon/SensorDataAggregatorDaemon.java b/src/se/hal/deamon/SensorDataAggregatorDaemon.java
index 539ff4d9..0090181f 100755
--- a/src/se/hal/deamon/SensorDataAggregatorDaemon.java
+++ b/src/se/hal/deamon/SensorDataAggregatorDaemon.java
@@ -2,8 +2,8 @@ package se.hal.deamon;
 
 import se.hal.HalContext;
 import se.hal.intf.HalDaemon;
-import se.hal.struct.Sensor;
 import se.hal.intf.HalSensorData.AggregationMethod;
+import se.hal.struct.Sensor;
 import se.hal.util.UTCTimePeriod;
 import se.hal.util.UTCTimeUtility;
 import zutil.db.DBConnection;
diff --git a/src/se/hal/intf/HalHttpPage.java b/src/se/hal/intf/HalHttpPage.java
index 51be4a75..06928765 100755
--- a/src/se/hal/intf/HalHttpPage.java
+++ b/src/se/hal/intf/HalHttpPage.java
@@ -6,13 +6,12 @@ import se.hal.page.HalNavigation;
 import se.hal.struct.User;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
-import zutil.net.http.HttpHeaderParser;
+import zutil.net.http.HttpHeader;
 import zutil.net.http.HttpPage;
 import zutil.net.http.HttpPrintStream;
 import zutil.parser.Templator;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Map;
 
 /**
@@ -42,7 +41,7 @@ public abstract class HalHttpPage implements HttpPage{
 
 
     @Override
-    public void respond(HttpPrintStream out, HttpHeaderParser client_info,
+    public void respond(HttpPrintStream out, HttpHeader client_info,
                         Map<String, Object> session, Map<String, String> cookie,
                         Map<String, String> request) throws IOException {
 
diff --git a/src/se/hal/page/EventConfigHttpPage.java b/src/se/hal/page/EventConfigHttpPage.java
index 4d1b47de..c322325e 100755
--- a/src/se/hal/page/EventConfigHttpPage.java
+++ b/src/se/hal/page/EventConfigHttpPage.java
@@ -2,7 +2,6 @@ package se.hal.page;
 
 import se.hal.ControllerManager;
 import se.hal.HalContext;
-import se.hal.intf.HalEventData;
 import se.hal.intf.HalHttpPage;
 import se.hal.struct.Event;
 import se.hal.struct.User;
diff --git a/src/se/hal/page/EventOverviewHttpPage.java b/src/se/hal/page/EventOverviewHttpPage.java
index ee64bcba..5fae9cf8 100755
--- a/src/se/hal/page/EventOverviewHttpPage.java
+++ b/src/se/hal/page/EventOverviewHttpPage.java
@@ -7,7 +7,7 @@ import se.hal.intf.HalHttpPage;
 import se.hal.struct.Event;
 import se.hal.struct.SwitchEventData;
 import se.hal.util.HistoryDataListSqlResult;
-import se.hal.util.HistoryDataListSqlResult.*;
+import se.hal.util.HistoryDataListSqlResult.HistoryData;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
diff --git a/src/se/hal/page/HalAlertManager.java b/src/se/hal/page/HalAlertManager.java
index 1e58cfbb..74b18d92 100755
--- a/src/se/hal/page/HalAlertManager.java
+++ b/src/se/hal/page/HalAlertManager.java
@@ -2,7 +2,7 @@ package se.hal.page;
 
 import zutil.io.file.FileUtil;
 import zutil.log.LogUtil;
-import zutil.net.http.HttpHeaderParser;
+import zutil.net.http.HttpHeader;
 import zutil.net.http.HttpPage;
 import zutil.net.http.HttpPrintStream;
 import zutil.parser.Templator;
@@ -71,7 +71,7 @@ public class HalAlertManager implements HttpPage {
 
     @Override
     public void respond(HttpPrintStream out,
-                        HttpHeaderParser client_info,
+                        HttpHeader headers,
                         Map<String, Object> session,
                         Map<String, String> cookie,
                         Map<String, String> request) throws IOException {
diff --git a/src/se/hal/page/PCOverviewHttpPage.java b/src/se/hal/page/PCOverviewHttpPage.java
index ed4b1598..f73df72a 100755
--- a/src/se/hal/page/PCOverviewHttpPage.java
+++ b/src/se/hal/page/PCOverviewHttpPage.java
@@ -3,11 +3,11 @@ package se.hal.page;
 import se.hal.HalContext;
 import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength;
 import se.hal.intf.HalHttpPage;
-import se.hal.util.AggregateDataListSqlResult;
-import se.hal.util.AggregateDataListSqlResult.*;
-import se.hal.util.UTCTimeUtility;
 import se.hal.struct.Sensor;
 import se.hal.struct.User;
+import se.hal.util.AggregateDataListSqlResult;
+import se.hal.util.AggregateDataListSqlResult.AggregateData;
+import se.hal.util.UTCTimeUtility;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
diff --git a/src/se/hal/page/SensorConfigHttpPage.java b/src/se/hal/page/SensorConfigHttpPage.java
index b891f68a..f7a4d514 100755
--- a/src/se/hal/page/SensorConfigHttpPage.java
+++ b/src/se/hal/page/SensorConfigHttpPage.java
@@ -3,14 +3,13 @@ package se.hal.page;
 import se.hal.ControllerManager;
 import se.hal.HalContext;
 import se.hal.intf.HalHttpPage;
-import se.hal.intf.HalSensorData;
 import se.hal.struct.Sensor;
 import se.hal.struct.User;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
 import zutil.ui.Configurator;
-import zutil.ui.Configurator.*;
+import zutil.ui.Configurator.ConfigurationParam;
 
 import java.util.Map;
 
diff --git a/src/se/hal/page/SensorOverviewHttpPage.java b/src/se/hal/page/SensorOverviewHttpPage.java
index f87c3328..0766234c 100755
--- a/src/se/hal/page/SensorOverviewHttpPage.java
+++ b/src/se/hal/page/SensorOverviewHttpPage.java
@@ -5,10 +5,10 @@ import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength;
 import se.hal.intf.HalHttpPage;
 import se.hal.struct.Sensor;
 import se.hal.util.AggregateDataListSqlResult;
-import zutil.db.DBConnection;
 import se.hal.util.HistoryDataListSqlResult;
-import se.hal.util.HistoryDataListSqlResult.*;
+import se.hal.util.HistoryDataListSqlResult.HistoryData;
 import se.hal.util.UTCTimeUtility;
+import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
 
diff --git a/src/se/hal/plugin/raspberry/RPiController.java b/src/se/hal/plugin/raspberry/RPiController.java
old mode 100644
new mode 100755
index a11f4fd4..60220eea
--- a/src/se/hal/plugin/raspberry/RPiController.java
+++ b/src/se/hal/plugin/raspberry/RPiController.java
@@ -1,18 +1,16 @@
 package se.hal.plugin.raspberry;
 
-import java.util.HashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.pi4j.io.gpio.Pin;
-
-import se.hal.intf.HalSensorData;
 import se.hal.intf.HalSensorController;
+import se.hal.intf.HalSensorData;
 import se.hal.intf.HalSensorReportListener;
 import se.hal.plugin.raspberry.hardware.RPiDS18B20;
 import se.hal.plugin.raspberry.hardware.RPiInteruptPulseFlankCounter;
 import zutil.log.LogUtil;
 
+import java.util.HashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 public class RPiController implements HalSensorController {
 	private static final Logger logger = LogUtil.getLogger();
 	
diff --git a/src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java b/src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java
old mode 100644
new mode 100755
index 399fb5f0..7861ebce
--- a/src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java
+++ b/src/se/hal/plugin/raspberry/hardware/RPiDS18B20.java
@@ -1,19 +1,18 @@
 package se.hal.plugin.raspberry.hardware;
 
+import com.pi4j.component.temperature.TemperatureSensor;
+import com.pi4j.io.w1.W1Master;
+import com.pi4j.temperature.TemperatureScale;
+import se.hal.plugin.raspberry.RPiController;
+import se.hal.plugin.raspberry.RPiSensor;
+import se.hal.plugin.raspberry.RPiTemperatureSensor;
+import zutil.log.LogUtil;
+
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-import se.hal.plugin.raspberry.RPiTemperatureSensor;
-import se.hal.plugin.raspberry.RPiController;
-import se.hal.plugin.raspberry.RPiSensor;
-import zutil.log.LogUtil;
-
-import com.pi4j.component.temperature.TemperatureSensor;
-import com.pi4j.io.w1.W1Master;
-import com.pi4j.temperature.TemperatureScale;
-
 public class RPiDS18B20 implements RPiSensor, Runnable {	
 	private static final Logger logger = LogUtil.getLogger();
 	private final String DEGREE_SIGN  = "\u00b0";
diff --git a/src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java b/src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java
old mode 100644
new mode 100755
index cd187133..153cbe53
--- a/src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java
+++ b/src/se/hal/plugin/raspberry/hardware/RPiInteruptPulseFlankCounter.java
@@ -1,25 +1,19 @@
 package se.hal.plugin.raspberry.hardware;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
+import com.pi4j.io.gpio.*;
+import com.pi4j.io.gpio.event.GpioPinDigitalStateChangeEvent;
+import com.pi4j.io.gpio.event.GpioPinListenerDigital;
+import com.pi4j.wiringpi.GpioUtil;
 import se.hal.plugin.raspberry.RPiController;
 import se.hal.plugin.raspberry.RPiPowerConsumptionSensor;
 import se.hal.plugin.raspberry.RPiSensor;
 import se.hal.plugin.raspberry.RPiUtility;
 import zutil.log.LogUtil;
 
-import com.pi4j.io.gpio.GpioController;
-import com.pi4j.io.gpio.GpioFactory;
-import com.pi4j.io.gpio.GpioPinDigitalInput;
-import com.pi4j.io.gpio.Pin;
-import com.pi4j.io.gpio.PinPullResistance;
-import com.pi4j.io.gpio.PinState;
-import com.pi4j.io.gpio.event.GpioPinDigitalStateChangeEvent;
-import com.pi4j.io.gpio.event.GpioPinListenerDigital;
-import com.pi4j.wiringpi.GpioUtil;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class RPiInteruptPulseFlankCounter implements Runnable, GpioPinListenerDigital, RPiSensor {
 	private static final int REPORT_TIMEOUT = 60_000;   //one minute
diff --git a/src/se/hal/plugin/tellstick/TellstickGroupProtocol.java b/src/se/hal/plugin/tellstick/TellstickGroupProtocol.java
index 4b2ed0f7..fbfee128 100755
--- a/src/se/hal/plugin/tellstick/TellstickGroupProtocol.java
+++ b/src/se/hal/plugin/tellstick/TellstickGroupProtocol.java
@@ -24,9 +24,6 @@
 
 package se.hal.plugin.tellstick;
 
-import se.hal.intf.HalEventController;
-import se.hal.intf.HalSensorController;
-
 /**
  * Indicates that the implementing class is a protocol that can have group events.
  * More specifically that on transmission will affect multiple devices.
diff --git a/src/se/hal/plugin/tellstick/TellstickSerialComm.java b/src/se/hal/plugin/tellstick/TellstickSerialComm.java
index 35c5afbb..16957821 100755
--- a/src/se/hal/plugin/tellstick/TellstickSerialComm.java
+++ b/src/se/hal/plugin/tellstick/TellstickSerialComm.java
@@ -25,14 +25,12 @@ package se.hal.plugin.tellstick;
 import com.fazecast.jSerialComm.SerialPort;
 import se.hal.HalContext;
 import se.hal.intf.*;
-import se.hal.struct.AbstractDevice;
-import zutil.log.InputStreamLogger;
 import zutil.log.LogUtil;
-import zutil.log.OutputStreamLogger;
 import zutil.struct.TimedHashSet;
 
-import java.io.*;
-import java.nio.charset.Charset;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.concurrent.Executors;
 import java.util.logging.Level;
diff --git a/src/se/hal/struct/Event.java b/src/se/hal/struct/Event.java
index 32e24ca6..b9fff55b 100755
--- a/src/se/hal/struct/Event.java
+++ b/src/se/hal/struct/Event.java
@@ -1,7 +1,7 @@
 package se.hal.struct;
 
-import se.hal.intf.HalEventData;
 import se.hal.intf.HalEventController;
+import se.hal.intf.HalEventData;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;
 import zutil.db.bean.DBBeanSQLResultHandler;
diff --git a/src/se/hal/struct/Sensor.java b/src/se/hal/struct/Sensor.java
index b63d4d8a..d96f1117 100755
--- a/src/se/hal/struct/Sensor.java
+++ b/src/se/hal/struct/Sensor.java
@@ -1,8 +1,8 @@
 package se.hal.struct;
 
 import se.hal.HalContext;
-import se.hal.intf.HalSensorData;
 import se.hal.intf.HalSensorController;
+import se.hal.intf.HalSensorData;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;
 import zutil.db.bean.DBBeanSQLResultHandler;
diff --git a/src/se/hal/util/UTCTimeUtility.java b/src/se/hal/util/UTCTimeUtility.java
index 3736755b..e448f957 100755
--- a/src/se/hal/util/UTCTimeUtility.java
+++ b/src/se/hal/util/UTCTimeUtility.java
@@ -1,11 +1,11 @@
 package se.hal.util;
 
+import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength;
+
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.TimeZone;
 
-import se.hal.deamon.SensorDataAggregatorDaemon.AggregationPeriodLength;
-
 public class UTCTimeUtility {	
 	public static final long SECOND_IN_MS = 1000;
 	public static final long MINUTE_IN_MS = SECOND_IN_MS * 60;