diff --git a/.gitignore b/.gitignore
index 0f182a034..2595e2a6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.class
 
-# Package Files #
-*.jar
-*.war
-*.ear
+tmp/
+
+# Maven target
+target/
+
diff --git a/lib/log4j-1.2.16-src.zip b/lib/log4j-1.2.16-src.zip
deleted file mode 100644
index 086789a20..000000000
Binary files a/lib/log4j-1.2.16-src.zip and /dev/null differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000..3a5356e64
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,166 @@
+<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>ch.eitchnet</groupId>
+  <artifactId>ch.eitchnet.utils</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>ch.eitchnet.utils</name>
+  <url>https://github.com/eitch/ch.eitchnet.utils</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <!-- POM Reference: http://maven.apache.org/pom.html#Licenses -->
+
+  <inceptionYear>2011</inceptionYear>
+  <licenses>
+    <license>
+      <name>GNU Lesser General Public License</name>
+      <url>http://www.gnu.org/licenses/lgpl.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <organization>
+    <name>eitchnet.ch</name>
+    <url>http://blog.eitchnet.ch</url>
+  </organization>
+  <developers>
+    <developer>
+      <id>eitch</id>
+      <name>Robert von Vurg</name>
+      <email>eitch@eitchnet.ch</email>
+      <url>http://blog.eitchnet.ch</url>
+      <organization>eitchnet.ch</organization>
+      <organizationUrl>http://blog.eitchnet.ch</organizationUrl>
+      <roles>
+        <role>architect</role>
+        <role>developer</role>
+      </roles>
+      <timezone>+1</timezone>
+      <properties>
+        <picUrl>http://localhost</picUrl>
+      </properties>
+    </developer>
+  </developers>
+
+  <issueManagement>
+    <system>Github Issues</system>
+    <url>https://github.com/eitch/ch.eitchnet.utils/issues</url>
+  </issueManagement>
+
+  <!--
+  <ciManagement>
+    <system>continuum</system>
+    <url>http://127.0.0.1:8080/continuum</url>
+    <notifiers>
+      <notifier>
+        <type>mail</type>
+        <sendOnError>true</sendOnError>
+        <sendOnFailure>true</sendOnFailure>
+        <sendOnSuccess>false</sendOnSuccess>
+        <sendOnWarning>false</sendOnWarning>
+        <configuration><address>continuum@127.0.0.1</address></configuration>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+
+  <mailingLists>
+    <mailingList>
+      <name>User List</name>
+      <subscribe>user-subscribe@127.0.0.1</subscribe>
+      <unsubscribe>user-unsubscribe@127.0.0.1</unsubscribe>
+      <post>user@127.0.0.1</post>
+      <archive>http://127.0.0.1/user/</archive>
+      <otherArchives>
+        <otherArchive>http://base.google.com/base/1/127.0.0.1</otherArchive>
+      </otherArchives>
+    </mailingList>
+  </mailingLists>
+  -->
+
+  <scm>
+    <connection>scm:git:https://github.com/eitch/ch.eitchnet.utils.git</connection>
+    <developerConnection>scm:git:git@github.com:eitch/ch.eitchnet.utils.git</developerConnection>
+    <url>https://github.com/eitch/ch.eitchnet.utils</url>
+  </scm>
+
+  <!--
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+        <updatePolicy>always</updatePolicy>
+        <checksumPolicy>warn</checksumPolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+        <checksumPolicy>fail</checksumPolicy>
+      </snapshots>
+      <id>codehausSnapshots</id>
+      <name>Codehaus Snapshots</name>
+      <url>http://snapshots.maven.codehaus.org/maven2</url>
+      <layout>default</layout>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    ...
+  </pluginRepositories>
+  -->
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.17</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              <!--mainClass>ch.eitchnet.App</mainClass-->
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <outputEncoding>UTF-8</outputEncoding>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+</project>
diff --git a/src/ch/eitchnet/rmi/RMIFileClient.java b/src/main/java/ch/eitchnet/rmi/RMIFileClient.java
similarity index 100%
rename from src/ch/eitchnet/rmi/RMIFileClient.java
rename to src/main/java/ch/eitchnet/rmi/RMIFileClient.java
diff --git a/src/ch/eitchnet/rmi/RmiFileDeletion.java b/src/main/java/ch/eitchnet/rmi/RmiFileDeletion.java
similarity index 100%
rename from src/ch/eitchnet/rmi/RmiFileDeletion.java
rename to src/main/java/ch/eitchnet/rmi/RmiFileDeletion.java
diff --git a/src/ch/eitchnet/rmi/RmiFileHandler.java b/src/main/java/ch/eitchnet/rmi/RmiFileHandler.java
similarity index 100%
rename from src/ch/eitchnet/rmi/RmiFileHandler.java
rename to src/main/java/ch/eitchnet/rmi/RmiFileHandler.java
diff --git a/src/ch/eitchnet/rmi/RmiFilePart.java b/src/main/java/ch/eitchnet/rmi/RmiFilePart.java
similarity index 100%
rename from src/ch/eitchnet/rmi/RmiFilePart.java
rename to src/main/java/ch/eitchnet/rmi/RmiFilePart.java
diff --git a/src/ch/eitchnet/rmi/RmiHelper.java b/src/main/java/ch/eitchnet/rmi/RmiHelper.java
similarity index 100%
rename from src/ch/eitchnet/rmi/RmiHelper.java
rename to src/main/java/ch/eitchnet/rmi/RmiHelper.java
diff --git a/src/ch/eitchnet/utils/helper/FileHelper.java b/src/main/java/ch/eitchnet/utils/helper/FileHelper.java
similarity index 100%
rename from src/ch/eitchnet/utils/helper/FileHelper.java
rename to src/main/java/ch/eitchnet/utils/helper/FileHelper.java
diff --git a/src/ch/eitchnet/utils/helper/Log4jConfigurator.java b/src/main/java/ch/eitchnet/utils/helper/Log4jConfigurator.java
similarity index 100%
rename from src/ch/eitchnet/utils/helper/Log4jConfigurator.java
rename to src/main/java/ch/eitchnet/utils/helper/Log4jConfigurator.java
diff --git a/src/ch/eitchnet/utils/helper/Log4jPropertyWatchDog.java b/src/main/java/ch/eitchnet/utils/helper/Log4jPropertyWatchDog.java
similarity index 100%
rename from src/ch/eitchnet/utils/helper/Log4jPropertyWatchDog.java
rename to src/main/java/ch/eitchnet/utils/helper/Log4jPropertyWatchDog.java
diff --git a/src/ch/eitchnet/utils/helper/StringHelper.java b/src/main/java/ch/eitchnet/utils/helper/StringHelper.java
similarity index 100%
rename from src/ch/eitchnet/utils/helper/StringHelper.java
rename to src/main/java/ch/eitchnet/utils/helper/StringHelper.java
diff --git a/src/ch/eitchnet/utils/helper/SystemHelper.java b/src/main/java/ch/eitchnet/utils/helper/SystemHelper.java
similarity index 100%
rename from src/ch/eitchnet/utils/helper/SystemHelper.java
rename to src/main/java/ch/eitchnet/utils/helper/SystemHelper.java
diff --git a/src/ch/eitchnet/utils/objectfilter/ITransactionObject.java b/src/main/java/ch/eitchnet/utils/objectfilter/ITransactionObject.java
similarity index 100%
rename from src/ch/eitchnet/utils/objectfilter/ITransactionObject.java
rename to src/main/java/ch/eitchnet/utils/objectfilter/ITransactionObject.java
diff --git a/src/ch/eitchnet/utils/objectfilter/ObjectCache.java b/src/main/java/ch/eitchnet/utils/objectfilter/ObjectCache.java
similarity index 100%
rename from src/ch/eitchnet/utils/objectfilter/ObjectCache.java
rename to src/main/java/ch/eitchnet/utils/objectfilter/ObjectCache.java
diff --git a/src/ch/eitchnet/utils/objectfilter/ObjectFilter.java b/src/main/java/ch/eitchnet/utils/objectfilter/ObjectFilter.java
similarity index 100%
rename from src/ch/eitchnet/utils/objectfilter/ObjectFilter.java
rename to src/main/java/ch/eitchnet/utils/objectfilter/ObjectFilter.java
diff --git a/src/ch/eitchnet/utils/objectfilter/Operation.java b/src/main/java/ch/eitchnet/utils/objectfilter/Operation.java
similarity index 100%
rename from src/ch/eitchnet/utils/objectfilter/Operation.java
rename to src/main/java/ch/eitchnet/utils/objectfilter/Operation.java