diff --git a/jelly-tags/betwixt/build.xml b/jelly-tags/betwixt/build.xml
deleted file mode 100644
index c90a082..0000000
--- a/jelly-tags/betwixt/build.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.0-SNAPSHOT
-  on date May 24 2004, time 2301-->
-<project default="jar" name="commons-jelly-tags-betwixt" basedir=".">
-  <property name="defaulttargetdir" value="target">
-  </property>
-  <property name="libdir" value="target/lib">
-  </property>
-  <property name="classesdir" value="target/classes">
-  </property>
-  <property name="testclassesdir" value="target/test-classes">
-  </property>
-  <property name="testreportdir" value="target/test-reports">
-  </property>
-  <property name="distdir" value="dist">
-  </property>
-  <property name="javadocdir" value="dist/docs/api">
-  </property>
-  <property name="final.name" value="commons-jelly-tags-betwixt-1.0-SNAPSHOT">
-  </property>
-  <target name="init" description="o Initializes some properties">
-    <mkdir dir="${libdir}">
-    </mkdir>
-    <condition property="noget">
-      <equals arg2="only" arg1="${build.sysclasspath}">
-      </equals>
-    </condition>
-  </target>
-  <target name="compile" description="o Compile the code" depends="get-deps">
-    <mkdir dir="${classesdir}">
-    </mkdir>
-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="src/java">
-        </pathelement>
-      </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-      </classpath>
-    </javac>
-    <copy todir="${classesdir}">
-      <fileset dir="src/java">
-        <include name="**/*.properties">
-        </include>
-      </fileset>
-    </copy>
-    <copy todir="${testclassesdir}">
-      <fileset dir="src/test">
-        <include name="**/*.jelly">
-        </include>
-        <include name="**/*.xml">
-        </include>
-        <include name="**/*.xsl">
-        </include>
-        <include name="**/*.rng">
-        </include>
-        <include name="**/*.dtd">
-        </include>
-        <include name="**/*.properties">
-        </include>
-        <include name="**/*.html">
-        </include>
-      </fileset>
-    </copy>
-  </target>
-  <target name="jar" description="o Create the jar" depends="compile,test">
-    <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
-    </jar>
-  </target>
-  <target name="clean" description="o Clean up the generated directories">
-    <delete dir="${defaulttargetdir}">
-    </delete>
-    <delete dir="${distdir}">
-    </delete>
-  </target>
-  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
-    <mkdir dir="dist">
-    </mkdir>
-    <copy todir="dist">
-      <fileset dir="${defaulttargetdir}" includes="*.jar">
-      </fileset>
-      <fileset dir="${basedir}" includes="LICENSE*, README*">
-      </fileset>
-    </copy>
-  </target>
-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
-    <fail message="There were test failures.">
-    </fail>
-  </target>
-  <target name="internal-test" depends="compile-tests">
-    <mkdir dir="${testreportdir}">
-    </mkdir>
-    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
-      <sysproperty key="basedir" value=".">
-      </sysproperty>
-      <formatter type="xml">
-      </formatter>
-      <formatter usefile="false" type="plain">
-      </formatter>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement path="${testclassesdir}">
-        </pathelement>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-      <batchtest todir="${testreportdir}">
-        <fileset dir="src/test">
-          <include name="**/Test*.java">
-          </include>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="compile-tests" depends="compile">
-    <mkdir dir="${testclassesdir}">
-    </mkdir>
-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="src/test">
-        </pathelement>
-      </src>
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-    </javac>
-  </target>
-  <target name="javadoc" description="o Generate javadoc" depends="jar">
-    <mkdir dir="${javadocdir}">
-    </mkdir>
-    <tstamp>
-      <format pattern="2002-yyyy" property="year">
-      </format>
-    </tstamp>
-    <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation. All Rights Reserved.">
-    </property>
-    <property name="title" value="commons-jelly-tags-betwixt 1.0-SNAPSHOT API">
-    </property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.jelly.tags.betwixt.*">
-      <classpath>
-        <fileset dir="${libdir}">
-          <include name="*.jar">
-          </include>
-        </fileset>
-        <pathelement location="target/${final.name}.jar">
-        </pathelement>
-      </classpath>
-    </javadoc>
-  </target>
-  <target name="get-deps" unless="noget" depends="init">
-    <get dest="${libdir}/commons-jelly-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-SNAPSHOT.jar">
-    </get>
-    <get dest="${libdir}/commons-betwixt-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-betwixt/jars/commons-betwixt-SNAPSHOT.jar">
-    </get>
-    <get dest="${libdir}/commons-digester-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-SNAPSHOT.jar">
-    </get>
-    <get dest="${libdir}/commons-jelly-tags-log-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-log-SNAPSHOT.jar">
-    </get>
-    <get dest="${libdir}/commons-jelly-tags-junit-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-junit-SNAPSHOT.jar">
-    </get>
-    <get dest="${libdir}/commons-jexl-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-SNAPSHOT.jar">
-    </get>
-    <get dest="${libdir}/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar">
-    </get>
-    <get dest="${libdir}/commons-beanutils-1.6.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.6.jar">
-    </get>
-    <get dest="${libdir}/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar">
-    </get>
-    <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar">
-    </get>
-    <get dest="${libdir}/dom4j-1.5-beta-2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.5-beta-2.jar">
-    </get>
-    <get dest="${libdir}/jaxen-1.1-beta-2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jaxen/jars/jaxen-1.1-beta-2.jar">
-    </get>
-    <get dest="${libdir}/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.2.1.jar">
-    </get>
-    <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
-    </get>
-    <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
-    </get>
-    <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
-    </get>
-  </target>
-  <target name="install-maven">
-    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
-    </get>
-    <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-    </unjar>
-  </target>
-</project>
\ No newline at end of file
diff --git a/jelly-tags/betwixt/maven.xml b/jelly-tags/betwixt/maven.xml
deleted file mode 100644
index 8a2b8cc..0000000
--- a/jelly-tags/betwixt/maven.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project default="java:jar">
-
-</project>
diff --git a/jelly-tags/betwixt/project.xml b/jelly-tags/betwixt/pom.xml
similarity index 62%
rename from jelly-tags/betwixt/project.xml
rename to jelly-tags/betwixt/pom.xml
index 1ea2694..45ad37b 100644
--- a/jelly-tags/betwixt/project.xml
+++ b/jelly-tags/betwixt/pom.xml
@@ -6,78 +6,59 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project>
-  <extend>${basedir}/../tag-project.xml</extend>
-  <artifactId>commons-jelly-tags-betwixt</artifactId>
-  <name>commons-jelly-tags-betwixt</name>
-  <currentVersion>1.1-SNAPSHOT</currentVersion>
-  <package>org.apache.commons.jelly.tags.betwixt</package>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>commons-jelly</groupId>
+    <artifactId>commons-jelly-tags</artifactId>
+    <version>1.1-SNAPSHOT</version>
+  </parent>
 
-  <description>
-      This is a Jelly interface for Betwixt.
-  </description>
-  <shortDescription>Commons Jelly Betwixt Tag Library</shortDescription>
-  
-  <versions>
-    <version>
-      <id>1.0</id>
-      <name>1.0</name>
-      <tag>COMMONS_JELLY_BETWIXT-1_0</tag>
-    </version>
-  </versions>
+  <artifactId>commons-jelly-tags-betwixt</artifactId>
+  <packaging>jar</packaging>
+  <name>commons-jelly-tags-betwixt</name>
+  <description>This is a Jelly interface for Betwixt.</description>
 
   <dependencies>
-
     <!-- START for compilation -->
     <dependency>
       <groupId>commons-betwixt</groupId>
       <artifactId>commons-betwixt</artifactId>
       <version>0.6</version>
-      <url>http://commons.apache.org/betwixt/</url>
     </dependency>
-    
     <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
       <version>1.6</version>
-      <url>http://commons.apache.org/digester/</url>
     </dependency>
-    
+
     <!-- END for compilation -->
 
-    <!-- START for test -->
-  
+    <!-- START for testing -->
+
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-log</artifactId>
-      <version>1.0</version>
-      <url>http://commons.apache.org/jelly/tags/log/</url>
-      <properties>
-        <scope>test</scope>
-      </properties>
+      <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
-      
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-junit</artifactId>
-      <version>1.0</version>
-      <url>http://commons.apache.org/jelly/tags/junit/</url>
-      <properties>
-        <scope>test</scope>
-      </properties>
+      <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
 
-    <!-- END for test -->
-    
+    <!-- END for testing -->
   </dependencies>
-  
 </project>
diff --git a/jelly-tags/betwixt/project.properties b/jelly-tags/betwixt/project.properties
deleted file mode 100644
index 2850c0e..0000000
--- a/jelly-tags/betwixt/project.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# -------------------------------------------------------------------
-# P R O J E C T  P R O P E R T I E S
-# -------------------------------------------------------------------
diff --git a/jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/BetwixtTagLibrary.java b/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/BetwixtTagLibrary.java
similarity index 100%
rename from jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/BetwixtTagLibrary.java
rename to jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/BetwixtTagLibrary.java
diff --git a/jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java b/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
similarity index 100%
rename from jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
rename to jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/IntrospectorTag.java
diff --git a/jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java b/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java
similarity index 100%
rename from jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java
rename to jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/ParseTag.java
diff --git a/jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/package.html b/jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/package.html
similarity index 100%
rename from jelly-tags/betwixt/src/java/org/apache/commons/jelly/tags/betwixt/package.html
rename to jelly-tags/betwixt/src/main/java/org/apache/commons/jelly/tags/betwixt/package.html
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Channel.java b/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/Channel.java
similarity index 100%
rename from jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Channel.java
rename to jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/Channel.java
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Image.java b/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/Image.java
similarity index 100%
rename from jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Image.java
rename to jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/Image.java
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Item.java b/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/Item.java
similarity index 100%
rename from jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/Item.java
rename to jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/Item.java
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/RSSDigester.java b/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
similarity index 100%
rename from jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/RSSDigester.java
rename to jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/TextInput.java b/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/TextInput.java
similarity index 100%
rename from jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/TextInput.java
rename to jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/TextInput.java
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/package.html b/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/package.html
similarity index 100%
rename from jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/package.html
rename to jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/package.html
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/jelly/betwixt/TestJelly.java b/jelly-tags/betwixt/src/test/java/org/apache/commons/jelly/betwixt/TestJelly.java
similarity index 100%
rename from jelly-tags/betwixt/src/test/org/apache/commons/jelly/betwixt/TestJelly.java
rename to jelly-tags/betwixt/src/test/java/org/apache/commons/jelly/betwixt/TestJelly.java
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/rss-example.xml b/jelly-tags/betwixt/src/test/resources/org/apache/commons/digester/rss/rss-example.xml
similarity index 100%
rename from jelly-tags/betwixt/src/test/org/apache/commons/digester/rss/rss-example.xml
rename to jelly-tags/betwixt/src/test/resources/org/apache/commons/digester/rss/rss-example.xml
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/jelly/betwixt/common.jelly b/jelly-tags/betwixt/src/test/resources/org/apache/commons/jelly/betwixt/common.jelly
similarity index 100%
rename from jelly-tags/betwixt/src/test/org/apache/commons/jelly/betwixt/common.jelly
rename to jelly-tags/betwixt/src/test/resources/org/apache/commons/jelly/betwixt/common.jelly
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/jelly/betwixt/rss-example.xml b/jelly-tags/betwixt/src/test/resources/org/apache/commons/jelly/betwixt/rss-example.xml
similarity index 100%
rename from jelly-tags/betwixt/src/test/org/apache/commons/jelly/betwixt/rss-example.xml
rename to jelly-tags/betwixt/src/test/resources/org/apache/commons/jelly/betwixt/rss-example.xml
diff --git a/jelly-tags/betwixt/src/test/org/apache/commons/jelly/betwixt/suite.jelly b/jelly-tags/betwixt/src/test/resources/org/apache/commons/jelly/betwixt/suite.jelly
similarity index 100%
rename from jelly-tags/betwixt/src/test/org/apache/commons/jelly/betwixt/suite.jelly
rename to jelly-tags/betwixt/src/test/resources/org/apache/commons/jelly/betwixt/suite.jelly
diff --git a/jelly-tags/pom.xml b/jelly-tags/pom.xml
index 24b3fcd..a9739c0 100644
--- a/jelly-tags/pom.xml
+++ b/jelly-tags/pom.xml
@@ -19,6 +19,7 @@
     <module>avalon</module>
     <module>bean</module>
     <module>beanshell</module>
+    <module>betwixt</module>
     <module>junit</module>
     <module>log</module>
     <module>util</module>