diff --git a/.classpath b/.classpath
deleted file mode 100644
index 9784724..0000000
--- a/.classpath
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/smack/smack-core-4.4.8.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/smack/smack-extensions-4.4.8.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/smack/smack-streammanagement-4.4.8.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/smack/smack-xmlparser-4.4.8.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/smack/smack-xmlparser-xpp3-4.4.8.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/xmlpull-1.1.3.1.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/xpp3_min-1.1.4c.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/smack/smack-experimental-4.4.8.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/smack/smack-java8-4.4.8.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/smack/smack-resolver-javax-4.4.8.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/smack/smack-tcp-4.4.8.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/minidns-core-1.1.0.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/jxmpp-core-1.1.0.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/jxmpp-repl-1.1.0.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/jxmpp-stringprep-libidn-1.1.0.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/jxmpp-util-cache-1.1.0.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/smack/smack-im-4.4.8.jar"/>
-	<classpathentry kind="lib" path="c:/Users/tzur/development/MamLoader/MamHistoryLoader/libs/3rdParty/smack/smack-sasl-javax-4.4.8.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index 1cf2c3d..fff0a30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ bin
 dist
 build
 .gradle
+target
diff --git a/.project b/.project
deleted file mode 100644
index 6cff5ba..0000000
--- a/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>MamHistoryLoader</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1735908922007</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
diff --git a/.vscode/launch.json b/.vscode/launch.json
index bff3d8f..4b8bebc 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,30 +4,19 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-
         
-
         {
             "type": "java",
             "name": "Current File",
             "request": "launch",
             "mainClass": "${file}"
         },
+        
         {
             "type": "java",
             "name": "MamLoader",
             "request": "launch",
-            "mainClass": "de.thedevstack.xmpp.mamloader.MamLoader",
-            "projectName": "MamHistoryLoader",
-            "args": "tristan@jabber.mail-zur.de lookshe@jabber.thehappy.de -limit 10"
-        },
-        {
-            "type": "java",
-            "name": "MamLoader oldest message",
-            "request": "launch",
-            "mainClass": "de.thedevstack.xmpp.mamloader.MamLoader",
-            "projectName": "MamHistoryLoader",
-            "args": "tristan@jabber.mail-zur.de lookshe@jabber.thehappy.de -limit -1"
+            "mainClass": "de.thedevstack.xmpp.mamloader.MamLoader"
         }
     ]
 }
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000..ed46e28
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,19 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "verify",
+            "type": "shell",
+            "command": "mvn -B verify",
+            "group": "build"
+        },
+        {
+            "label": "test",
+            "type": "shell",
+            "command": "mvn -B test",
+            "group": "test"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 49867be..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-plugins {
-    id 'application'
-}
-
-repositories {
-  mavenCentral()
-}
-
-apply plugin: 'application'
-
-application {
-    mainClass = 'de.thedevstack.xmpp.mamloader.MamLoader'
-}
-
-dependencies {
-   implementation "org.jxmpp:jxmpp-core:1.1.0"
-   implementation "org.igniterealtime.smack:smack-java8:4.4.8"
-   // Optional for XMPPTCPConnection
-   implementation "org.igniterealtime.smack:smack-tcp:4.4.8"
-   // Optional for XMPP-IM (RFC 6121) support (Roster, Threaded Chats, …)
-   implementation "org.igniterealtime.smack:smack-im:4.4.8"
-   // Optional for XMPP extensions support
-   implementation "org.igniterealtime.smack:smack-extensions:4.4.8"
-   // Optional for XMPP extensions support
-   implementation "org.igniterealtime.smack:smack-experimental:4.4.8"
-}
diff --git a/build.xml b/build.xml
deleted file mode 100644
index fab966f..0000000
--- a/build.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="create_run_jar" name="Create Runnable Jar for Project MamHistoryLoader with libraries in sub-folder">
-    <!--this file was created by Eclipse Runnable JAR Export Wizard-->
-    <!--ANT 1.7 is required                                        -->
-    <!--define folder properties-->
-    <property name="dir.buildfile" value="."/>
-    <property name="dir.workspace" value="${dir.buildfile}/.."/>
-    <property name="dir.jarfile" value="${dir.buildfile}/dist"/>
-    <property name="dir.libs" value="${dir.jarfile}/libs"/>
-    <target name="create_run_jar">
-        <delete dir="${dir.libs}"/>
-        <mkdir dir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/smack/smack-core-4.2.1.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/smack/smack-extensions-4.2.1.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/jxmpp-core-0.5.0.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/jxmpp-jid-0.5.0.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/xmlpull-1.1.3.1.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/xpp3_min-1.1.4c.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/smack/smack-experimental-4.2.1.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/smack/smack-java7-4.2.1.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/smack/smack-resolver-minidns-4.2.1.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/smack/smack-tcp-4.2.1.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/minidns-core-0.2.4.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/minidns-hla-0.2.4.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/minidns-iterative-resolver-0.2.4.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/minidns-dnssec-0.2.4.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/jxmpp-util-cache-0.5.0.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/smack/smack-im-4.2.1.jar" todir="${dir.libs}"/>
-        <copy file="${dir.buildfile}/libs/3rdParty/smack/smack-sasl-javax-4.2.1.jar" todir="${dir.libs}"/>
-    	
-    	<manifestclasspath property="mamloader.manifest.classpath" jarfile="${dir.jarfile}/MAMLoader.jar">
-    	  <classpath>
-    	    <fileset dir="${dir.libs}" includes="*.jar" />
-    	  </classpath>
-    	</manifestclasspath>
-
-        <jar destfile="${dir.jarfile}/MAMLoader.jar">
-            <manifest>
-                <attribute name="Main-Class" value="de.thedevstack.xmpp.mamloader.MamLoader"/>
-                <attribute name="Class-Path" value="${mamloader.manifest.classpath}"/>
-            </manifest>
-            <fileset dir="${dir.buildfile}/bin"/>
-        </jar>
-    </target>
-</project>
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index 51b556a..0000000
--- a/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.gradle.java.home=c:\\Program Files\\Microsoft\\jdk-21.0.5.11-hotspot\\
\ No newline at end of file
diff --git a/libs/3rdParty/jxmpp-core-1.1.0.jar b/libs/3rdParty/jxmpp-core-1.1.0.jar
deleted file mode 100644
index 3f959d2..0000000
Binary files a/libs/3rdParty/jxmpp-core-1.1.0.jar and /dev/null differ
diff --git a/libs/3rdParty/jxmpp-jid-1.1.0.jar b/libs/3rdParty/jxmpp-jid-1.1.0.jar
deleted file mode 100644
index 5e86099..0000000
Binary files a/libs/3rdParty/jxmpp-jid-1.1.0.jar and /dev/null differ
diff --git a/libs/3rdParty/jxmpp-repl-1.1.0.jar b/libs/3rdParty/jxmpp-repl-1.1.0.jar
deleted file mode 100644
index 905b9aa..0000000
Binary files a/libs/3rdParty/jxmpp-repl-1.1.0.jar and /dev/null differ
diff --git a/libs/3rdParty/jxmpp-stringprep-libidn-1.1.0.jar b/libs/3rdParty/jxmpp-stringprep-libidn-1.1.0.jar
deleted file mode 100644
index 3400ad7..0000000
Binary files a/libs/3rdParty/jxmpp-stringprep-libidn-1.1.0.jar and /dev/null differ
diff --git a/libs/3rdParty/jxmpp-util-cache-1.1.0.jar b/libs/3rdParty/jxmpp-util-cache-1.1.0.jar
deleted file mode 100644
index 3eed38d..0000000
Binary files a/libs/3rdParty/jxmpp-util-cache-1.1.0.jar and /dev/null differ
diff --git a/libs/3rdParty/libidn-1.15.jar b/libs/3rdParty/libidn-1.15.jar
deleted file mode 100644
index 79a44f9..0000000
Binary files a/libs/3rdParty/libidn-1.15.jar and /dev/null differ
diff --git a/libs/3rdParty/minidns-core-1.1.0.jar b/libs/3rdParty/minidns-core-1.1.0.jar
deleted file mode 100644
index 9218e83..0000000
Binary files a/libs/3rdParty/minidns-core-1.1.0.jar and /dev/null differ
diff --git a/libs/3rdParty/smack/smack-core-4.4.8.jar b/libs/3rdParty/smack/smack-core-4.4.8.jar
deleted file mode 100644
index a21aeab..0000000
Binary files a/libs/3rdParty/smack/smack-core-4.4.8.jar and /dev/null differ
diff --git a/libs/3rdParty/smack/smack-experimental-4.4.8.jar b/libs/3rdParty/smack/smack-experimental-4.4.8.jar
deleted file mode 100644
index ad10cbe..0000000
Binary files a/libs/3rdParty/smack/smack-experimental-4.4.8.jar and /dev/null differ
diff --git a/libs/3rdParty/smack/smack-extensions-4.4.8.jar b/libs/3rdParty/smack/smack-extensions-4.4.8.jar
deleted file mode 100644
index 5212902..0000000
Binary files a/libs/3rdParty/smack/smack-extensions-4.4.8.jar and /dev/null differ
diff --git a/libs/3rdParty/smack/smack-im-4.4.8.jar b/libs/3rdParty/smack/smack-im-4.4.8.jar
deleted file mode 100644
index 4b830c2..0000000
Binary files a/libs/3rdParty/smack/smack-im-4.4.8.jar and /dev/null differ
diff --git a/libs/3rdParty/smack/smack-java8-4.4.8.jar b/libs/3rdParty/smack/smack-java8-4.4.8.jar
deleted file mode 100644
index a0b4a7f..0000000
Binary files a/libs/3rdParty/smack/smack-java8-4.4.8.jar and /dev/null differ
diff --git a/libs/3rdParty/smack/smack-resolver-javax-4.4.8.jar b/libs/3rdParty/smack/smack-resolver-javax-4.4.8.jar
deleted file mode 100644
index bd6bbd3..0000000
Binary files a/libs/3rdParty/smack/smack-resolver-javax-4.4.8.jar and /dev/null differ
diff --git a/libs/3rdParty/smack/smack-sasl-javax-4.4.8.jar b/libs/3rdParty/smack/smack-sasl-javax-4.4.8.jar
deleted file mode 100644
index 17d0895..0000000
Binary files a/libs/3rdParty/smack/smack-sasl-javax-4.4.8.jar and /dev/null differ
diff --git a/libs/3rdParty/smack/smack-streammanagement-4.4.8.jar b/libs/3rdParty/smack/smack-streammanagement-4.4.8.jar
deleted file mode 100644
index 2cf2788..0000000
Binary files a/libs/3rdParty/smack/smack-streammanagement-4.4.8.jar and /dev/null differ
diff --git a/libs/3rdParty/smack/smack-tcp-4.4.8.jar b/libs/3rdParty/smack/smack-tcp-4.4.8.jar
deleted file mode 100644
index cfc3f1b..0000000
Binary files a/libs/3rdParty/smack/smack-tcp-4.4.8.jar and /dev/null differ
diff --git a/libs/3rdParty/smack/smack-xmlparser-4.4.8.jar b/libs/3rdParty/smack/smack-xmlparser-4.4.8.jar
deleted file mode 100644
index 9736579..0000000
Binary files a/libs/3rdParty/smack/smack-xmlparser-4.4.8.jar and /dev/null differ
diff --git a/libs/3rdParty/smack/smack-xmlparser-xpp3-4.4.8.jar b/libs/3rdParty/smack/smack-xmlparser-xpp3-4.4.8.jar
deleted file mode 100644
index 79d74df..0000000
Binary files a/libs/3rdParty/smack/smack-xmlparser-xpp3-4.4.8.jar and /dev/null differ
diff --git a/libs/3rdParty/xmlpull-1.1.3.1.jar b/libs/3rdParty/xmlpull-1.1.3.1.jar
deleted file mode 100644
index cbc149d..0000000
Binary files a/libs/3rdParty/xmlpull-1.1.3.1.jar and /dev/null differ
diff --git a/libs/3rdParty/xpp3_min-1.1.4c.jar b/libs/3rdParty/xpp3_min-1.1.4c.jar
deleted file mode 100644
index 813a9a8..0000000
Binary files a/libs/3rdParty/xpp3_min-1.1.4c.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..8031795
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,78 @@
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>de.thedevstack.xmpp.mamloader</groupId>
+  <artifactId>mamhistoryloader</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>mamhistoryloader</name>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.igniterealtime.smack</groupId>
+        <artifactId>smack-java8</artifactId>
+        <version>4.4.8</version>
+    </dependency>
+    <dependency>
+            <groupId>org.igniterealtime.smack</groupId>
+            <artifactId>smack-tcp</artifactId>
+            <version>4.4.8</version>
+    </dependency>
+    <dependency>
+            <groupId>org.igniterealtime.smack</groupId>
+            <artifactId>smack-im</artifactId>
+            <version>4.4.8</version>
+    </dependency>
+    <dependency>
+            <groupId>org.igniterealtime.smack</groupId>
+            <artifactId>smack-extensions</artifactId>
+            <version>4.4.8</version>
+    </dependency>
+    <dependency>
+            <groupId>org.igniterealtime.smack</groupId>
+            <artifactId>smack-experimental</artifactId>
+            <version>4.4.8</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>3.3.0</version>
+          <configuration>
+              <mainClass>de.thedevstack.xmpp.mamloader.MamLoader</mainClass>
+          </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+            <execution>
+                <phase>package</phase>
+                <goals>
+                    <goal>single</goal>
+                </goals>
+                <configuration>
+                    <archive>
+                    <manifest>
+                        <mainClass>de.thedevstack.xmpp.mamloader.MamLoader</mainClass>
+                    </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </execution>
+        </executions>
+    </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/src/de/thedevstack/xmpp/mamloader/MamLoadClient.java b/src/main/java/de/thedevstack/xmpp/mamloader/MamLoadClient.java
similarity index 100%
rename from src/de/thedevstack/xmpp/mamloader/MamLoadClient.java
rename to src/main/java/de/thedevstack/xmpp/mamloader/MamLoadClient.java
diff --git a/src/de/thedevstack/xmpp/mamloader/MamLoader.java b/src/main/java/de/thedevstack/xmpp/mamloader/MamLoader.java
similarity index 100%
rename from src/de/thedevstack/xmpp/mamloader/MamLoader.java
rename to src/main/java/de/thedevstack/xmpp/mamloader/MamLoader.java
diff --git a/src/de/thedevstack/xmpp/mamloader/MamMessage.java b/src/main/java/de/thedevstack/xmpp/mamloader/MamMessage.java
similarity index 100%
rename from src/de/thedevstack/xmpp/mamloader/MamMessage.java
rename to src/main/java/de/thedevstack/xmpp/mamloader/MamMessage.java
diff --git a/src/de/thedevstack/xmpp/mamloader/SSLHelper.java b/src/main/java/de/thedevstack/xmpp/mamloader/SSLHelper.java
similarity index 100%
rename from src/de/thedevstack/xmpp/mamloader/SSLHelper.java
rename to src/main/java/de/thedevstack/xmpp/mamloader/SSLHelper.java
diff --git a/src/org/jxmpp/jid/BareJid.java b/src/main/java/org/jxmpp/jid/BareJid.java
similarity index 100%
rename from src/org/jxmpp/jid/BareJid.java
rename to src/main/java/org/jxmpp/jid/BareJid.java
diff --git a/src/org/jxmpp/jid/DomainBareJid.java b/src/main/java/org/jxmpp/jid/DomainBareJid.java
similarity index 100%
rename from src/org/jxmpp/jid/DomainBareJid.java
rename to src/main/java/org/jxmpp/jid/DomainBareJid.java
diff --git a/src/org/jxmpp/jid/DomainFullJid.java b/src/main/java/org/jxmpp/jid/DomainFullJid.java
similarity index 100%
rename from src/org/jxmpp/jid/DomainFullJid.java
rename to src/main/java/org/jxmpp/jid/DomainFullJid.java
diff --git a/src/org/jxmpp/jid/DomainJid.java b/src/main/java/org/jxmpp/jid/DomainJid.java
similarity index 100%
rename from src/org/jxmpp/jid/DomainJid.java
rename to src/main/java/org/jxmpp/jid/DomainJid.java
diff --git a/src/org/jxmpp/jid/EntityBareJid.java b/src/main/java/org/jxmpp/jid/EntityBareJid.java
similarity index 100%
rename from src/org/jxmpp/jid/EntityBareJid.java
rename to src/main/java/org/jxmpp/jid/EntityBareJid.java
diff --git a/src/org/jxmpp/jid/EntityFullJid.java b/src/main/java/org/jxmpp/jid/EntityFullJid.java
similarity index 100%
rename from src/org/jxmpp/jid/EntityFullJid.java
rename to src/main/java/org/jxmpp/jid/EntityFullJid.java
diff --git a/src/org/jxmpp/jid/EntityJid.java b/src/main/java/org/jxmpp/jid/EntityJid.java
similarity index 100%
rename from src/org/jxmpp/jid/EntityJid.java
rename to src/main/java/org/jxmpp/jid/EntityJid.java
diff --git a/src/org/jxmpp/jid/FullJid.java b/src/main/java/org/jxmpp/jid/FullJid.java
similarity index 100%
rename from src/org/jxmpp/jid/FullJid.java
rename to src/main/java/org/jxmpp/jid/FullJid.java
diff --git a/src/org/jxmpp/jid/Jid.java b/src/main/java/org/jxmpp/jid/Jid.java
similarity index 100%
rename from src/org/jxmpp/jid/Jid.java
rename to src/main/java/org/jxmpp/jid/Jid.java
diff --git a/src/org/jxmpp/jid/impl/AbstractJid.java b/src/main/java/org/jxmpp/jid/impl/AbstractJid.java
similarity index 100%
rename from src/org/jxmpp/jid/impl/AbstractJid.java
rename to src/main/java/org/jxmpp/jid/impl/AbstractJid.java
diff --git a/src/org/jxmpp/jid/impl/DomainAndResourcepartJid.java b/src/main/java/org/jxmpp/jid/impl/DomainAndResourcepartJid.java
similarity index 100%
rename from src/org/jxmpp/jid/impl/DomainAndResourcepartJid.java
rename to src/main/java/org/jxmpp/jid/impl/DomainAndResourcepartJid.java
diff --git a/src/org/jxmpp/jid/impl/DomainpartJid.java b/src/main/java/org/jxmpp/jid/impl/DomainpartJid.java
similarity index 100%
rename from src/org/jxmpp/jid/impl/DomainpartJid.java
rename to src/main/java/org/jxmpp/jid/impl/DomainpartJid.java
diff --git a/src/org/jxmpp/jid/impl/JidCreate.java b/src/main/java/org/jxmpp/jid/impl/JidCreate.java
similarity index 100%
rename from src/org/jxmpp/jid/impl/JidCreate.java
rename to src/main/java/org/jxmpp/jid/impl/JidCreate.java
diff --git a/src/org/jxmpp/jid/impl/LocalAndDomainpartJid.java b/src/main/java/org/jxmpp/jid/impl/LocalAndDomainpartJid.java
similarity index 100%
rename from src/org/jxmpp/jid/impl/LocalAndDomainpartJid.java
rename to src/main/java/org/jxmpp/jid/impl/LocalAndDomainpartJid.java
diff --git a/src/org/jxmpp/jid/impl/LocalDomainAndResourcepartJid.java b/src/main/java/org/jxmpp/jid/impl/LocalDomainAndResourcepartJid.java
similarity index 100%
rename from src/org/jxmpp/jid/impl/LocalDomainAndResourcepartJid.java
rename to src/main/java/org/jxmpp/jid/impl/LocalDomainAndResourcepartJid.java
diff --git a/src/org/jxmpp/jid/impl/package-info.java b/src/main/java/org/jxmpp/jid/impl/package-info.java
similarity index 100%
rename from src/org/jxmpp/jid/impl/package-info.java
rename to src/main/java/org/jxmpp/jid/impl/package-info.java
diff --git a/src/org/jxmpp/jid/package-info.java b/src/main/java/org/jxmpp/jid/package-info.java
similarity index 100%
rename from src/org/jxmpp/jid/package-info.java
rename to src/main/java/org/jxmpp/jid/package-info.java
diff --git a/src/org/jxmpp/jid/parts/Domainpart.java b/src/main/java/org/jxmpp/jid/parts/Domainpart.java
similarity index 100%
rename from src/org/jxmpp/jid/parts/Domainpart.java
rename to src/main/java/org/jxmpp/jid/parts/Domainpart.java
diff --git a/src/org/jxmpp/jid/parts/Localpart.java b/src/main/java/org/jxmpp/jid/parts/Localpart.java
similarity index 100%
rename from src/org/jxmpp/jid/parts/Localpart.java
rename to src/main/java/org/jxmpp/jid/parts/Localpart.java
diff --git a/src/org/jxmpp/jid/parts/Part.java b/src/main/java/org/jxmpp/jid/parts/Part.java
similarity index 100%
rename from src/org/jxmpp/jid/parts/Part.java
rename to src/main/java/org/jxmpp/jid/parts/Part.java
diff --git a/src/org/jxmpp/jid/parts/Resourcepart.java b/src/main/java/org/jxmpp/jid/parts/Resourcepart.java
similarity index 100%
rename from src/org/jxmpp/jid/parts/Resourcepart.java
rename to src/main/java/org/jxmpp/jid/parts/Resourcepart.java
diff --git a/src/org/jxmpp/jid/parts/package-info.java b/src/main/java/org/jxmpp/jid/parts/package-info.java
similarity index 100%
rename from src/org/jxmpp/jid/parts/package-info.java
rename to src/main/java/org/jxmpp/jid/parts/package-info.java
diff --git a/src/org/jxmpp/jid/util/JidUtil.java b/src/main/java/org/jxmpp/jid/util/JidUtil.java
similarity index 100%
rename from src/org/jxmpp/jid/util/JidUtil.java
rename to src/main/java/org/jxmpp/jid/util/JidUtil.java
diff --git a/src/org/jxmpp/jid/util/package-info.java b/src/main/java/org/jxmpp/jid/util/package-info.java
similarity index 100%
rename from src/org/jxmpp/jid/util/package-info.java
rename to src/main/java/org/jxmpp/jid/util/package-info.java
diff --git a/test/java/de/thedevstack/xmpp/AppTest.java b/test/java/de/thedevstack/xmpp/AppTest.java
new file mode 100644
index 0000000..28790d0
--- /dev/null
+++ b/test/java/de/thedevstack/xmpp/AppTest.java
@@ -0,0 +1,38 @@
+package de.thedevstack.xmpp;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}