diff --git a/WasteInformationServer.iml b/WasteInformationServer.iml
index 80d3376..9990ff9 100644
--- a/WasteInformationServer.iml
+++ b/WasteInformationServer.iml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_13">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="org.eclipse.paho.client.mqttv3-1.2.1" level="project" />
-    <orderEntry type="library" name="mysql-connector-java-5.1.44-bin" level="project" />
     <orderEntry type="library" name="mysql-connector-java-5.1.44-bin" level="project" />
     <orderEntry type="library" name="org.eclipse.paho.client.mqttv3-1.2.1" level="project" />
-    <orderEntry type="library" name="gson-2.8.6" level="project" />
-    <orderEntry type="library" name="gson-2.8.6-sources" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.18" level="project" />
+    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..d4b4c82
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <properties>
+        <maven.compiler.release>13</maven.compiler.release>
+    </properties>
+
+
+    <groupId>wasteinformationserver</groupId>
+    <artifactId>Waste Information Server</artifactId>
+    <version>1.0-BETA</version>
+
+
+    <dependencies>
+        <!-- https://mvnrepository.com/artifact/org.eclipse.paho/org.eclipse.paho.client.mqttv3 -->
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+            <version>1.2.2</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.18</version>
+        </dependency>
+    </dependencies>
+    
+</project>
\ No newline at end of file
diff --git a/src/com/wasteinformationserver/Date.java b/src/main/java/com/wasteinformationserver/Date.java
similarity index 100%
rename from src/com/wasteinformationserver/Date.java
rename to src/main/java/com/wasteinformationserver/Date.java
diff --git a/src/com/wasteinformationserver/basicutils/Log.java b/src/main/java/com/wasteinformationserver/basicutils/Log.java
similarity index 100%
rename from src/com/wasteinformationserver/basicutils/Log.java
rename to src/main/java/com/wasteinformationserver/basicutils/Log.java
diff --git a/src/com/wasteinformationserver/db/Database.java b/src/main/java/com/wasteinformationserver/db/Database.java
similarity index 100%
rename from src/com/wasteinformationserver/db/Database.java
rename to src/main/java/com/wasteinformationserver/db/Database.java
diff --git a/src/com/wasteinformationserver/db/JDCB.java b/src/main/java/com/wasteinformationserver/db/JDCB.java
similarity index 100%
rename from src/com/wasteinformationserver/db/JDCB.java
rename to src/main/java/com/wasteinformationserver/db/JDCB.java
diff --git a/src/com/wasteinformationserver/db/MySQLConnector.java b/src/main/java/com/wasteinformationserver/db/MySQLConnector.java
similarity index 100%
rename from src/com/wasteinformationserver/db/MySQLConnector.java
rename to src/main/java/com/wasteinformationserver/db/MySQLConnector.java
diff --git a/src/com/wasteinformationserver/db/PostgreSQLConnector.java b/src/main/java/com/wasteinformationserver/db/PostgreSQLConnector.java
similarity index 100%
rename from src/com/wasteinformationserver/db/PostgreSQLConnector.java
rename to src/main/java/com/wasteinformationserver/db/PostgreSQLConnector.java
diff --git a/src/com/wasteinformationserver/main.java b/src/main/java/com/wasteinformationserver/main.java
similarity index 100%
rename from src/com/wasteinformationserver/main.java
rename to src/main/java/com/wasteinformationserver/main.java
diff --git a/src/com/wasteinformationserver/mqtt/Database.java b/src/main/java/com/wasteinformationserver/mqtt/Database.java
similarity index 100%
rename from src/com/wasteinformationserver/mqtt/Database.java
rename to src/main/java/com/wasteinformationserver/mqtt/Database.java
diff --git a/src/com/wasteinformationserver/mqtt/mqtt.java b/src/main/java/com/wasteinformationserver/mqtt/mqtt.java
similarity index 100%
rename from src/com/wasteinformationserver/mqtt/mqtt.java
rename to src/main/java/com/wasteinformationserver/mqtt/mqtt.java
diff --git a/src/com/wasteinformationserver/mqtt/mqttreceiver.java b/src/main/java/com/wasteinformationserver/mqtt/mqttreceiver.java
similarity index 100%
rename from src/com/wasteinformationserver/mqtt/mqttreceiver.java
rename to src/main/java/com/wasteinformationserver/mqtt/mqttreceiver.java
diff --git a/src/com/wasteinformationserver/mqtt/mqtttransmitter.java b/src/main/java/com/wasteinformationserver/mqtt/mqtttransmitter.java
similarity index 100%
rename from src/com/wasteinformationserver/mqtt/mqtttransmitter.java
rename to src/main/java/com/wasteinformationserver/mqtt/mqtttransmitter.java
diff --git a/src/com/wasteinformationserver/website/HttpTools.java b/src/main/java/com/wasteinformationserver/website/HttpTools.java
similarity index 100%
rename from src/com/wasteinformationserver/website/HttpTools.java
rename to src/main/java/com/wasteinformationserver/website/HttpTools.java
diff --git a/src/com/wasteinformationserver/website/MainPage.java b/src/main/java/com/wasteinformationserver/website/MainPage.java
similarity index 100%
rename from src/com/wasteinformationserver/website/MainPage.java
rename to src/main/java/com/wasteinformationserver/website/MainPage.java
diff --git a/src/com/wasteinformationserver/website/Webserver.java b/src/main/java/com/wasteinformationserver/website/Webserver.java
similarity index 100%
rename from src/com/wasteinformationserver/website/Webserver.java
rename to src/main/java/com/wasteinformationserver/website/Webserver.java
diff --git a/src/com/wasteinformationserver/website/basicrequest/GetRequest.java b/src/main/java/com/wasteinformationserver/website/basicrequest/GetRequest.java
similarity index 100%
rename from src/com/wasteinformationserver/website/basicrequest/GetRequest.java
rename to src/main/java/com/wasteinformationserver/website/basicrequest/GetRequest.java
diff --git a/src/com/wasteinformationserver/website/basicrequest/PostRequest.java b/src/main/java/com/wasteinformationserver/website/basicrequest/PostRequest.java
similarity index 100%
rename from src/com/wasteinformationserver/website/basicrequest/PostRequest.java
rename to src/main/java/com/wasteinformationserver/website/basicrequest/PostRequest.java
diff --git a/src/com/wasteinformationserver/website/datarequests/DataRequest.java b/src/main/java/com/wasteinformationserver/website/datarequests/DataRequest.java
similarity index 98%
rename from src/com/wasteinformationserver/website/datarequests/DataRequest.java
rename to src/main/java/com/wasteinformationserver/website/datarequests/DataRequest.java
index ebff8b8..2a4fbf1 100644
--- a/src/com/wasteinformationserver/website/datarequests/DataRequest.java
+++ b/src/main/java/com/wasteinformationserver/website/datarequests/DataRequest.java
@@ -1,6 +1,5 @@
 package com.wasteinformationserver.website.datarequests;
 
-import com.google.gson.Gson;
 import com.wasteinformationserver.basicutils.Log;
 import com.wasteinformationserver.db.JDCB;
 import com.wasteinformationserver.website.basicrequest.PostRequest;
@@ -68,7 +67,6 @@ public class DataRequest extends PostRequest {
             case "getAllCities":
 
                 // TODO: 15.11.19 database call to get all data and store it as json.
-                Gson gson = new Gson();
 
                 StringBuilder builder = new StringBuilder();
 
diff --git a/src/com/wasteinformationserver/website/datarequests/RegisterRequest.java b/src/main/java/com/wasteinformationserver/website/datarequests/RegisterRequest.java
similarity index 100%
rename from src/com/wasteinformationserver/website/datarequests/RegisterRequest.java
rename to src/main/java/com/wasteinformationserver/website/datarequests/RegisterRequest.java
diff --git a/src/com/wasteinformationserver/website/datarequests/login/CheckLoginState.java b/src/main/java/com/wasteinformationserver/website/datarequests/login/CheckLoginState.java
similarity index 100%
rename from src/com/wasteinformationserver/website/datarequests/login/CheckLoginState.java
rename to src/main/java/com/wasteinformationserver/website/datarequests/login/CheckLoginState.java
diff --git a/src/com/wasteinformationserver/website/datarequests/login/LoginRequest.java b/src/main/java/com/wasteinformationserver/website/datarequests/login/LoginRequest.java
similarity index 100%
rename from src/com/wasteinformationserver/website/datarequests/login/LoginRequest.java
rename to src/main/java/com/wasteinformationserver/website/datarequests/login/LoginRequest.java
diff --git a/src/com/wasteinformationserver/website/datarequests/login/LoginState.java b/src/main/java/com/wasteinformationserver/website/datarequests/login/LoginState.java
similarity index 100%
rename from src/com/wasteinformationserver/website/datarequests/login/LoginState.java
rename to src/main/java/com/wasteinformationserver/website/datarequests/login/LoginState.java