diff --git a/jelly-tags/beanshell/build.xml b/jelly-tags/beanshell/build.xml
deleted file mode 100644
index 7e068cc..0000000
--- a/jelly-tags/beanshell/build.xml
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.0.1-SNAPSHOT
-  on date November 27 2005, time 2334-->
-<project default="jar" name="commons-jelly-tags-beanshell" basedir=".">
-  <!--Load local and user build preferences-->
-  <property file="build.properties">
-  </property>
-  <property file="${user.home}/build.properties">
-  </property>
-  <!--Build properties-->
-  <property name="defaulttargetdir" value="${basedir}/target">
-  </property>
-  <property name="libdir" value="${user.home}/.maven/repository">
-  </property>
-  <property name="classesdir" value="${basedir}/target/classes">
-  </property>
-  <property name="testclassesdir" value="${basedir}/target/test-classes">
-  </property>
-  <property name="testreportdir" value="${basedir}/target/test-reports">
-  </property>
-  <property name="distdir" value="${basedir}/dist">
-  </property>
-  <property name="javadocdir" value="${basedir}/dist/docs/api">
-  </property>
-  <property name="final.name" value="commons-jelly-tags-beanshell-1.0.1-SNAPSHOT">
-  </property>
-  <property name="proxy.host" value="">
-  </property>
-  <property name="proxy.port" value="">
-  </property>
-  <property name="proxy.username" value="">
-  </property>
-  <property name="proxy.password" value="">
-  </property>
-  <path id="build.classpath">
-    <pathelement location="${libdir}/bsh/jars/bsh-2.0b1.jar">
-    </pathelement>
-    <pathelement location="${libdir}/commons-jelly/jars/commons-jelly-tags-junit-1.0.jar">
-    </pathelement>
-    <pathelement location="${libdir}/xml-apis/jars/xml-apis-1.0.b2.jar">
-    </pathelement>
-    <pathelement location="${libdir}/commons-beanutils/jars/commons-beanutils-1.6.jar">
-    </pathelement>
-    <pathelement location="${libdir}/commons-collections/jars/commons-collections-2.1.jar">
-    </pathelement>
-    <pathelement location="${libdir}/commons-jexl/jars/commons-jexl-1.0.jar">
-    </pathelement>
-    <pathelement location="${libdir}/commons-jelly/jars/commons-jelly-1.0.jar">
-    </pathelement>
-    <pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar">
-    </pathelement>
-    <pathelement location="${libdir}/dom4j/jars/dom4j-1.5.jar">
-    </pathelement>
-    <pathelement location="${libdir}/jaxen/jars/jaxen-1.1-beta-2.jar">
-    </pathelement>
-    <pathelement location="${libdir}/xerces/jars/xerces-2.2.1.jar">
-    </pathelement>
-  </path>
-  <target name="init" description="o Initializes some properties">
-    <mkdir dir="${libdir}">
-    </mkdir>
-    <condition property="noget">
-      <equals arg2="only" arg1="${build.sysclasspath}">
-      </equals>
-    </condition>
-    <!--Test if JUNIT is present in ANT classpath-->
-    <available property="Junit.present" classname="junit.framework.Test">
-    </available>
-    <!--Test if user defined a proxy-->
-    <condition property="useProxy">
-      <and>
-        <isset property="proxy.host">
-        </isset>
-        <not>
-          <equals trim="true" arg2="" arg1="${proxy.host}">
-          </equals>
-        </not>
-      </and>
-    </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="${basedir}/src/java">
-        </pathelement>
-      </src>
-      <classpath refid="build.classpath">
-      </classpath>
-    </javac>
-    <copy todir="${classesdir}">
-      <fileset dir="${basedir}/src/java">
-        <include name="**/*.properties">
-        </include>
-      </fileset>
-    </copy>
-    <mkdir dir="${classesdir}/META-INF">
-    </mkdir>
-    <copy todir="${classesdir}/META-INF">
-      <fileset dir="${basedir}/../..">
-        <include name="NOTICE.txt">
-        </include>
-      </fileset>
-    </copy>
-    <copy todir="${classesdir}/META-INF" file="${basedir}/../../LICENSE.txt">
-    </copy>
-  </target>
-  <target name="jar" description="o Create the jar" depends="compile,test">
-    <jar jarfile="${defaulttargetdir}/${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" if="Junit.present" depends="junit-present,compile-tests">
-    <mkdir dir="${testreportdir}">
-    </mkdir>
-    <junit dir="${basedir}" 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>
-        <path refid="build.classpath">
-        </path>
-        <pathelement path="${testclassesdir}">
-        </pathelement>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-      <batchtest todir="${testreportdir}">
-        <fileset dir="${basedir}/src/test">
-          <include name="**/Test*.java">
-          </include>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="junit-present" unless="Junit.present" depends="init">
-    <echo>================================= WARNING ================================</echo>
-    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
-    <echo>==========================================================================</echo>
-  </target>
-  <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
-    <mkdir dir="${testclassesdir}">
-    </mkdir>
-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-      <src>
-        <pathelement location="${basedir}/src/test">
-        </pathelement>
-      </src>
-      <classpath>
-        <path refid="build.classpath">
-        </path>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-    </javac>
-    <copy todir="${testclassesdir}">
-      <fileset dir="${basedir}/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="javadoc" description="o Generate javadoc" depends="get-deps">
-    <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-beanshell 1.0.1-SNAPSHOT API">
-    </property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.jelly.tags.beanshell.*">
-      <classpath>
-        <path refid="build.classpath">
-        </path>
-      </classpath>
-    </javadoc>
-  </target>
-  <target name="get-dep-bsh.jar" description="o Download the dependency : bsh.jar" unless="bsh.jar" depends="init,setProxy,noProxy,get-custom-dep-bsh.jar">
-    <mkdir dir="${libdir}/bsh/jars/">
-    </mkdir>
-    <get dest="${libdir}/bsh/jars/bsh-2.0b1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/bsh/jars/bsh-2.0b1.jar">
-    </get>
-  </target>
-  <target name="get-custom-dep-bsh.jar" if="bsh.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/bsh/jars/">
-    </mkdir>
-    <get dest="${libdir}/bsh/jars/bsh-2.0b1.jar" usetimestamp="true" ignoreerrors="true" src="${bsh.jar}">
-    </get>
-  </target>
-  <target name="get-dep-commons-jelly-tags-junit.jar" description="o Download the dependency : commons-jelly-tags-junit.jar" unless="commons-jelly-tags-junit.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-jelly-tags-junit.jar">
-    <mkdir dir="${libdir}/commons-jelly/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-jelly/jars/commons-jelly-tags-junit-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-junit-1.0.jar">
-    </get>
-  </target>
-  <target name="get-custom-dep-commons-jelly-tags-junit.jar" if="commons-jelly-tags-junit.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/commons-jelly/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-jelly/jars/commons-jelly-tags-junit-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${commons-jelly-tags-junit.jar}">
-    </get>
-  </target>
-  <target name="get-dep-xml-apis.jar" description="o Download the dependency : xml-apis.jar" unless="xml-apis.jar" depends="init,setProxy,noProxy,get-custom-dep-xml-apis.jar">
-    <mkdir dir="${libdir}/xml-apis/jars/">
-    </mkdir>
-    <get dest="${libdir}/xml-apis/jars/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>
-  </target>
-  <target name="get-custom-dep-xml-apis.jar" if="xml-apis.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/xml-apis/jars/">
-    </mkdir>
-    <get dest="${libdir}/xml-apis/jars/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true" src="${xml-apis.jar}">
-    </get>
-  </target>
-  <target name="get-dep-commons-beanutils.jar" description="o Download the dependency : commons-beanutils.jar" unless="commons-beanutils.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-beanutils.jar">
-    <mkdir dir="${libdir}/commons-beanutils/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-beanutils/jars/commons-beanutils-1.6.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.6.jar">
-    </get>
-  </target>
-  <target name="get-custom-dep-commons-beanutils.jar" if="commons-beanutils.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/commons-beanutils/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-beanutils/jars/commons-beanutils-1.6.jar" usetimestamp="true" ignoreerrors="true" src="${commons-beanutils.jar}">
-    </get>
-  </target>
-  <target name="get-dep-commons-collections.jar" description="o Download the dependency : commons-collections.jar" unless="commons-collections.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-collections.jar">
-    <mkdir dir="${libdir}/commons-collections/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-collections/jars/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar">
-    </get>
-  </target>
-  <target name="get-custom-dep-commons-collections.jar" if="commons-collections.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/commons-collections/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-collections/jars/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="${commons-collections.jar}">
-    </get>
-  </target>
-  <target name="get-dep-commons-jexl.jar" description="o Download the dependency : commons-jexl.jar" unless="commons-jexl.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-jexl.jar">
-    <mkdir dir="${libdir}/commons-jexl/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-jexl/jars/commons-jexl-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-1.0.jar">
-    </get>
-  </target>
-  <target name="get-custom-dep-commons-jexl.jar" if="commons-jexl.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/commons-jexl/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-jexl/jars/commons-jexl-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${commons-jexl.jar}">
-    </get>
-  </target>
-  <target name="get-dep-commons-jelly.jar" description="o Download the dependency : commons-jelly.jar" unless="commons-jelly.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-jelly.jar">
-    <mkdir dir="${libdir}/commons-jelly/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-jelly/jars/commons-jelly-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-1.0.jar">
-    </get>
-  </target>
-  <target name="get-custom-dep-commons-jelly.jar" if="commons-jelly.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/commons-jelly/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-jelly/jars/commons-jelly-1.0.jar" usetimestamp="true" ignoreerrors="true" src="${commons-jelly.jar}">
-    </get>
-  </target>
-  <target name="get-dep-commons-logging.jar" description="o Download the dependency : commons-logging.jar" unless="commons-logging.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-logging.jar">
-    <mkdir dir="${libdir}/commons-logging/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-logging/jars/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>
-  </target>
-  <target name="get-custom-dep-commons-logging.jar" if="commons-logging.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/commons-logging/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="${commons-logging.jar}">
-    </get>
-  </target>
-  <target name="get-dep-dom4j.jar" description="o Download the dependency : dom4j.jar" unless="dom4j.jar" depends="init,setProxy,noProxy,get-custom-dep-dom4j.jar">
-    <mkdir dir="${libdir}/dom4j/jars/">
-    </mkdir>
-    <get dest="${libdir}/dom4j/jars/dom4j-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.5.jar">
-    </get>
-  </target>
-  <target name="get-custom-dep-dom4j.jar" if="dom4j.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/dom4j/jars/">
-    </mkdir>
-    <get dest="${libdir}/dom4j/jars/dom4j-1.5.jar" usetimestamp="true" ignoreerrors="true" src="${dom4j.jar}">
-    </get>
-  </target>
-  <target name="get-dep-jaxen.jar" description="o Download the dependency : jaxen.jar" unless="jaxen.jar" depends="init,setProxy,noProxy,get-custom-dep-jaxen.jar">
-    <mkdir dir="${libdir}/jaxen/jars/">
-    </mkdir>
-    <get dest="${libdir}/jaxen/jars/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>
-  </target>
-  <target name="get-custom-dep-jaxen.jar" if="jaxen.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/jaxen/jars/">
-    </mkdir>
-    <get dest="${libdir}/jaxen/jars/jaxen-1.1-beta-2.jar" usetimestamp="true" ignoreerrors="true" src="${jaxen.jar}">
-    </get>
-  </target>
-  <target name="get-dep-xerces.jar" description="o Download the dependency : xerces.jar" unless="xerces.jar" depends="init,setProxy,noProxy,get-custom-dep-xerces.jar">
-    <mkdir dir="${libdir}/xerces/jars/">
-    </mkdir>
-    <get dest="${libdir}/xerces/jars/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.2.1.jar">
-    </get>
-  </target>
-  <target name="get-custom-dep-xerces.jar" if="xerces.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/xerces/jars/">
-    </mkdir>
-    <get dest="${libdir}/xerces/jars/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="${xerces.jar}">
-    </get>
-  </target>
-  <target name="get-deps" unless="noget" depends="get-dep-bsh.jar,get-dep-commons-jelly-tags-junit.jar,get-dep-xml-apis.jar,get-dep-commons-beanutils.jar,get-dep-commons-collections.jar,get-dep-commons-jexl.jar,get-dep-commons-jelly.jar,get-dep-commons-logging.jar,get-dep-dom4j.jar,get-dep-jaxen.jar,get-dep-xerces.jar">
-  </target>
-  <target name="setProxy" if="useProxy" depends="init">
-    <!--Proxy settings works only with a JDK 1.2 and higher.-->
-    <echo>Proxy used :</echo>
-    <echo>Proxy host [${proxy.host}]</echo>
-    <echo>Proxy port [${proxy.port}]</echo>
-    <echo>Proxy user [${proxy.username}]</echo>
-    <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}">
-    </setproxy>
-  </target>
-  <target name="noProxy" unless="useProxy" depends="init">
-    <echo>Proxy not used.</echo>
-  </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/beanshell/maven.xml b/jelly-tags/beanshell/maven.xml
deleted file mode 100644
index 8a2b8cc..0000000
--- a/jelly-tags/beanshell/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/beanshell/project.xml b/jelly-tags/beanshell/pom.xml
similarity index 63%
rename from jelly-tags/beanshell/project.xml
rename to jelly-tags/beanshell/pom.xml
index 52e2fa7..edf97ce 100644
--- a/jelly-tags/beanshell/project.xml
+++ b/jelly-tags/beanshell/pom.xml
@@ -15,51 +15,39 @@
   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-beanshell</artifactId>
-  <name>commons-jelly-tags-beanshell</name>
-  <currentVersion>1.0.1-SNAPSHOT</currentVersion>
-  <package>org.apache.commons.jelly.tags.beanshell</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 BeanShell.
-  </description>
-  <shortDescription>Commons Jelly BeanShell Tag Library</shortDescription>
-  
-  <versions>
-    <version>
-      <id>1.0</id>
-      <name>1.0</name>
-      <tag>COMMONS_JELLY_BEANSHELL-1_0</tag>
-    </version>
-  </versions>
-    
+  <artifactId>commons-jelly-tags-beanshell</artifactId>
+  <packaging>jar</packaging>
+  <name>commons-jelly-tags-beanshell</name>
+  <description>This is a Jelly interface for BeanShell.</description>
+
   <dependencies>
-  
-    
-  
     <!-- START for compilation -->
     <dependency>
       <artifactId>bsh</artifactId>
       <groupId>bsh</groupId>
       <version>2.0b1</version>
     </dependency>
-    
-    <!-- START for testing -->
+
+    <!-- END for compilation -->
+
+    <!-- START for test -->
 
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-junit</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
-      <url>http://commons.apache.org/jelly/libs/junit/</url>
-      <properties>
-        <scope>test</scope>
-      </properties>
+      <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
 
-    <!-- END for testing -->
-
+    <!-- END for test -->
   </dependencies>
-  
 </project>
diff --git a/jelly-tags/beanshell/project.properties b/jelly-tags/beanshell/project.properties
deleted file mode 100644
index 2850c0e..0000000
--- a/jelly-tags/beanshell/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/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java b/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java
similarity index 100%
rename from jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java
rename to jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpression.java
diff --git a/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java b/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java
similarity index 100%
rename from jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java
rename to jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellExpressionFactory.java
diff --git a/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java b/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java
similarity index 100%
rename from jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java
rename to jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/BeanShellTagLibrary.java
diff --git a/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java b/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java
similarity index 100%
rename from jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java
rename to jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/JellyInterpreter.java
diff --git a/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java b/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java
similarity index 100%
rename from jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java
rename to jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/ScriptTag.java
diff --git a/jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/package.html b/jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/package.html
similarity index 100%
rename from jelly-tags/beanshell/src/java/org/apache/commons/jelly/tags/beanshell/package.html
rename to jelly-tags/beanshell/src/main/java/org/apache/commons/jelly/tags/beanshell/package.html
diff --git a/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java b/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java
similarity index 100%
rename from jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java
rename to jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestBeanShellEL.java
diff --git a/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/TestJelly.java b/jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestJelly.java
similarity index 100%
rename from jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/TestJelly.java
rename to jelly-tags/beanshell/src/test/java/org/apache/commons/jelly/tags/beanshell/TestJelly.java
diff --git a/jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/suite.jelly b/jelly-tags/beanshell/src/test/resources/org/apache/commons/jelly/tags/beanshell/suite.jelly
similarity index 100%
rename from jelly-tags/beanshell/src/test/org/apache/commons/jelly/tags/beanshell/suite.jelly
rename to jelly-tags/beanshell/src/test/resources/org/apache/commons/jelly/tags/beanshell/suite.jelly
diff --git a/jelly-tags/pom.xml b/jelly-tags/pom.xml
index 0d58399..24b3fcd 100644
--- a/jelly-tags/pom.xml
+++ b/jelly-tags/pom.xml
@@ -18,6 +18,7 @@
     <module>antlr</module>
     <module>avalon</module>
     <module>bean</module>
+    <module>beanshell</module>
     <module>junit</module>
     <module>log</module>
     <module>util</module>