diff --git a/Configuration/PublicRead.go b/Configuration/PublicRead.go
index 2e4b736..9bd9a81 100644
--- a/Configuration/PublicRead.go
+++ b/Configuration/PublicRead.go
@@ -1,6 +1,8 @@
 package Configuration
 
-import "github.com/SommerEngineering/Ocean/Configuration/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Configuration/Meta"
+)
 
 /*
 Read the whole configuration and enable Ocean to get the configuration database.
diff --git a/Configuration/ReadConfiguration.go b/Configuration/ReadConfiguration.go
index e791bfe..7a9ede6 100644
--- a/Configuration/ReadConfiguration.go
+++ b/Configuration/ReadConfiguration.go
@@ -1,10 +1,12 @@
 package Configuration
 
-import "encoding/json"
-import "os"
-import "path/filepath"
-import "github.com/SommerEngineering/Ocean/Log"
-import "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"encoding/json"
+	"github.com/SommerEngineering/Ocean/Log"
+	"github.com/SommerEngineering/Ocean/Log/Meta"
+	"os"
+	"path/filepath"
+)
 
 func readConfiguration() {
 
diff --git a/Configuration/Variables.go b/Configuration/Variables.go
index 871a9d0..94c0ba6 100644
--- a/Configuration/Variables.go
+++ b/Configuration/Variables.go
@@ -1,7 +1,9 @@
 package Configuration
 
-import "github.com/SommerEngineering/Ocean/Configuration/Meta"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Configuration/Meta"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 var (
 	filename                         = "configuration.json" // Where is the configuration located?
diff --git a/ConfigurationDB/CheckConfiguration.go b/ConfigurationDB/CheckConfiguration.go
index 2a5b69e..19876fd 100644
--- a/ConfigurationDB/CheckConfiguration.go
+++ b/ConfigurationDB/CheckConfiguration.go
@@ -1,8 +1,10 @@
 package ConfigurationDB
 
-import "labix.org/v2/mgo/bson"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2/bson"
+)
 
 func checkConfiguration() {
 	Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameDATABASE, `Check now the configuration database.`)
diff --git a/ConfigurationDB/Init.go b/ConfigurationDB/Init.go
index 6fb2668..baf74ac 100644
--- a/ConfigurationDB/Init.go
+++ b/ConfigurationDB/Init.go
@@ -1,9 +1,11 @@
 package ConfigurationDB
 
-import "labix.org/v2/mgo"
-import "github.com/SommerEngineering/Ocean/Configuration"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Configuration"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2"
+)
 
 func init() {
 
diff --git a/ConfigurationDB/Read.go b/ConfigurationDB/Read.go
index 735c2da..d23c62e 100644
--- a/ConfigurationDB/Read.go
+++ b/ConfigurationDB/Read.go
@@ -1,8 +1,10 @@
 package ConfigurationDB
 
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
-import "labix.org/v2/mgo/bson"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2/bson"
+)
 
 /*
 This function reads the current configuration value.
diff --git a/ConfigurationDB/Shutdown.go b/ConfigurationDB/Shutdown.go
index 0f84581..3909a32 100644
--- a/ConfigurationDB/Shutdown.go
+++ b/ConfigurationDB/Shutdown.go
@@ -1,7 +1,9 @@
 package ConfigurationDB
 
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 /*
 Do not use this type by your own! It is a Ocean internal type to provide a shutdown function for the configuration database.
diff --git a/ConfigurationDB/Variables.go b/ConfigurationDB/Variables.go
index cc578a3..f2b550d 100644
--- a/ConfigurationDB/Variables.go
+++ b/ConfigurationDB/Variables.go
@@ -1,8 +1,10 @@
 package ConfigurationDB
 
-import "labix.org/v2/mgo"
-import "github.com/SommerEngineering/Ocean/Configuration/Meta"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Configuration/Meta"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2"
+)
 
 var (
 	session    *mgo.Session       = nil
diff --git a/ConfigurationDB/Write.go b/ConfigurationDB/Write.go
index 50f7422..6bc9590 100644
--- a/ConfigurationDB/Write.go
+++ b/ConfigurationDB/Write.go
@@ -1,8 +1,10 @@
 package ConfigurationDB
 
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
-import "labix.org/v2/mgo/bson"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2/bson"
+)
 
 /*
 This function writes the configuration value.
diff --git a/CustomerDB/AccessDB.go b/CustomerDB/AccessDB.go
index fb4e825..93035b4 100644
--- a/CustomerDB/AccessDB.go
+++ b/CustomerDB/AccessDB.go
@@ -1,6 +1,8 @@
 package CustomerDB
 
-import "labix.org/v2/mgo"
+import (
+	"gopkg.in/mgo.v2"
+)
 
 /*
 Get the database instance of the MGo Mongo driver.
diff --git a/CustomerDB/Init.go b/CustomerDB/Init.go
index 9748dcc..b139299 100644
--- a/CustomerDB/Init.go
+++ b/CustomerDB/Init.go
@@ -1,9 +1,11 @@
 package CustomerDB
 
-import "labix.org/v2/mgo"
-import "github.com/SommerEngineering/Ocean/ConfigurationDB"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ConfigurationDB"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2"
+)
 
 func init() {
 
diff --git a/CustomerDB/Shutdown.go b/CustomerDB/Shutdown.go
index 51c6a12..2ca5e49 100644
--- a/CustomerDB/Shutdown.go
+++ b/CustomerDB/Shutdown.go
@@ -1,7 +1,9 @@
 package CustomerDB
 
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 /*
 Please do not use this type. It is an internal type of Ocean to provide a shutdown function!
diff --git a/CustomerDB/Variables.go b/CustomerDB/Variables.go
index 2e3891f..f43bd41 100644
--- a/CustomerDB/Variables.go
+++ b/CustomerDB/Variables.go
@@ -1,7 +1,9 @@
 package CustomerDB
 
-import "labix.org/v2/mgo"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2"
+)
 
 var (
 	mainSession      *mgo.Session = nil
diff --git a/ICCC/Data2Message.go b/ICCC/Data2Message.go
index 29e7cf1..ffc831f 100644
--- a/ICCC/Data2Message.go
+++ b/ICCC/Data2Message.go
@@ -1,8 +1,10 @@
 package ICCC
 
-import "fmt"
-import "reflect"
-import "strconv"
+import (
+	"fmt"
+	"reflect"
+	"strconv"
+)
 
 func Data2Message(target interface{}, data map[string][]string) (channel, command string, obj interface{}) {
 	if data == nil || len(data) == 0 {
diff --git a/ICCC/Doc.go b/ICCC/Doc.go
index 9ee2c19..15399a2 100644
--- a/ICCC/Doc.go
+++ b/ICCC/Doc.go
@@ -1,4 +1,4 @@
 /*
-This is the "[I]nter Data [C]enter and Appli[c]ation [C]ommunication"
+This is the "[I]nter-[C]omponent [C]ommunication [C]hannel"
 */
 package ICCC
diff --git a/ICCC/HTTPConnector.go b/ICCC/HTTPConnector.go
index 7039df8..866990a 100644
--- a/ICCC/HTTPConnector.go
+++ b/ICCC/HTTPConnector.go
@@ -1,10 +1,12 @@
 package ICCC
 
-import "fmt"
-import "net/http"
-import "github.com/SommerEngineering/Ocean/Tools"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"fmt"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Tools"
+	"net/http"
+)
 
 func ICCCHandler(response http.ResponseWriter, request *http.Request) {
 	if errParse := request.ParseForm(); errParse != nil {
diff --git a/ICCC/Init.go b/ICCC/Init.go
index 45cdc38..13fcc80 100644
--- a/ICCC/Init.go
+++ b/ICCC/Init.go
@@ -1,9 +1,11 @@
 package ICCC
 
-import "container/list"
-import "github.com/SommerEngineering/Ocean/Tools"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"container/list"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Tools"
+)
 
 func init() {
 	Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameINIT, `Start init of ICCC.`)
diff --git a/ICCC/InitDB.go b/ICCC/InitDB.go
index cdab44d..3fcc623 100644
--- a/ICCC/InitDB.go
+++ b/ICCC/InitDB.go
@@ -1,9 +1,11 @@
 package ICCC
 
-import "labix.org/v2/mgo"
-import "github.com/SommerEngineering/Ocean/CustomerDB"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/CustomerDB"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2"
+)
 
 func initDB() {
 	Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameINIT, `Start init of the ICCC collections.`)
diff --git a/ICCC/ListenerCache.go b/ICCC/ListenerCache.go
index cff4dbb..81c3501 100644
--- a/ICCC/ListenerCache.go
+++ b/ICCC/ListenerCache.go
@@ -1,12 +1,14 @@
 package ICCC
 
-import "fmt"
-import "time"
-import "labix.org/v2/mgo/bson"
-import "github.com/SommerEngineering/Ocean/Shutdown"
-import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"fmt"
+	"github.com/SommerEngineering/Ocean/ICCC/Scheme"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Shutdown"
+	"gopkg.in/mgo.v2/bson"
+	"time"
+)
 
 func InitCacheNow() {
 	startCacheTimerLock.Lock()
diff --git a/ICCC/Message2Data.go b/ICCC/Message2Data.go
index fa01fbe..fa41998 100644
--- a/ICCC/Message2Data.go
+++ b/ICCC/Message2Data.go
@@ -1,8 +1,10 @@
 package ICCC
 
-import "fmt"
-import "reflect"
-import "strconv"
+import (
+	"fmt"
+	"reflect"
+	"strconv"
+)
 
 func message2Data(channel, command string, message interface{}) (data map[string][]string) {
 	data = make(map[string][]string)
diff --git a/ICCC/Register2Database.go b/ICCC/Register2Database.go
index 24a30db..838e299 100644
--- a/ICCC/Register2Database.go
+++ b/ICCC/Register2Database.go
@@ -1,9 +1,11 @@
 package ICCC
 
-import "labix.org/v2/mgo/bson"
-import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ICCC/Scheme"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2/bson"
+)
 
 func register2Database(channel, command string) {
 	Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `Register this ICCC command in to the database.`, `channel=`+channel, `command=`+command)
diff --git a/ICCC/RegisterHost2Database.go b/ICCC/RegisterHost2Database.go
index e44d811..7073d4e 100644
--- a/ICCC/RegisterHost2Database.go
+++ b/ICCC/RegisterHost2Database.go
@@ -1,10 +1,12 @@
 package ICCC
 
-import "labix.org/v2/mgo/bson"
-import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
-import "github.com/SommerEngineering/Ocean/Tools"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ICCC/Scheme"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Tools"
+	"gopkg.in/mgo.v2/bson"
+)
 
 func registerHost2Database() {
 	host := Scheme.Host{}
diff --git a/ICCC/Registrar.go b/ICCC/Registrar.go
index ba12b09..9dec531 100644
--- a/ICCC/Registrar.go
+++ b/ICCC/Registrar.go
@@ -1,8 +1,10 @@
 package ICCC
 
-import "fmt"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"fmt"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 func Registrar(channel, command string, callback func(data map[string][]string)) {
 	listenersLock.Lock()
diff --git a/ICCC/Send.go b/ICCC/Send.go
index 0d76686..dfd94d2 100644
--- a/ICCC/Send.go
+++ b/ICCC/Send.go
@@ -1,11 +1,13 @@
 package ICCC
 
-import "net/http"
-import "net/url"
-import "github.com/SommerEngineering/Ocean/Tools"
-import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ICCC/Scheme"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Tools"
+	"net/http"
+	"net/url"
+)
 
 func sendMessage(listener Scheme.Listener, data map[string][]string) {
 
diff --git a/ICCC/Shutdown.go b/ICCC/Shutdown.go
index e3a5a71..6ba4694 100644
--- a/ICCC/Shutdown.go
+++ b/ICCC/Shutdown.go
@@ -1,9 +1,11 @@
 package ICCC
 
-import "labix.org/v2/mgo/bson"
-import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ICCC/Scheme"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2/bson"
+)
 
 /*
 Please do not use this type. It is an internal type of Ocean to provide a shutdown function!
diff --git a/ICCC/Variables.go b/ICCC/Variables.go
index db65050..8074694 100644
--- a/ICCC/Variables.go
+++ b/ICCC/Variables.go
@@ -1,9 +1,11 @@
 package ICCC
 
-import "sync"
-import "container/list"
-import "labix.org/v2/mgo"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"container/list"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2"
+	"sync"
+)
 
 const (
 	ChannelSYSTEM   string = `System`
diff --git a/ICCC/WriteMessage2All.go b/ICCC/WriteMessage2All.go
index 5a34b0a..e1d0869 100644
--- a/ICCC/WriteMessage2All.go
+++ b/ICCC/WriteMessage2All.go
@@ -1,8 +1,10 @@
 package ICCC
 
-import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ICCC/Scheme"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 func WriteMessage2All(channel, command string, message interface{}) {
 	cacheListenerDatabaseLock.RLock()
diff --git a/ICCC/WriteMessage2Any.go b/ICCC/WriteMessage2Any.go
index 3e4504a..984c2aa 100644
--- a/ICCC/WriteMessage2Any.go
+++ b/ICCC/WriteMessage2Any.go
@@ -1,9 +1,11 @@
 package ICCC
 
-import "github.com/SommerEngineering/Ocean/Tools"
-import "github.com/SommerEngineering/Ocean/ICCC/Scheme"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ICCC/Scheme"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Tools"
+)
 
 func WriteMessage2Any(channel, command string, message interface{}) {
 	cacheListenerDatabaseLock.RLock()
diff --git a/Log/AddDevice.go b/Log/AddDevice.go
index 4cd2587..30906e2 100644
--- a/Log/AddDevice.go
+++ b/Log/AddDevice.go
@@ -1,6 +1,8 @@
 package Log
 
-import "github.com/SommerEngineering/Ocean/Log/Device"
+import (
+	"github.com/SommerEngineering/Ocean/Log/Device"
+)
 
 /*
 Registering the logging devices. Normally, it is not necessary to call this function. To enable or disable a logging device,
diff --git a/Log/Array.go b/Log/Array.go
index 04af449..98af805 100644
--- a/Log/Array.go
+++ b/Log/Array.go
@@ -1,7 +1,9 @@
 package Log
 
-import "container/list"
-import "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"container/list"
+	"github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 func logEntryListToArray(data *list.List) (result []Meta.Entry) {
 	count := data.Len()
diff --git a/Log/Device/Device.go b/Log/Device/Device.go
index 3ce7411..e77bc1a 100644
--- a/Log/Device/Device.go
+++ b/Log/Device/Device.go
@@ -1,6 +1,8 @@
 package Device
 
-import "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 type Device interface {
 	Log(logEntries []Meta.Entry)
diff --git a/Log/DeviceConsole/ActivateLoggingDevice.go b/Log/DeviceConsole/ActivateLoggingDevice.go
index 45f7cb1..903d053 100644
--- a/Log/DeviceConsole/ActivateLoggingDevice.go
+++ b/Log/DeviceConsole/ActivateLoggingDevice.go
@@ -1,6 +1,8 @@
 package DeviceConsole
 
-import "github.com/SommerEngineering/Ocean/Log"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+)
 
 func ActivateLoggingDevice() {
 	Log.AddLoggingDevice(Console{})
diff --git a/Log/DeviceConsole/Console.go b/Log/DeviceConsole/Console.go
index c174627..e6e545a 100644
--- a/Log/DeviceConsole/Console.go
+++ b/Log/DeviceConsole/Console.go
@@ -1,7 +1,9 @@
 package DeviceConsole
 
-import "fmt"
-import "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"fmt"
+	"github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 type Console struct {
 }
diff --git a/Log/DeviceDatabase/ActivateLoggingDevice.go b/Log/DeviceDatabase/ActivateLoggingDevice.go
index 14d394c..be70395 100644
--- a/Log/DeviceDatabase/ActivateLoggingDevice.go
+++ b/Log/DeviceDatabase/ActivateLoggingDevice.go
@@ -1,6 +1,8 @@
 package DeviceDatabase
 
-import "github.com/SommerEngineering/Ocean/Log"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+)
 
 func ActivateLoggingDevice() {
 	Log.AddLoggingDevice(Database{})
diff --git a/Log/DeviceDatabase/Init.go b/Log/DeviceDatabase/Init.go
index 6f20a0d..f9ed9a0 100644
--- a/Log/DeviceDatabase/Init.go
+++ b/Log/DeviceDatabase/Init.go
@@ -1,10 +1,12 @@
 package DeviceDatabase
 
-import "strconv"
-import "fmt"
-import "github.com/SommerEngineering/Ocean/ConfigurationDB"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"fmt"
+	"github.com/SommerEngineering/Ocean/ConfigurationDB"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"strconv"
+)
 
 func init() {
 
diff --git a/Log/DeviceDatabase/InitDB.go b/Log/DeviceDatabase/InitDB.go
index 0a51393..f282100 100644
--- a/Log/DeviceDatabase/InitDB.go
+++ b/Log/DeviceDatabase/InitDB.go
@@ -1,9 +1,11 @@
 package DeviceDatabase
 
-import "labix.org/v2/mgo"
-import "github.com/SommerEngineering/Ocean/ConfigurationDB"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ConfigurationDB"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2"
+)
 
 func initDatabase() {
 
diff --git a/Log/DeviceDatabase/ReadFromCache.go b/Log/DeviceDatabase/ReadFromCache.go
index 6238d21..d5c556f 100644
--- a/Log/DeviceDatabase/ReadFromCache.go
+++ b/Log/DeviceDatabase/ReadFromCache.go
@@ -1,7 +1,9 @@
 package DeviceDatabase
 
-import "time"
-import "github.com/SommerEngineering/Ocean/Shutdown"
+import (
+	"github.com/SommerEngineering/Ocean/Shutdown"
+	"time"
+)
 
 // Case: The cache is full
 func cacheFull() {
diff --git a/Log/DeviceDatabase/ReceiveLogging.go b/Log/DeviceDatabase/ReceiveLogging.go
index 1059cec..f475d0b 100644
--- a/Log/DeviceDatabase/ReceiveLogging.go
+++ b/Log/DeviceDatabase/ReceiveLogging.go
@@ -1,6 +1,8 @@
 package DeviceDatabase
 
-import "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 type Database struct {
 }
diff --git a/Log/DeviceDatabase/Scheme.go b/Log/DeviceDatabase/Scheme.go
index 5cb999a..5ef6205 100644
--- a/Log/DeviceDatabase/Scheme.go
+++ b/Log/DeviceDatabase/Scheme.go
@@ -1,6 +1,8 @@
 package DeviceDatabase
 
-import "time"
+import (
+	"time"
+)
 
 type LogDBEntry struct {
 	TimeUTC            time.Time `bson:"TimeUTC"`
diff --git a/Log/DeviceDatabase/Variables.go b/Log/DeviceDatabase/Variables.go
index cd93dd2..02eda6a 100644
--- a/Log/DeviceDatabase/Variables.go
+++ b/Log/DeviceDatabase/Variables.go
@@ -1,8 +1,10 @@
 package DeviceDatabase
 
-import "sync"
-import "labix.org/v2/mgo"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2"
+	"sync"
+)
 
 var (
 	senderName                 LM.Sender       = `System::Logger::Database`
diff --git a/Log/DeviceDatabase/Write2Cache.go b/Log/DeviceDatabase/Write2Cache.go
index 478b38b..c461c9b 100644
--- a/Log/DeviceDatabase/Write2Cache.go
+++ b/Log/DeviceDatabase/Write2Cache.go
@@ -1,6 +1,8 @@
 package DeviceDatabase
 
-import "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 func write2Cache(entries []Meta.Entry) {
 	for _, entry := range entries {
diff --git a/Log/DeviceDelay.go b/Log/DeviceDelay.go
index 41640f5..ff2c189 100644
--- a/Log/DeviceDelay.go
+++ b/Log/DeviceDelay.go
@@ -1,7 +1,9 @@
 package Log
 
-import "github.com/SommerEngineering/Ocean/Log/Meta"
-import "github.com/SommerEngineering/Ocean/Log/Device"
+import (
+	"github.com/SommerEngineering/Ocean/Log/Device"
+	"github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 func deviceDelay(newEntry Meta.Entry) {
 	defer checkDeviceDelaySize()
diff --git a/Log/Flush.go b/Log/Flush.go
index 5ac562c..b75dfa9 100644
--- a/Log/Flush.go
+++ b/Log/Flush.go
@@ -1,7 +1,9 @@
 package Log
 
-import "time"
-import "github.com/SommerEngineering/Ocean/Log/Device"
+import (
+	"github.com/SommerEngineering/Ocean/Log/Device"
+	"time"
+)
 
 /*
 Please do not call this function your self! This function allows Ocean to flush the logging at the shutting down case.
diff --git a/Log/Handlers.go b/Log/Handlers.go
index 57b9229..d96437b 100644
--- a/Log/Handlers.go
+++ b/Log/Handlers.go
@@ -1,9 +1,11 @@
 package Log
 
-import "time"
-import "fmt"
-import "strings"
-import "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"fmt"
+	"github.com/SommerEngineering/Ocean/Log/Meta"
+	"strings"
+	"time"
+)
 
 func writeToChannel(logEntry Meta.Entry) {
 	select {
diff --git a/Log/Init.go b/Log/Init.go
index 63771c8..0b2b59b 100644
--- a/Log/Init.go
+++ b/Log/Init.go
@@ -1,13 +1,15 @@
 package Log
 
-import "github.com/SommerEngineering/Ocean/Log/Meta"
-import "strconv"
-import "container/list"
-import "sync"
-import "path/filepath"
-import "os"
-import "io/ioutil"
-import "strings"
+import (
+	"container/list"
+	"github.com/SommerEngineering/Ocean/Log/Meta"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"sync"
+)
 
 func readProjectName() {
 	if currentDir, dirError := os.Getwd(); dirError != nil {
diff --git a/Log/Meta/Entry.go b/Log/Meta/Entry.go
index 06907c9..43ae1ca 100644
--- a/Log/Meta/Entry.go
+++ b/Log/Meta/Entry.go
@@ -1,6 +1,8 @@
 package Meta
 
-import "time"
+import (
+	"time"
+)
 
 type Entry struct {
 	Project            string
diff --git a/Log/Meta/Format.go b/Log/Meta/Format.go
index ee228c4..3bbdda2 100644
--- a/Log/Meta/Format.go
+++ b/Log/Meta/Format.go
@@ -1,9 +1,11 @@
 package Meta
 
-import "fmt"
-import "time"
-import "strconv"
-import "strings"
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+)
 
 func (entry Entry) Format() (result string) {
 
@@ -23,18 +25,18 @@ func (entry Entry) Format() (result string) {
 	}
 
 	messageDescription := entry.MessageDescription
-	messageDescription = strings.Replace(messageDescription, `\n`, ` `, -1)
-	messageDescription = strings.Replace(messageDescription, `\t`, ` `, -1)
-	messageDescription = strings.Replace(messageDescription, `\r`, ` `, -1)
+	messageDescription = strings.Replace(messageDescription, "\n", ` `, -1)
+	messageDescription = strings.Replace(messageDescription, "\t", ` `, -1)
+	messageDescription = strings.Replace(messageDescription, "\r", ` `, -1)
 
 	result = fmt.Sprintf(` [■] P:%10s [■] %s [■] %10s [■] %11s [■] %10s [■] %10s [■] sender: %-40s [■] name: %-26s [■] %s [■]`, entry.Project[:lenProject], formatTime(entry.Time), FormatCategory(entry.Category), FormatLevel(entry.Level), FormatSeverity(entry.Severity), FormatImpact(entry.Impact), entry.Sender[:lenSender], entry.MessageName[:lenMessageName], messageDescription)
 
 	for _, param := range entry.Parameters {
 
 		paramText := param
-		paramText = strings.Replace(paramText, `\n`, ` `, -1)
-		paramText = strings.Replace(paramText, `\t`, ` `, -1)
-		paramText = strings.Replace(paramText, `\r`, ` `, -1)
+		paramText = strings.Replace(paramText, "\n", ` `, -1)
+		paramText = strings.Replace(paramText, "\t", ` `, -1)
+		paramText = strings.Replace(paramText, "\r", ` `, -1)
 
 		result = fmt.Sprintf(`%s %s [■]`, result, paramText)
 	}
diff --git a/Log/Scheduler.go b/Log/Scheduler.go
index 9390fa6..1f91546 100644
--- a/Log/Scheduler.go
+++ b/Log/Scheduler.go
@@ -1,7 +1,9 @@
 package Log
 
-import "github.com/SommerEngineering/Ocean/Log/Meta"
-import "time"
+import (
+	"github.com/SommerEngineering/Ocean/Log/Meta"
+	"time"
+)
 
 // Note: The scheduler is the consumer for the logging channel!
 func scheduler(logBuffer chan Meta.Entry) {
diff --git a/Log/Timer.go b/Log/Timer.go
index 4a59dcf..4530fb7 100644
--- a/Log/Timer.go
+++ b/Log/Timer.go
@@ -1,9 +1,11 @@
 package Log
 
-import "time"
-import "fmt"
-import "github.com/SommerEngineering/Ocean/Log/Device"
-import "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"fmt"
+	"github.com/SommerEngineering/Ocean/Log/Device"
+	"github.com/SommerEngineering/Ocean/Log/Meta"
+	"time"
+)
 
 func initTimer() {
 
diff --git a/Log/Variables.go b/Log/Variables.go
index 7d4345f..1fc5d3e 100644
--- a/Log/Variables.go
+++ b/Log/Variables.go
@@ -1,8 +1,10 @@
 package Log
 
-import "github.com/SommerEngineering/Ocean/Log/Meta"
-import "container/list"
-import "sync"
+import (
+	"container/list"
+	"github.com/SommerEngineering/Ocean/Log/Meta"
+	"sync"
+)
 
 var (
 	entriesBuffer                chan Meta.Entry = nil
diff --git a/MimeTypes/MimeTypes.go b/MimeTypes/MimeTypes.go
index faf9e7e..4250f5e 100644
--- a/MimeTypes/MimeTypes.go
+++ b/MimeTypes/MimeTypes.go
@@ -1,6 +1,8 @@
 package MimeTypes
 
-import "strings"
+import (
+	"strings"
+)
 
 type MimeType struct {
 	MimeType      string
diff --git a/MimeTypes/Write2HTTP.go b/MimeTypes/Write2HTTP.go
index db3230d..939f743 100644
--- a/MimeTypes/Write2HTTP.go
+++ b/MimeTypes/Write2HTTP.go
@@ -1,6 +1,8 @@
 package MimeTypes
 
-import "net/http"
+import (
+	"net/http"
+)
 
 func Write2HTTP(response http.ResponseWriter, mime MimeType) {
 	response.Header().Add(`Content-Type`, mime.MimeType)
diff --git a/NumGen/GetNumber.go b/NumGen/GetNumber.go
index eb61f4b..5e5ef65 100644
--- a/NumGen/GetNumber.go
+++ b/NumGen/GetNumber.go
@@ -1,11 +1,13 @@
 package NumGen
 
-import "net/http"
-import "net/url"
-import "strconv"
-import "github.com/SommerEngineering/Ocean/Shutdown"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Shutdown"
+	"net/http"
+	"net/url"
+	"strconv"
+)
 
 func GetNextInt64(name string) (result int64) {
 	result = badNumber64
diff --git a/NumGen/HandlerGetNext.go b/NumGen/HandlerGetNext.go
index 3637248..6772831 100644
--- a/NumGen/HandlerGetNext.go
+++ b/NumGen/HandlerGetNext.go
@@ -1,10 +1,12 @@
 package NumGen
 
-import "fmt"
-import "net/http"
-import "github.com/SommerEngineering/Ocean/Shutdown"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"fmt"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Shutdown"
+	"net/http"
+)
 
 func HandlerGetNext(response http.ResponseWriter, request *http.Request) {
 	if Shutdown.IsDown() {
diff --git a/NumGen/Init.go b/NumGen/Init.go
index 1b27624..ba09a05 100644
--- a/NumGen/Init.go
+++ b/NumGen/Init.go
@@ -1,11 +1,13 @@
 package NumGen
 
-import "strings"
-import "strconv"
-import "github.com/SommerEngineering/Ocean/Tools"
-import "github.com/SommerEngineering/Ocean/ConfigurationDB"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ConfigurationDB"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Tools"
+	"strconv"
+	"strings"
+)
 
 func init() {
 	Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `Init the number generator.`)
diff --git a/NumGen/InitDB.go b/NumGen/InitDB.go
index 2c94571..de6a7f9 100644
--- a/NumGen/InitDB.go
+++ b/NumGen/InitDB.go
@@ -1,9 +1,11 @@
 package NumGen
 
-import "labix.org/v2/mgo"
-import "github.com/SommerEngineering/Ocean/CustomerDB"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/CustomerDB"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2"
+)
 
 func initDB() {
 	Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameINIT, `Start init of number generator collection.`)
diff --git a/NumGen/Producer.go b/NumGen/Producer.go
index 6e7101a..a635032 100644
--- a/NumGen/Producer.go
+++ b/NumGen/Producer.go
@@ -1,10 +1,12 @@
 package NumGen
 
-import "time"
-import "labix.org/v2/mgo/bson"
-import "github.com/SommerEngineering/Ocean/Shutdown"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Shutdown"
+	"gopkg.in/mgo.v2/bson"
+	"time"
+)
 
 func producer(name string) {
 	Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `The NumGen producer is now starting.`, `name=`+name)
diff --git a/NumGen/RequestChannel.go b/NumGen/RequestChannel.go
index a43cf6b..107e02e 100644
--- a/NumGen/RequestChannel.go
+++ b/NumGen/RequestChannel.go
@@ -1,8 +1,10 @@
 package NumGen
 
-import "github.com/SommerEngineering/Ocean/Shutdown"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Shutdown"
+)
 
 func requestChannel4Name(name string) (result chan int64) {
 
diff --git a/NumGen/Shutdown.go b/NumGen/Shutdown.go
index 76d0dc8..e3a3b34 100644
--- a/NumGen/Shutdown.go
+++ b/NumGen/Shutdown.go
@@ -1,7 +1,9 @@
 package NumGen
 
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 type ShutdownFunction struct {
 }
diff --git a/NumGen/Variables.go b/NumGen/Variables.go
index 9348a23..31cdbe3 100644
--- a/NumGen/Variables.go
+++ b/NumGen/Variables.go
@@ -1,8 +1,10 @@
 package NumGen
 
-import "sync"
-import "labix.org/v2/mgo"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"gopkg.in/mgo.v2"
+	"sync"
+)
 
 var (
 	correctPassword   string                = ``
diff --git a/Robots/Handler.go b/Robots/Handler.go
index 9a59de6..2ea8db8 100644
--- a/Robots/Handler.go
+++ b/Robots/Handler.go
@@ -1,10 +1,12 @@
 package Robots
 
-import "fmt"
-import "net/http"
-import "github.com/SommerEngineering/Ocean/Shutdown"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"fmt"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Shutdown"
+	"net/http"
+)
 
 func HandlerRobots(response http.ResponseWriter, request *http.Request) {
 	if Shutdown.IsDown() {
diff --git a/Robots/Init.go b/Robots/Init.go
index 43b37b6..fdd0f51 100644
--- a/Robots/Init.go
+++ b/Robots/Init.go
@@ -1,8 +1,10 @@
 package Robots
 
-import "github.com/SommerEngineering/Ocean/ConfigurationDB"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ConfigurationDB"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 func init() {
 	Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `Init the robots component.`)
diff --git a/Robots/Variables.go b/Robots/Variables.go
index 754af18..235bbc3 100644
--- a/Robots/Variables.go
+++ b/Robots/Variables.go
@@ -1,6 +1,8 @@
 package Robots
 
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 var (
 	senderName    LM.Sender = `System::Robots`
diff --git a/Shutdown/Init.go b/Shutdown/Init.go
index 312f589..6d3a42b 100644
--- a/Shutdown/Init.go
+++ b/Shutdown/Init.go
@@ -1,8 +1,10 @@
 package Shutdown
 
-import "container/list"
-import "os/signal"
-import "os"
+import (
+	"container/list"
+	"os"
+	"os/signal"
+)
 
 func init() {
 	shutdownHandlers = list.New()
diff --git a/Shutdown/Shutdown.go b/Shutdown/Shutdown.go
index 05c0b8b..c8f30bb 100644
--- a/Shutdown/Shutdown.go
+++ b/Shutdown/Shutdown.go
@@ -1,8 +1,10 @@
 package Shutdown
 
-import "os"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"os"
+)
 
 type ShutdownHandler interface {
 	Shutdown()
diff --git a/Shutdown/Variables.go b/Shutdown/Variables.go
index b283723..1ecdafa 100644
--- a/Shutdown/Variables.go
+++ b/Shutdown/Variables.go
@@ -1,8 +1,10 @@
 package Shutdown
 
-import "os"
-import "container/list"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"container/list"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"os"
+)
 
 var (
 	shutdownSignal   chan os.Signal = make(chan os.Signal)
diff --git a/StaticFiles/FindAndReadFile.go b/StaticFiles/FindAndReadFile.go
index 69152c5..a734f32 100644
--- a/StaticFiles/FindAndReadFile.go
+++ b/StaticFiles/FindAndReadFile.go
@@ -1,11 +1,13 @@
 package StaticFiles
 
-import "io/ioutil"
-import "bytes"
-import "archive/zip"
-import "github.com/SommerEngineering/Ocean/Shutdown"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"archive/zip"
+	"bytes"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Shutdown"
+	"io/ioutil"
+)
 
 func FindAndReadFile(filename string) (result []byte) {
 	if Shutdown.IsDown() {
diff --git a/StaticFiles/Handler.go b/StaticFiles/Handler.go
index 8c1c6e9..223657c 100644
--- a/StaticFiles/Handler.go
+++ b/StaticFiles/Handler.go
@@ -1,12 +1,14 @@
 package StaticFiles
 
-import "fmt"
-import "strings"
-import "net/http"
-import "github.com/SommerEngineering/Ocean/Shutdown"
-import "github.com/SommerEngineering/Ocean/MimeTypes"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"fmt"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/MimeTypes"
+	"github.com/SommerEngineering/Ocean/Shutdown"
+	"net/http"
+	"strings"
+)
 
 func HandlerStaticFiles(response http.ResponseWriter, request *http.Request) {
 	if Shutdown.IsDown() {
diff --git a/StaticFiles/Init.go b/StaticFiles/Init.go
index 8dfb974..2df69ea 100644
--- a/StaticFiles/Init.go
+++ b/StaticFiles/Init.go
@@ -1,10 +1,12 @@
 package StaticFiles
 
-import "io/ioutil"
-import "github.com/SommerEngineering/Ocean/CustomerDB"
-import "github.com/SommerEngineering/Ocean/ConfigurationDB"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ConfigurationDB"
+	"github.com/SommerEngineering/Ocean/CustomerDB"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"io/ioutil"
+)
 
 func init() {
 	Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `Starting now the static files component.`)
diff --git a/StaticFiles/Map2Root.go b/StaticFiles/Map2Root.go
index 1131e1d..d64ac9c 100644
--- a/StaticFiles/Map2Root.go
+++ b/StaticFiles/Map2Root.go
@@ -1,7 +1,9 @@
 package StaticFiles
 
-import "net/http"
-import "github.com/SommerEngineering/Ocean/Shutdown"
+import (
+	"github.com/SommerEngineering/Ocean/Shutdown"
+	"net/http"
+)
 
 func HandlerMapStaticFiles2Root(response http.ResponseWriter, request *http.Request) {
 	if Shutdown.IsDown() {
diff --git a/StaticFiles/Variables.go b/StaticFiles/Variables.go
index 314bfdb..01b3a89 100644
--- a/StaticFiles/Variables.go
+++ b/StaticFiles/Variables.go
@@ -1,6 +1,8 @@
 package StaticFiles
 
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 var (
 	senderName            LM.Sender = `System::StaticFiles`
diff --git a/System/ICCCStart.go b/System/ICCCStart.go
index ca8135b..de8d88d 100644
--- a/System/ICCCStart.go
+++ b/System/ICCCStart.go
@@ -1,8 +1,10 @@
 package System
 
-import "github.com/SommerEngineering/Ocean/ICCC"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ICCC"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 func icccSystemStart(data map[string][]string) {
 	_, _, obj := ICCC.Data2Message(&ICCCStartUpMessage{}, data)
diff --git a/System/Init.go b/System/Init.go
index 58783d9..526f4f9 100644
--- a/System/Init.go
+++ b/System/Init.go
@@ -1,15 +1,17 @@
 package System
 
-import "fmt"
-import "runtime"
-import "strconv"
-import "github.com/SommerEngineering/Ocean/ICCC"
-import "github.com/SommerEngineering/Ocean/Shutdown"
-import "github.com/SommerEngineering/Ocean/ConfigurationDB"
-import "github.com/SommerEngineering/Ocean/CustomerDB"
-import "github.com/SommerEngineering/Ocean/NumGen"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"fmt"
+	"github.com/SommerEngineering/Ocean/ConfigurationDB"
+	"github.com/SommerEngineering/Ocean/CustomerDB"
+	"github.com/SommerEngineering/Ocean/ICCC"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/NumGen"
+	"github.com/SommerEngineering/Ocean/Shutdown"
+	"runtime"
+	"strconv"
+)
 
 func initSystem() {
 
diff --git a/System/InitHandlers.go b/System/InitHandlers.go
index 3be9462..adde383 100644
--- a/System/InitHandlers.go
+++ b/System/InitHandlers.go
@@ -1,14 +1,16 @@
 package System
 
-import "net/http"
-import "github.com/SommerEngineering/Ocean/ICCC"
-import "github.com/SommerEngineering/Ocean/WebContent"
-import "github.com/SommerEngineering/Ocean/StaticFiles"
-import "github.com/SommerEngineering/Ocean/NumGen"
-import "github.com/SommerEngineering/Ocean/Robots"
-import "github.com/SommerEngineering/Ocean/ConfigurationDB"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ConfigurationDB"
+	"github.com/SommerEngineering/Ocean/ICCC"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/NumGen"
+	"github.com/SommerEngineering/Ocean/Robots"
+	"github.com/SommerEngineering/Ocean/StaticFiles"
+	"github.com/SommerEngineering/Ocean/WebContent"
+	"net/http"
+)
 
 func InitHandlers() {
 
diff --git a/System/RegisterLoggingDevices.go b/System/RegisterLoggingDevices.go
index 2ca2051..d9becc3 100644
--- a/System/RegisterLoggingDevices.go
+++ b/System/RegisterLoggingDevices.go
@@ -1,10 +1,12 @@
 package System
 
-import "github.com/SommerEngineering/Ocean/Log/DeviceConsole"
-import "github.com/SommerEngineering/Ocean/Log/DeviceDatabase"
-import "github.com/SommerEngineering/Ocean/ConfigurationDB"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ConfigurationDB"
+	"github.com/SommerEngineering/Ocean/Log"
+	"github.com/SommerEngineering/Ocean/Log/DeviceConsole"
+	"github.com/SommerEngineering/Ocean/Log/DeviceDatabase"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 func initLoggingDevices() {
 
diff --git a/System/Start.go b/System/Start.go
index dd763ec..3f9b154 100644
--- a/System/Start.go
+++ b/System/Start.go
@@ -1,10 +1,12 @@
 package System
 
-import "net/http"
-import "github.com/SommerEngineering/Ocean/Tools"
-import "github.com/SommerEngineering/Ocean/ICCC"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ICCC"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Tools"
+	"net/http"
+)
 
 func StartAndBlockForever() {
 	ipAddressPort := Tools.LocalIPAddressAndPort()
diff --git a/System/Variables.go b/System/Variables.go
index 205d7b2..f300352 100644
--- a/System/Variables.go
+++ b/System/Variables.go
@@ -1,6 +1,8 @@
 package System
 
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 var (
 	senderName LM.Sender = `System::System`
diff --git a/Templates/Init.go b/Templates/Init.go
index 9da9537..9d33324 100644
--- a/Templates/Init.go
+++ b/Templates/Init.go
@@ -1,14 +1,16 @@
 package Templates
 
-import "fmt"
-import "bytes"
-import "html/template"
-import "io/ioutil"
-import "archive/zip"
-import "github.com/SommerEngineering/Ocean/CustomerDB"
-import "github.com/SommerEngineering/Ocean/Tools"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"archive/zip"
+	"bytes"
+	"fmt"
+	"github.com/SommerEngineering/Ocean/CustomerDB"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Tools"
+	"html/template"
+	"io/ioutil"
+)
 
 func init() {
 	Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `Starting the template engine.`)
diff --git a/Templates/Process.go b/Templates/Process.go
index e684f4d..53b7b4c 100644
--- a/Templates/Process.go
+++ b/Templates/Process.go
@@ -1,9 +1,11 @@
 package Templates
 
-import "net/http"
-import "github.com/SommerEngineering/Ocean/MimeTypes"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/MimeTypes"
+	"net/http"
+)
 
 func ProcessHTML(templateName string, response http.ResponseWriter, data interface{}) {
 
diff --git a/Templates/Variables.go b/Templates/Variables.go
index 22769a4..45e19ea 100644
--- a/Templates/Variables.go
+++ b/Templates/Variables.go
@@ -1,7 +1,9 @@
 package Templates
 
-import "html/template"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"html/template"
+)
 
 var (
 	templates  *template.Template = nil
diff --git a/Tools/FormatTime.go b/Tools/FormatTime.go
index f135765..7af22e4 100644
--- a/Tools/FormatTime.go
+++ b/Tools/FormatTime.go
@@ -1,8 +1,10 @@
 package Tools
 
-import "time"
-import "fmt"
-import "strconv"
+import (
+	"fmt"
+	"strconv"
+	"time"
+)
 
 func FormatTime(t1 time.Time) (result string) {
 	var year int = t1.Year()
diff --git a/Tools/IPAddresses.go b/Tools/IPAddresses.go
index e8b542a..381f4f4 100644
--- a/Tools/IPAddresses.go
+++ b/Tools/IPAddresses.go
@@ -1,7 +1,9 @@
 package Tools
 
-import "net"
-import "strings"
+import (
+	"net"
+	"strings"
+)
 
 func ReadAllIPAddresses4ThisHost() (addresses4Host []string) {
 	addresses4Host = ipAddresses
diff --git a/Tools/Init.go b/Tools/Init.go
index 6debea6..a0059b2 100644
--- a/Tools/Init.go
+++ b/Tools/Init.go
@@ -1,11 +1,13 @@
 package Tools
 
-import "os"
-import "time"
-import "math/rand"
-import "github.com/SommerEngineering/Ocean/ConfigurationDB"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ConfigurationDB"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"math/rand"
+	"os"
+	"time"
+)
 
 func init() {
 	// Get this hostname:
diff --git a/Tools/Random.go b/Tools/Random.go
index f19239e..a614129 100644
--- a/Tools/Random.go
+++ b/Tools/Random.go
@@ -1,6 +1,8 @@
 package Tools
 
-import "math/rand"
+import (
+	"math/rand"
+)
 
 func RandomInteger(max int) (rnd int) {
 	rnd = rand.Intn(max)
diff --git a/Tools/Variables.go b/Tools/Variables.go
index f9e8a54..c0c7c38 100644
--- a/Tools/Variables.go
+++ b/Tools/Variables.go
@@ -1,6 +1,8 @@
 package Tools
 
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 var (
 	senderName            LM.Sender = `System::Tools`
diff --git a/WebContent/GetContent.go b/WebContent/GetContent.go
index c43f911..c071e9c 100644
--- a/WebContent/GetContent.go
+++ b/WebContent/GetContent.go
@@ -1,11 +1,13 @@
 package WebContent
 
-import "errors"
-import "archive/zip"
-import "io/ioutil"
-import "bytes"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"archive/zip"
+	"bytes"
+	"errors"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"io/ioutil"
+)
 
 func GetContent(path string) (content []byte, err error) {
 
diff --git a/WebContent/Handler.go b/WebContent/Handler.go
index 131c383..9cc8cf8 100644
--- a/WebContent/Handler.go
+++ b/WebContent/Handler.go
@@ -1,10 +1,12 @@
 package WebContent
 
-import "net/http"
-import "strings"
-import "github.com/SommerEngineering/Ocean/Shutdown"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/Shutdown"
+	"net/http"
+	"strings"
+)
 
 func HandlerDeliverFramework(response http.ResponseWriter, request *http.Request) {
 	if Shutdown.IsDown() {
diff --git a/WebContent/Init.go b/WebContent/Init.go
index 5569dc0..598dce0 100644
--- a/WebContent/Init.go
+++ b/WebContent/Init.go
@@ -1,10 +1,12 @@
 package WebContent
 
-import "io/ioutil"
-import "github.com/SommerEngineering/Ocean/CustomerDB"
-import "github.com/SommerEngineering/Ocean/ConfigurationDB"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"github.com/SommerEngineering/Ocean/ConfigurationDB"
+	"github.com/SommerEngineering/Ocean/CustomerDB"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"io/ioutil"
+)
 
 func init() {
 
diff --git a/WebContent/Send.go b/WebContent/Send.go
index c002a6e..3b025df 100644
--- a/WebContent/Send.go
+++ b/WebContent/Send.go
@@ -1,12 +1,14 @@
 package WebContent
 
-import "net/http"
-import "bytes"
-import "errors"
-import "fmt"
-import "github.com/SommerEngineering/Ocean/MimeTypes"
-import "github.com/SommerEngineering/Ocean/Log"
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"github.com/SommerEngineering/Ocean/Log"
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+	"github.com/SommerEngineering/Ocean/MimeTypes"
+	"net/http"
+)
 
 func SendContent(response http.ResponseWriter, path string) (err error) {
 
diff --git a/WebContent/Variables.go b/WebContent/Variables.go
index 4b6b891..905a02b 100644
--- a/WebContent/Variables.go
+++ b/WebContent/Variables.go
@@ -1,6 +1,8 @@
 package WebContent
 
-import LM "github.com/SommerEngineering/Ocean/Log/Meta"
+import (
+	LM "github.com/SommerEngineering/Ocean/Log/Meta"
+)
 
 var (
 	isInit               = false
diff --git a/history.dat b/history.dat
new file mode 100644
index 0000000..cf16443
--- /dev/null
+++ b/history.dat
@@ -0,0 +1,2 @@
+3507|121819|2014.09.17 18:52:28:598
+3685|121093|2014.10.19 17:10:51:188