diff --git a/.gitignore b/.gitignore
index a39a039..8c01957 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ UMLGraph-snapshot*
 UMLGraph-R*
 CHECKSUM.MD5
 _vimrc
-pom.xml
+target
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..5641821
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<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>org.umlgraph</groupId>
+  <artifactId>umlgraph</artifactId>
+  <packaging>jar</packaging>
+  <name>UMLGraph</name>
+  <version>5.6.0-SNAPSHOT</version>
+  <description>Declarative Drawing of UML Diagrams</description>
+  <url>http://www.umlgraph.org</url>
+
+  <licenses>
+    <license>
+      <name>BSD License (original)</name>
+      <url>http://www.opensource.org/licenses/bsd-license.php</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <scm>
+    <url>https://github.com/dspinellis/UMLGraph</url>
+    <connection>git://github.com/dspinellis/UMLGraph.git</connection>
+  </scm>
+
+  <developers>
+    <developer>
+      <id>dspinellis</id>
+      <name>Diomidis Spinellis</name>
+      <email>dds@aueb.gr</email>
+    </developer>
+  </developers>
+
+  <dependencies/>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.2.1</version>
+        <configuration>
+          <preparationGoals>clean verify</preparationGoals>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/src/org/umlgraph/doclet/.gitignore b/src/main/java/org/umlgraph/doclet/.gitignore
similarity index 100%
rename from src/org/umlgraph/doclet/.gitignore
rename to src/main/java/org/umlgraph/doclet/.gitignore
diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/main/java/org/umlgraph/doclet/ClassGraph.java
similarity index 100%
rename from src/org/umlgraph/doclet/ClassGraph.java
rename to src/main/java/org/umlgraph/doclet/ClassGraph.java
diff --git a/src/org/umlgraph/doclet/ClassInfo.java b/src/main/java/org/umlgraph/doclet/ClassInfo.java
similarity index 100%
rename from src/org/umlgraph/doclet/ClassInfo.java
rename to src/main/java/org/umlgraph/doclet/ClassInfo.java
diff --git a/src/org/umlgraph/doclet/ClassMatcher.java b/src/main/java/org/umlgraph/doclet/ClassMatcher.java
similarity index 100%
rename from src/org/umlgraph/doclet/ClassMatcher.java
rename to src/main/java/org/umlgraph/doclet/ClassMatcher.java
diff --git a/src/org/umlgraph/doclet/ContextMatcher.java b/src/main/java/org/umlgraph/doclet/ContextMatcher.java
similarity index 100%
rename from src/org/umlgraph/doclet/ContextMatcher.java
rename to src/main/java/org/umlgraph/doclet/ContextMatcher.java
diff --git a/src/org/umlgraph/doclet/ContextView.java b/src/main/java/org/umlgraph/doclet/ContextView.java
similarity index 100%
rename from src/org/umlgraph/doclet/ContextView.java
rename to src/main/java/org/umlgraph/doclet/ContextView.java
diff --git a/src/org/umlgraph/doclet/InterfaceMatcher.java b/src/main/java/org/umlgraph/doclet/InterfaceMatcher.java
similarity index 100%
rename from src/org/umlgraph/doclet/InterfaceMatcher.java
rename to src/main/java/org/umlgraph/doclet/InterfaceMatcher.java
diff --git a/src/org/umlgraph/doclet/OptionProvider.java b/src/main/java/org/umlgraph/doclet/OptionProvider.java
similarity index 100%
rename from src/org/umlgraph/doclet/OptionProvider.java
rename to src/main/java/org/umlgraph/doclet/OptionProvider.java
diff --git a/src/org/umlgraph/doclet/Options.java b/src/main/java/org/umlgraph/doclet/Options.java
similarity index 100%
rename from src/org/umlgraph/doclet/Options.java
rename to src/main/java/org/umlgraph/doclet/Options.java
diff --git a/src/org/umlgraph/doclet/PackageMatcher.java b/src/main/java/org/umlgraph/doclet/PackageMatcher.java
similarity index 100%
rename from src/org/umlgraph/doclet/PackageMatcher.java
rename to src/main/java/org/umlgraph/doclet/PackageMatcher.java
diff --git a/src/org/umlgraph/doclet/PackageView.java b/src/main/java/org/umlgraph/doclet/PackageView.java
similarity index 100%
rename from src/org/umlgraph/doclet/PackageView.java
rename to src/main/java/org/umlgraph/doclet/PackageView.java
diff --git a/src/org/umlgraph/doclet/PatternMatcher.java b/src/main/java/org/umlgraph/doclet/PatternMatcher.java
similarity index 100%
rename from src/org/umlgraph/doclet/PatternMatcher.java
rename to src/main/java/org/umlgraph/doclet/PatternMatcher.java
diff --git a/src/org/umlgraph/doclet/RelationDirection.java b/src/main/java/org/umlgraph/doclet/RelationDirection.java
similarity index 100%
rename from src/org/umlgraph/doclet/RelationDirection.java
rename to src/main/java/org/umlgraph/doclet/RelationDirection.java
diff --git a/src/org/umlgraph/doclet/RelationPattern.java b/src/main/java/org/umlgraph/doclet/RelationPattern.java
similarity index 100%
rename from src/org/umlgraph/doclet/RelationPattern.java
rename to src/main/java/org/umlgraph/doclet/RelationPattern.java
diff --git a/src/org/umlgraph/doclet/RelationType.java b/src/main/java/org/umlgraph/doclet/RelationType.java
similarity index 100%
rename from src/org/umlgraph/doclet/RelationType.java
rename to src/main/java/org/umlgraph/doclet/RelationType.java
diff --git a/src/org/umlgraph/doclet/Shape.java b/src/main/java/org/umlgraph/doclet/Shape.java
similarity index 100%
rename from src/org/umlgraph/doclet/Shape.java
rename to src/main/java/org/umlgraph/doclet/Shape.java
diff --git a/src/org/umlgraph/doclet/StringUtil.java b/src/main/java/org/umlgraph/doclet/StringUtil.java
similarity index 100%
rename from src/org/umlgraph/doclet/StringUtil.java
rename to src/main/java/org/umlgraph/doclet/StringUtil.java
diff --git a/src/org/umlgraph/doclet/SubclassMatcher.java b/src/main/java/org/umlgraph/doclet/SubclassMatcher.java
similarity index 100%
rename from src/org/umlgraph/doclet/SubclassMatcher.java
rename to src/main/java/org/umlgraph/doclet/SubclassMatcher.java
diff --git a/src/org/umlgraph/doclet/UMLOptions.java b/src/main/java/org/umlgraph/doclet/UMLOptions.java
similarity index 100%
rename from src/org/umlgraph/doclet/UMLOptions.java
rename to src/main/java/org/umlgraph/doclet/UMLOptions.java
diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/main/java/org/umlgraph/doclet/UmlGraph.java
similarity index 100%
rename from src/org/umlgraph/doclet/UmlGraph.java
rename to src/main/java/org/umlgraph/doclet/UmlGraph.java
diff --git a/src/org/umlgraph/doclet/UmlGraphDoc.java b/src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
similarity index 100%
rename from src/org/umlgraph/doclet/UmlGraphDoc.java
rename to src/main/java/org/umlgraph/doclet/UmlGraphDoc.java
diff --git a/src/org/umlgraph/doclet/View.java b/src/main/java/org/umlgraph/doclet/View.java
similarity index 100%
rename from src/org/umlgraph/doclet/View.java
rename to src/main/java/org/umlgraph/doclet/View.java
diff --git a/src/org/umlgraph/doclet/Visibility.java b/src/main/java/org/umlgraph/doclet/Visibility.java
similarity index 100%
rename from src/org/umlgraph/doclet/Visibility.java
rename to src/main/java/org/umlgraph/doclet/Visibility.java
diff --git a/src/org/umlgraph/doclet/WrappedClassDoc.java b/src/main/java/org/umlgraph/doclet/WrappedClassDoc.java
similarity index 100%
rename from src/org/umlgraph/doclet/WrappedClassDoc.java
rename to src/main/java/org/umlgraph/doclet/WrappedClassDoc.java
diff --git a/src/org/umlgraph/doclet/WrappedRootDoc.java b/src/main/java/org/umlgraph/doclet/WrappedRootDoc.java
similarity index 100%
rename from src/org/umlgraph/doclet/WrappedRootDoc.java
rename to src/main/java/org/umlgraph/doclet/WrappedRootDoc.java
diff --git a/src/org/umlgraph/test/BasicTest.java b/src/main/java/org/umlgraph/test/BasicTest.java
similarity index 100%
rename from src/org/umlgraph/test/BasicTest.java
rename to src/main/java/org/umlgraph/test/BasicTest.java
diff --git a/src/org/umlgraph/test/DotDiff.java b/src/main/java/org/umlgraph/test/DotDiff.java
similarity index 100%
rename from src/org/umlgraph/test/DotDiff.java
rename to src/main/java/org/umlgraph/test/DotDiff.java
diff --git a/src/org/umlgraph/test/RunDoc.java b/src/main/java/org/umlgraph/test/RunDoc.java
similarity index 100%
rename from src/org/umlgraph/test/RunDoc.java
rename to src/main/java/org/umlgraph/test/RunDoc.java
diff --git a/src/org/umlgraph/test/RunOne.java b/src/main/java/org/umlgraph/test/RunOne.java
similarity index 100%
rename from src/org/umlgraph/test/RunOne.java
rename to src/main/java/org/umlgraph/test/RunOne.java
diff --git a/src/org/umlgraph/test/SimpleFileFilter.java b/src/main/java/org/umlgraph/test/SimpleFileFilter.java
similarity index 100%
rename from src/org/umlgraph/test/SimpleFileFilter.java
rename to src/main/java/org/umlgraph/test/SimpleFileFilter.java
diff --git a/src/org/umlgraph/test/TestUtils.java b/src/main/java/org/umlgraph/test/TestUtils.java
similarity index 100%
rename from src/org/umlgraph/test/TestUtils.java
rename to src/main/java/org/umlgraph/test/TestUtils.java
diff --git a/src/org/umlgraph/test/UmlDocTest.java b/src/main/java/org/umlgraph/test/UmlDocTest.java
similarity index 100%
rename from src/org/umlgraph/test/UmlDocTest.java
rename to src/main/java/org/umlgraph/test/UmlDocTest.java