diff --git a/LICENSE b/ch.eitchnet.utils/LICENSE
similarity index 100%
rename from LICENSE
rename to ch.eitchnet.utils/LICENSE
diff --git a/README.md b/ch.eitchnet.utils/README.md
similarity index 100%
rename from README.md
rename to ch.eitchnet.utils/README.md
diff --git a/pom.xml b/ch.eitchnet.utils/pom.xml
similarity index 100%
rename from pom.xml
rename to ch.eitchnet.utils/pom.xml
diff --git a/src/main/java/ch/eitchnet/communication/CommandKey.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/CommandKey.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/CommandKey.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/CommandKey.java
diff --git a/src/main/java/ch/eitchnet/communication/CommunicationConnection.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/CommunicationConnection.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/CommunicationConnection.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/CommunicationConnection.java
diff --git a/src/main/java/ch/eitchnet/communication/CommunicationEndpoint.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/CommunicationEndpoint.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/CommunicationEndpoint.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/CommunicationEndpoint.java
diff --git a/src/main/java/ch/eitchnet/communication/ConnectionException.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionException.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/ConnectionException.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionException.java
diff --git a/src/main/java/ch/eitchnet/communication/ConnectionInfo.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionInfo.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/ConnectionInfo.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionInfo.java
diff --git a/src/main/java/ch/eitchnet/communication/ConnectionMessages.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionMessages.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/ConnectionMessages.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionMessages.java
diff --git a/src/main/java/ch/eitchnet/communication/ConnectionMode.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionMode.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/ConnectionMode.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionMode.java
diff --git a/src/main/java/ch/eitchnet/communication/ConnectionObserver.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionObserver.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/ConnectionObserver.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionObserver.java
diff --git a/src/main/java/ch/eitchnet/communication/ConnectionState.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionState.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/ConnectionState.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionState.java
diff --git a/src/main/java/ch/eitchnet/communication/ConnectionStateObserver.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionStateObserver.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/ConnectionStateObserver.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/ConnectionStateObserver.java
diff --git a/src/main/java/ch/eitchnet/communication/IoMessage.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/IoMessage.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/IoMessage.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/IoMessage.java
diff --git a/src/main/java/ch/eitchnet/communication/IoMessageArchive.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/IoMessageArchive.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/IoMessageArchive.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/IoMessageArchive.java
diff --git a/src/main/java/ch/eitchnet/communication/IoMessageStateObserver.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/IoMessageStateObserver.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/IoMessageStateObserver.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/IoMessageStateObserver.java
diff --git a/src/main/java/ch/eitchnet/communication/IoMessageVisitor.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/IoMessageVisitor.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/IoMessageVisitor.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/IoMessageVisitor.java
diff --git a/src/main/java/ch/eitchnet/communication/SimpleMessageArchive.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/SimpleMessageArchive.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/SimpleMessageArchive.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/SimpleMessageArchive.java
diff --git a/src/main/java/ch/eitchnet/communication/StreamMessageVisitor.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/StreamMessageVisitor.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/StreamMessageVisitor.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/StreamMessageVisitor.java
diff --git a/src/main/java/ch/eitchnet/communication/chat/Chat.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/chat/Chat.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/chat/Chat.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/chat/Chat.java
diff --git a/src/main/java/ch/eitchnet/communication/chat/ChatClient.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/chat/ChatClient.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/chat/ChatClient.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/chat/ChatClient.java
diff --git a/src/main/java/ch/eitchnet/communication/chat/ChatIoMessage.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/chat/ChatIoMessage.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/chat/ChatIoMessage.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/chat/ChatIoMessage.java
diff --git a/src/main/java/ch/eitchnet/communication/chat/ChatMessageVisitor.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/chat/ChatMessageVisitor.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/chat/ChatMessageVisitor.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/chat/ChatMessageVisitor.java
diff --git a/src/main/java/ch/eitchnet/communication/chat/ChatServer.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/chat/ChatServer.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/chat/ChatServer.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/chat/ChatServer.java
diff --git a/src/main/java/ch/eitchnet/communication/console/ConsoleEndpoint.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/console/ConsoleEndpoint.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/console/ConsoleEndpoint.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/console/ConsoleEndpoint.java
diff --git a/src/main/java/ch/eitchnet/communication/console/ConsoleMessageVisitor.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/console/ConsoleMessageVisitor.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/console/ConsoleMessageVisitor.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/console/ConsoleMessageVisitor.java
diff --git a/src/main/java/ch/eitchnet/communication/file/FileEndpoint.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/file/FileEndpoint.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/file/FileEndpoint.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/file/FileEndpoint.java
diff --git a/src/main/java/ch/eitchnet/communication/file/FileEndpointMode.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/file/FileEndpointMode.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/file/FileEndpointMode.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/file/FileEndpointMode.java
diff --git a/src/main/java/ch/eitchnet/communication/tcpip/ClientSocketEndpoint.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/tcpip/ClientSocketEndpoint.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/tcpip/ClientSocketEndpoint.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/tcpip/ClientSocketEndpoint.java
diff --git a/src/main/java/ch/eitchnet/communication/tcpip/ServerSocketEndpoint.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/tcpip/ServerSocketEndpoint.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/tcpip/ServerSocketEndpoint.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/tcpip/ServerSocketEndpoint.java
diff --git a/src/main/java/ch/eitchnet/communication/tcpip/SocketEndpointConstants.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/tcpip/SocketEndpointConstants.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/tcpip/SocketEndpointConstants.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/tcpip/SocketEndpointConstants.java
diff --git a/src/main/java/ch/eitchnet/communication/tcpip/SocketMessageVisitor.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/tcpip/SocketMessageVisitor.java
similarity index 100%
rename from src/main/java/ch/eitchnet/communication/tcpip/SocketMessageVisitor.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/communication/tcpip/SocketMessageVisitor.java
diff --git a/src/main/java/ch/eitchnet/db/DbConnectionCheck.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/db/DbConnectionCheck.java
similarity index 100%
rename from src/main/java/ch/eitchnet/db/DbConnectionCheck.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/db/DbConnectionCheck.java
diff --git a/src/main/java/ch/eitchnet/db/DbConstants.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/db/DbConstants.java
similarity index 100%
rename from src/main/java/ch/eitchnet/db/DbConstants.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/db/DbConstants.java
diff --git a/src/main/java/ch/eitchnet/db/DbDataSourceBuilder.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/db/DbDataSourceBuilder.java
similarity index 100%
rename from src/main/java/ch/eitchnet/db/DbDataSourceBuilder.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/db/DbDataSourceBuilder.java
diff --git a/src/main/java/ch/eitchnet/db/DbException.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/db/DbException.java
similarity index 100%
rename from src/main/java/ch/eitchnet/db/DbException.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/db/DbException.java
diff --git a/src/main/java/ch/eitchnet/db/DbMigrationState.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/db/DbMigrationState.java
similarity index 100%
rename from src/main/java/ch/eitchnet/db/DbMigrationState.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/db/DbMigrationState.java
diff --git a/src/main/java/ch/eitchnet/db/DbSchemaVersionCheck.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/db/DbSchemaVersionCheck.java
similarity index 100%
rename from src/main/java/ch/eitchnet/db/DbSchemaVersionCheck.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/db/DbSchemaVersionCheck.java
diff --git a/src/main/java/ch/eitchnet/fileserver/FileClient.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/fileserver/FileClient.java
similarity index 100%
rename from src/main/java/ch/eitchnet/fileserver/FileClient.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/fileserver/FileClient.java
diff --git a/src/main/java/ch/eitchnet/fileserver/FileClientUtil.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/fileserver/FileClientUtil.java
similarity index 100%
rename from src/main/java/ch/eitchnet/fileserver/FileClientUtil.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/fileserver/FileClientUtil.java
diff --git a/src/main/java/ch/eitchnet/fileserver/FileDeletion.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/fileserver/FileDeletion.java
similarity index 100%
rename from src/main/java/ch/eitchnet/fileserver/FileDeletion.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/fileserver/FileDeletion.java
diff --git a/src/main/java/ch/eitchnet/fileserver/FileHandler.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/fileserver/FileHandler.java
similarity index 100%
rename from src/main/java/ch/eitchnet/fileserver/FileHandler.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/fileserver/FileHandler.java
diff --git a/src/main/java/ch/eitchnet/fileserver/FilePart.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/fileserver/FilePart.java
similarity index 100%
rename from src/main/java/ch/eitchnet/fileserver/FilePart.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/fileserver/FilePart.java
diff --git a/src/main/java/ch/eitchnet/utils/StringMatchMode.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/StringMatchMode.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/StringMatchMode.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/StringMatchMode.java
diff --git a/src/main/java/ch/eitchnet/utils/Version.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/Version.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/Version.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/Version.java
diff --git a/src/main/java/ch/eitchnet/utils/collections/DateRange.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/collections/DateRange.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/collections/DateRange.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/collections/DateRange.java
diff --git a/src/main/java/ch/eitchnet/utils/collections/DefaultedHashMap.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/collections/DefaultedHashMap.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/collections/DefaultedHashMap.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/collections/DefaultedHashMap.java
diff --git a/src/main/java/ch/eitchnet/utils/collections/MapOfLists.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/collections/MapOfLists.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/collections/MapOfLists.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/collections/MapOfLists.java
diff --git a/src/main/java/ch/eitchnet/utils/collections/MapOfMaps.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/collections/MapOfMaps.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/collections/MapOfMaps.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/collections/MapOfMaps.java
diff --git a/src/main/java/ch/eitchnet/utils/collections/Paging.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/collections/Paging.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/collections/Paging.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/collections/Paging.java
diff --git a/src/main/java/ch/eitchnet/utils/collections/Tuple.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/collections/Tuple.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/collections/Tuple.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/collections/Tuple.java
diff --git a/src/main/java/ch/eitchnet/utils/dbc/DBC.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/dbc/DBC.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/dbc/DBC.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/dbc/DBC.java
diff --git a/src/main/java/ch/eitchnet/utils/exceptions/XmlException.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/exceptions/XmlException.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/exceptions/XmlException.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/exceptions/XmlException.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/AesCryptoHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/AesCryptoHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/AesCryptoHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/AesCryptoHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/ArraysHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/ArraysHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/ArraysHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/ArraysHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/AsciiHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/AsciiHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/AsciiHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/AsciiHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/BaseEncoding.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/BaseEncoding.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/BaseEncoding.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/BaseEncoding.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/ByteHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/ByteHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/ByteHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/ByteHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/ClassHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/ClassHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/ClassHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/ClassHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/DomUtil.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/DomUtil.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/DomUtil.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/DomUtil.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/ExceptionHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/ExceptionHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/ExceptionHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/ExceptionHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/FileHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/FileHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/FileHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/FileHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/MathHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/MathHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/MathHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/MathHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/ProcessHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/ProcessHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/ProcessHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/ProcessHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/PropertiesHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/PropertiesHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/PropertiesHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/PropertiesHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/StringHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/StringHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/StringHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/StringHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/SystemHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/SystemHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/SystemHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/SystemHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/XmlDomSigner.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/XmlDomSigner.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/XmlDomSigner.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/XmlDomSigner.java
diff --git a/src/main/java/ch/eitchnet/utils/helper/XmlHelper.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/XmlHelper.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/helper/XmlHelper.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/helper/XmlHelper.java
diff --git a/src/main/java/ch/eitchnet/utils/io/FileProgressListener.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/io/FileProgressListener.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/io/FileProgressListener.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/io/FileProgressListener.java
diff --git a/src/main/java/ch/eitchnet/utils/io/FileStreamProgressWatcher.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/io/FileStreamProgressWatcher.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/io/FileStreamProgressWatcher.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/io/FileStreamProgressWatcher.java
diff --git a/src/main/java/ch/eitchnet/utils/io/LoggingFileProgressListener.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/io/LoggingFileProgressListener.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/io/LoggingFileProgressListener.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/io/LoggingFileProgressListener.java
diff --git a/src/main/java/ch/eitchnet/utils/io/ProgressableFileInputStream.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/io/ProgressableFileInputStream.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/io/ProgressableFileInputStream.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/io/ProgressableFileInputStream.java
diff --git a/src/main/java/ch/eitchnet/utils/iso8601/DateFormat.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/DateFormat.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/iso8601/DateFormat.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/DateFormat.java
diff --git a/src/main/java/ch/eitchnet/utils/iso8601/DurationFormat.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/DurationFormat.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/iso8601/DurationFormat.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/DurationFormat.java
diff --git a/src/main/java/ch/eitchnet/utils/iso8601/FormatFactory.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/FormatFactory.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/iso8601/FormatFactory.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/FormatFactory.java
diff --git a/src/main/java/ch/eitchnet/utils/iso8601/ISO8601.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/ISO8601.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/iso8601/ISO8601.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/ISO8601.java
diff --git a/src/main/java/ch/eitchnet/utils/iso8601/ISO8601Duration.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/ISO8601Duration.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/iso8601/ISO8601Duration.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/ISO8601Duration.java
diff --git a/src/main/java/ch/eitchnet/utils/iso8601/ISO8601FormatFactory.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/ISO8601FormatFactory.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/iso8601/ISO8601FormatFactory.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/ISO8601FormatFactory.java
diff --git a/src/main/java/ch/eitchnet/utils/iso8601/ISO8601Worktime.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/ISO8601Worktime.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/iso8601/ISO8601Worktime.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/ISO8601Worktime.java
diff --git a/src/main/java/ch/eitchnet/utils/iso8601/WorktimeFormat.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/WorktimeFormat.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/iso8601/WorktimeFormat.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/iso8601/WorktimeFormat.java
diff --git a/src/main/java/ch/eitchnet/utils/objectfilter/ObjectCache.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/objectfilter/ObjectCache.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/objectfilter/ObjectCache.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/objectfilter/ObjectCache.java
diff --git a/src/main/java/ch/eitchnet/utils/objectfilter/ObjectFilter.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/objectfilter/ObjectFilter.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/objectfilter/ObjectFilter.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/objectfilter/ObjectFilter.java
diff --git a/src/main/java/ch/eitchnet/utils/objectfilter/Operation.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/objectfilter/Operation.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/objectfilter/Operation.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/objectfilter/Operation.java
diff --git a/src/main/java/ch/eitchnet/utils/xml/XmlKeyValue.java b/ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/xml/XmlKeyValue.java
similarity index 100%
rename from src/main/java/ch/eitchnet/utils/xml/XmlKeyValue.java
rename to ch.eitchnet.utils/src/main/java/ch/eitchnet/utils/xml/XmlKeyValue.java
diff --git a/src/main/java/javanet/staxutils/Indentation.java b/ch.eitchnet.utils/src/main/java/javanet/staxutils/Indentation.java
similarity index 100%
rename from src/main/java/javanet/staxutils/Indentation.java
rename to ch.eitchnet.utils/src/main/java/javanet/staxutils/Indentation.java
diff --git a/src/main/java/javanet/staxutils/IndentingXMLStreamWriter.java b/ch.eitchnet.utils/src/main/java/javanet/staxutils/IndentingXMLStreamWriter.java
similarity index 100%
rename from src/main/java/javanet/staxutils/IndentingXMLStreamWriter.java
rename to ch.eitchnet.utils/src/main/java/javanet/staxutils/IndentingXMLStreamWriter.java
diff --git a/src/main/java/javanet/staxutils/helpers/StreamWriterDelegate.java b/ch.eitchnet.utils/src/main/java/javanet/staxutils/helpers/StreamWriterDelegate.java
similarity index 100%
rename from src/main/java/javanet/staxutils/helpers/StreamWriterDelegate.java
rename to ch.eitchnet.utils/src/main/java/javanet/staxutils/helpers/StreamWriterDelegate.java
diff --git a/src/main/java/log4j.xml b/ch.eitchnet.utils/src/main/java/log4j.xml
similarity index 100%
rename from src/main/java/log4j.xml
rename to ch.eitchnet.utils/src/main/java/log4j.xml
diff --git a/src/test/java/ch/eitchnet/communication/AbstractEndpointTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/AbstractEndpointTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/communication/AbstractEndpointTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/AbstractEndpointTest.java
diff --git a/src/test/java/ch/eitchnet/communication/ConsoleEndpointTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/ConsoleEndpointTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/communication/ConsoleEndpointTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/ConsoleEndpointTest.java
diff --git a/src/test/java/ch/eitchnet/communication/FileEndpointTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/FileEndpointTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/communication/FileEndpointTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/FileEndpointTest.java
diff --git a/src/test/java/ch/eitchnet/communication/SimpleMessageArchiveTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/SimpleMessageArchiveTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/communication/SimpleMessageArchiveTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/SimpleMessageArchiveTest.java
diff --git a/src/test/java/ch/eitchnet/communication/SocketEndpointTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/SocketEndpointTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/communication/SocketEndpointTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/SocketEndpointTest.java
diff --git a/src/test/java/ch/eitchnet/communication/TestConnectionObserver.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/TestConnectionObserver.java
similarity index 100%
rename from src/test/java/ch/eitchnet/communication/TestConnectionObserver.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/TestConnectionObserver.java
diff --git a/src/test/java/ch/eitchnet/communication/TestIoMessage.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/TestIoMessage.java
similarity index 100%
rename from src/test/java/ch/eitchnet/communication/TestIoMessage.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/communication/TestIoMessage.java
diff --git a/src/test/java/ch/eitchnet/utils/StringMatchModeTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/StringMatchModeTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/StringMatchModeTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/StringMatchModeTest.java
diff --git a/src/test/java/ch/eitchnet/utils/VersionTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/VersionTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/VersionTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/VersionTest.java
diff --git a/src/test/java/ch/eitchnet/utils/collections/DateRangeTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/collections/DateRangeTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/collections/DateRangeTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/collections/DateRangeTest.java
diff --git a/src/test/java/ch/eitchnet/utils/collections/DefaultedHashMapTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/collections/DefaultedHashMapTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/collections/DefaultedHashMapTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/collections/DefaultedHashMapTest.java
diff --git a/src/test/java/ch/eitchnet/utils/collections/PagingTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/collections/PagingTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/collections/PagingTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/collections/PagingTest.java
diff --git a/src/test/java/ch/eitchnet/utils/dbc/DBCTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/dbc/DBCTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/dbc/DBCTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/dbc/DBCTest.java
diff --git a/src/test/java/ch/eitchnet/utils/helper/AesCryptoHelperTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/AesCryptoHelperTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/helper/AesCryptoHelperTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/AesCryptoHelperTest.java
diff --git a/src/test/java/ch/eitchnet/utils/helper/BaseDecodingTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/BaseDecodingTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/helper/BaseDecodingTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/BaseDecodingTest.java
diff --git a/src/test/java/ch/eitchnet/utils/helper/BaseEncodingTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/BaseEncodingTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/helper/BaseEncodingTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/BaseEncodingTest.java
diff --git a/src/test/java/ch/eitchnet/utils/helper/ExceptionHelperTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/ExceptionHelperTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/helper/ExceptionHelperTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/ExceptionHelperTest.java
diff --git a/src/test/java/ch/eitchnet/utils/helper/GenerateReverseBaseEncodingAlphabets.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/GenerateReverseBaseEncodingAlphabets.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/helper/GenerateReverseBaseEncodingAlphabets.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/GenerateReverseBaseEncodingAlphabets.java
diff --git a/src/test/java/ch/eitchnet/utils/helper/ReplacePropertiesInTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/ReplacePropertiesInTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/helper/ReplacePropertiesInTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/ReplacePropertiesInTest.java
diff --git a/src/test/java/ch/eitchnet/utils/helper/XmlSignHelperTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/XmlSignHelperTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/helper/XmlSignHelperTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/helper/XmlSignHelperTest.java
diff --git a/src/test/java/ch/eitchnet/utils/objectfilter/ObjectFilterTest.java b/ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/objectfilter/ObjectFilterTest.java
similarity index 100%
rename from src/test/java/ch/eitchnet/utils/objectfilter/ObjectFilterTest.java
rename to ch.eitchnet.utils/src/test/java/ch/eitchnet/utils/objectfilter/ObjectFilterTest.java
diff --git a/src/test/resources/SignedXmlFile.xml b/ch.eitchnet.utils/src/test/resources/SignedXmlFile.xml
similarity index 100%
rename from src/test/resources/SignedXmlFile.xml
rename to ch.eitchnet.utils/src/test/resources/SignedXmlFile.xml
diff --git a/src/test/resources/SignedXmlFileWithNamespaces.xml b/ch.eitchnet.utils/src/test/resources/SignedXmlFileWithNamespaces.xml
similarity index 100%
rename from src/test/resources/SignedXmlFileWithNamespaces.xml
rename to ch.eitchnet.utils/src/test/resources/SignedXmlFileWithNamespaces.xml
diff --git a/src/test/resources/crypto_test_image.ico b/ch.eitchnet.utils/src/test/resources/crypto_test_image.ico
similarity index 100%
rename from src/test/resources/crypto_test_image.ico
rename to ch.eitchnet.utils/src/test/resources/crypto_test_image.ico
diff --git a/src/test/resources/crypto_test_long.txt b/ch.eitchnet.utils/src/test/resources/crypto_test_long.txt
similarity index 100%
rename from src/test/resources/crypto_test_long.txt
rename to ch.eitchnet.utils/src/test/resources/crypto_test_long.txt
diff --git a/src/test/resources/crypto_test_middle.txt b/ch.eitchnet.utils/src/test/resources/crypto_test_middle.txt
similarity index 100%
rename from src/test/resources/crypto_test_middle.txt
rename to ch.eitchnet.utils/src/test/resources/crypto_test_middle.txt
diff --git a/src/test/resources/crypto_test_short.txt b/ch.eitchnet.utils/src/test/resources/crypto_test_short.txt
similarity index 100%
rename from src/test/resources/crypto_test_short.txt
rename to ch.eitchnet.utils/src/test/resources/crypto_test_short.txt
diff --git a/src/test/resources/log4j.xml b/ch.eitchnet.utils/src/test/resources/log4j.xml
similarity index 100%
rename from src/test/resources/log4j.xml
rename to ch.eitchnet.utils/src/test/resources/log4j.xml
diff --git a/src/test/resources/test.jks b/ch.eitchnet.utils/src/test/resources/test.jks
similarity index 100%
rename from src/test/resources/test.jks
rename to ch.eitchnet.utils/src/test/resources/test.jks
diff --git a/src/test/resources/test_data.csv b/ch.eitchnet.utils/src/test/resources/test_data.csv
similarity index 100%
rename from src/test/resources/test_data.csv
rename to ch.eitchnet.utils/src/test/resources/test_data.csv