diff --git a/.gitignore b/.gitignore
index a39a039..913f358 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,10 @@ UMLGraph-snapshot*
 UMLGraph-R*
 CHECKSUM.MD5
 _vimrc
-pom.xml
+target
+*.iml
+*.iws
+*.ipr
+*.swp
+*.DS_Store
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..1521f01
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,127 @@
+<?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.5-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>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <scm>
+    <url>https://github.com/dspinellis/UMLGraph/</url>
+    <connection>scm:git://github.com/dspinellis/UMLGraph.git</connection>
+    <developerConnection>scm:git:git@github.com:dspinellis/UMLGraph.git</developerConnection>
+  </scm>
+
+  <developers>
+    <developer>
+      <id>dspinellis</id>
+      <name>Diomidis Spinellis</name>
+      <email>dds@aueb.gr</email>
+    </developer>
+  </developers>
+
+  <dependencies>
+    <dependency>
+      <groupId>sun.jdk</groupId>
+      <artifactId>tools</artifactId>
+      <version>1.5.0</version>
+      <scope>system</scope>
+      <systemPath>${java.home}/../lib/tools.jar</systemPath>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+              <mainClass>org.umlgraph.doclet.UmlGraph</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <configuration>
+          <preparationGoals>clean verify</preparationGoals>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+          <docletPath>${project.build.directory}${file.separator}${project.build.finalName}.jar</docletPath>
+          <additionalparam>-inferrel</additionalparam>
+          <additionalparam>-inferdep</additionalparam>
+          <additionalparam>-collapsible</additionalparam>
+          <additionalparam>-hide java.*</additionalparam>
+          <additionalparam>-collpackages</additionalparam>
+          <additionalparam>-qualify</additionalparam>
+          <additionalparam>-postfixpackage</additionalparam>
+          <additionalparam>-nodefontsize 9</additionalparam>
+          <additionalparam>-nodefontpackagesize 7</additionalparam>
+          <additionalparam>-link http://docs.oracle.com/javase/7/docs/jdk/api/javadoc/doclet/</additionalparam>
+          <additionalparam>-link http://download.oracle.com/javase/7/docs/api/</additionalparam>
+          <useStandardDocletOptions>true</useStandardDocletOptions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
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/main/java/org/umlgraph/doclet/Version.java b/src/main/java/org/umlgraph/doclet/Version.java
new file mode 100644
index 0000000..3db05df
--- /dev/null
+++ b/src/main/java/org/umlgraph/doclet/Version.java
@@ -0,0 +1,29 @@
+package org.umlgraph.doclet;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+class Version {
+    private final static String filename = "version.properties";
+    private final static String key = "umlgraph.version";
+    public static String VERSION;
+
+    static {
+        Properties props = new Properties();
+        InputStream in = Version.class.getClassLoader().getResourceAsStream(filename);
+        try {
+            props.load(in);
+            if (props.get(key) == null) {
+                System.err.println("Could not find version property");
+                VERSION = "0";
+            } else {
+                VERSION = props.get(key).toString();
+            }
+
+            in.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
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/main/resources/version.properties b/src/main/resources/version.properties
new file mode 100644
index 0000000..3d3ff90
--- /dev/null
+++ b/src/main/resources/version.properties
@@ -0,0 +1 @@
+umlgraph.version=${pom.version}
\ No newline at end of file
diff --git a/src/org/umlgraph/doclet/.gitignore b/src/org/umlgraph/doclet/.gitignore
deleted file mode 100644
index a953aa4..0000000
--- a/src/org/umlgraph/doclet/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Version.java
diff --git a/src/org/umlgraph/test/BasicTest.java b/src/test/java/org/umlgraph/test/BasicTest.java
similarity index 100%
rename from src/org/umlgraph/test/BasicTest.java
rename to src/test/java/org/umlgraph/test/BasicTest.java
diff --git a/src/org/umlgraph/test/DotDiff.java b/src/test/java/org/umlgraph/test/DotDiff.java
similarity index 100%
rename from src/org/umlgraph/test/DotDiff.java
rename to src/test/java/org/umlgraph/test/DotDiff.java
diff --git a/src/org/umlgraph/test/RunDoc.java b/src/test/java/org/umlgraph/test/RunDoc.java
similarity index 100%
rename from src/org/umlgraph/test/RunDoc.java
rename to src/test/java/org/umlgraph/test/RunDoc.java
diff --git a/src/org/umlgraph/test/RunOne.java b/src/test/java/org/umlgraph/test/RunOne.java
similarity index 100%
rename from src/org/umlgraph/test/RunOne.java
rename to src/test/java/org/umlgraph/test/RunOne.java
diff --git a/src/org/umlgraph/test/SimpleFileFilter.java b/src/test/java/org/umlgraph/test/SimpleFileFilter.java
similarity index 100%
rename from src/org/umlgraph/test/SimpleFileFilter.java
rename to src/test/java/org/umlgraph/test/SimpleFileFilter.java
diff --git a/src/org/umlgraph/test/TestUtils.java b/src/test/java/org/umlgraph/test/TestUtils.java
similarity index 100%
rename from src/org/umlgraph/test/TestUtils.java
rename to src/test/java/org/umlgraph/test/TestUtils.java
diff --git a/src/org/umlgraph/test/UmlDocTest.java b/src/test/java/org/umlgraph/test/UmlDocTest.java
similarity index 100%
rename from src/org/umlgraph/test/UmlDocTest.java
rename to src/test/java/org/umlgraph/test/UmlDocTest.java