diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c5d315b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.classpath
+.project
+.settings
+
+target
diff --git a/makefile b/makefile
new file mode 100644
index 0000000..251db0d
--- /dev/null
+++ b/makefile
@@ -0,0 +1,13 @@
+
+love:
+	@echo 
+	@echo Make love not war!
+	@echo 
+	@echo Possible targets:
+	@echo - build
+	@echo 
+	@echo 
+	@echo Have fun!
+
+build:
+	mvn clean package
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..79f2c5f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,58 @@
+<?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>
+
+    <groupId>de.mapoll.javaAVMTR064</groupId>
+    <artifactId>FritzTR064</artifactId>
+    <packaging>jar</packaging>
+    <name>FritzTR064</name>
+    <description>FritzTR064</description>
+    <version>0.0.1.b1</version>
+
+    <properties>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
+
+    <scm>
+        <connection>scm:svn:http://127.0.0.1/FritzTR064</connection>
+        <developerConnection>scm:svn:https://127.0.0.1/FritzTR064</developerConnection>
+        <tag>HEAD</tag>
+        <url>http://127.0.0.1/FritzTR064</url>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.6</version>
+        </dependency>
+
+        <!-- Test -->
+    </dependencies>
+
+    <build>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>java9+</id>
+            <activation>
+                <jdk>[9,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skipTests>true</skipTests>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/src/de/mapoll/javaAVMTR064/Action.java b/src/main/java/de/mapoll/javaAVMTR064/Action.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/Action.java
rename to src/main/java/de/mapoll/javaAVMTR064/Action.java
diff --git a/src/de/mapoll/javaAVMTR064/FritzConnection.java b/src/main/java/de/mapoll/javaAVMTR064/FritzConnection.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/FritzConnection.java
rename to src/main/java/de/mapoll/javaAVMTR064/FritzConnection.java
diff --git a/src/de/mapoll/javaAVMTR064/Response.java b/src/main/java/de/mapoll/javaAVMTR064/Response.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/Response.java
rename to src/main/java/de/mapoll/javaAVMTR064/Response.java
diff --git a/src/de/mapoll/javaAVMTR064/Service.java b/src/main/java/de/mapoll/javaAVMTR064/Service.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/Service.java
rename to src/main/java/de/mapoll/javaAVMTR064/Service.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/ActionListType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/ActionListType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/ActionListType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/ActionListType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/ActionType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/ActionType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/ActionType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/ActionType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/ArgumentListType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/ArgumentListType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/ArgumentListType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/ArgumentListType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/ArgumentType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/ArgumentType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/ArgumentType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/ArgumentType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/DeviceListType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/DeviceListType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/DeviceListType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/DeviceListType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/DeviceSpecVersionType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/DeviceSpecVersionType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/DeviceSpecVersionType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/DeviceSpecVersionType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/DeviceType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/DeviceType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/DeviceType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/DeviceType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/IconListType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/IconListType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/IconListType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/IconListType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/IconType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/IconType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/IconType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/IconType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/ObjectFactory.java b/src/main/java/de/mapoll/javaAVMTR064/beans/ObjectFactory.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/ObjectFactory.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/ObjectFactory.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/RootType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/RootType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/RootType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/RootType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/RootType2.java b/src/main/java/de/mapoll/javaAVMTR064/beans/RootType2.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/RootType2.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/RootType2.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/ScpdType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/ScpdType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/ScpdType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/ScpdType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/ScpdType2.java b/src/main/java/de/mapoll/javaAVMTR064/beans/ScpdType2.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/ScpdType2.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/ScpdType2.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/ServiceListType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/ServiceListType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/ServiceListType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/ServiceListType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/ServiceSpecVersionType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/ServiceSpecVersionType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/ServiceSpecVersionType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/ServiceSpecVersionType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/ServiceStateTableType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/ServiceStateTableType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/ServiceStateTableType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/ServiceStateTableType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/ServiceType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/ServiceType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/ServiceType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/ServiceType.java
diff --git a/src/de/mapoll/javaAVMTR064/beans/StateVariableType.java b/src/main/java/de/mapoll/javaAVMTR064/beans/StateVariableType.java
similarity index 100%
rename from src/de/mapoll/javaAVMTR064/beans/StateVariableType.java
rename to src/main/java/de/mapoll/javaAVMTR064/beans/StateVariableType.java