diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..cbe4f26
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,54 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
diff --git a/project.xml b/project.xml
index a6e7fee..81f9396 100644
--- a/project.xml
+++ b/project.xml
@@ -1,40 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project>
+  <pomVersion>3</pomVersion>
+
   <name>jakarta-commons-graph2</name>
+
   <id>commons-graph</id>
+
   <currentVersion>0.8</currentVersion>
-  <organization>Apache Software Foundation</organization>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://jakarta.apache.org/</url>
+    <logo>/images/jakarta-logo-blue.gif</logo>
+  </organization>
+
   <inceptionYear>2001</inceptionYear>
+
   <package>org.apache.commons.graph</package>
+
   <shortDescription>Graph Representation and Manipulation Library</shortDescription>
+
   <description>Jakarta Graph is a toolkit for managing graphs and graph based data structures.</description>
+
   <url>http://jakarta.apache.org/commons/graph/</url>
-  <cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/graph2</cvsWebUrl>
+
+  <repository>
+    <connection>scm:cvs:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-commons/graph2</connection>
+    <url>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/graph2</url>
+  </repository>
+
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/jakarta.apache.org/commons/graph/</siteDirectory>
+
   <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-graph/</distributionDirectory>
+
   <mailingLists>
+
     <mailingList>
       <name>Turbine User List</name>
       <subscribe>turbine-user-subscribe@jakarta.apache.org</subscribe>
       <unsubscribe>turbine-user-unsubscribe@jakarta.apache.org</unsubscribe>
       <archive>http://www.mail-archive.com/turbine-user@jakarta.apache.org/</archive>
     </mailingList>
+
     <mailingList>
       <name>Turbine Developer List</name>
       <subscribe>mailto:turbine-dev-subscribe@jakarta.apache.org</subscribe>
       <unsubscribe>mailto:turbine-dev-unsubscribe@jakarta.apache.org</unsubscribe>
       <archive>http://www.mail-archive.com/turbine-dev@jakarta.apache.org/</archive>
     </mailingList>
+
   </mailingLists>
+
   <developers>
+
     <developer>
       <name>David Dixon-Peugh</name>
       <id>dpeugh</id>
       <email>dpeugh@mindspring.com</email>
       <organization>UltraLog At DARPA</organization>
     </developer>
+
     <developer>
       <name>Jason van Zyl</name>
       <id>jvanzyl</id>
@@ -42,37 +69,56 @@
       <organization>Zenplex</organization>
     </developer>
   </developers>
+
   <dependencies>
+
     <dependency>
-      <name>log4j</name>
+      <id>log4j</id>
       <version>1.1.3</version>
     </dependency>
+
     <dependency>
-      <name>nsuml</name>
+      <id>jdepend</id>
+      <version>2.2</version>
+      <url>http://www.clarkware.com/software/JDepend.html</url>
+    </dependency>
+
+    <dependency>
+      <id>nsuml</id>
       <version>0.4.20</version>
     </dependency>
+
     <dependency>
-      <name>commons-collections</name>
+      <id>commons-collections</id>
       <version>1.0</version>
     </dependency>
+
+    <dependency>
+      <id>xerces</id>
+      <version>1.2.3</version>
+      <url>http://xml.apache.org/xerces/</url>
+    </dependency>
+
   </dependencies>
+
   <build>
-    <sourceDirectories>
-      <sourceDirectory>src/java</sourceDirectory>
-    </sourceDirectories>
-    <testSourceDirectories>
-      <testSourceDirectory>src/java</testSourceDirectory>
-      <testSourceDirectory>src/test</testSourceDirectory>
-    </testSourceDirectories>
+
+    <sourceDirectory>src/java</sourceDirectory>
+
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+
     <aspectSourceDirectories/>
+
     <!-- Unit test classes -->
 
     <unitTestClassEntries>
-      <unitTestClassEntry>include = **/*Test.class</unitTestClassEntry>
+      <unitTestClassEntry>**/*Test.class</unitTestClassEntry>
     </unitTestClassEntries>
+
     <!-- Runtime unit test classes -->
 
     <runtimeTestClassEntries/>
+
     <!-- J A R  R E S O U R C E S -->
     <!-- Resources that are packaged up inside the JAR file -->