established tiles-parent as the framework project
git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/trunk@1333561 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tiles-parent/FREEMARKER-LICENSE.txt b/FREEMARKER-LICENSE.txt
similarity index 100%
rename from tiles-parent/FREEMARKER-LICENSE.txt
rename to FREEMARKER-LICENSE.txt
diff --git a/tiles-parent/JAVASSIST-LICENSE.html b/JAVASSIST-LICENSE.html
similarity index 100%
rename from tiles-parent/JAVASSIST-LICENSE.html
rename to JAVASSIST-LICENSE.html
diff --git a/tiles-parent/LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from tiles-parent/LICENSE.txt
rename to LICENSE.txt
diff --git a/tiles-parent/NOTICE.txt b/NOTICE.txt
similarity index 100%
rename from tiles-parent/NOTICE.txt
rename to NOTICE.txt
diff --git a/tiles-parent/OGNL-LICENSE.txt b/OGNL-LICENSE.txt
similarity index 100%
rename from tiles-parent/OGNL-LICENSE.txt
rename to OGNL-LICENSE.txt
diff --git a/tiles-parent/SLF4J-LICENSE.txt b/SLF4J-LICENSE.txt
similarity index 100%
rename from tiles-parent/SLF4J-LICENSE.txt
rename to SLF4J-LICENSE.txt
diff --git a/tiles-parent/assembly/pom.xml b/assembly/pom.xml
similarity index 100%
rename from tiles-parent/assembly/pom.xml
rename to assembly/pom.xml
diff --git a/tiles-parent/assembly/src/main/assembly/bin.xml b/assembly/src/main/assembly/bin.xml
similarity index 100%
rename from tiles-parent/assembly/src/main/assembly/bin.xml
rename to assembly/src/main/assembly/bin.xml
diff --git a/tiles-parent/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
similarity index 100%
rename from tiles-parent/assembly/src/main/assembly/docs.xml
rename to assembly/src/main/assembly/docs.xml
diff --git a/tiles-parent/assembly/src/main/assembly/src.xml b/assembly/src/main/assembly/src.xml
similarity index 100%
rename from tiles-parent/assembly/src/main/assembly/src.xml
rename to assembly/src/main/assembly/src.xml
diff --git a/tiles-parent/assembly/src/main/resources/LICENSE.txt b/assembly/src/main/resources/LICENSE.txt
similarity index 100%
rename from tiles-parent/assembly/src/main/resources/LICENSE.txt
rename to assembly/src/main/resources/LICENSE.txt
diff --git a/tiles-parent/assembly/src/main/resources/NOTICE.txt b/assembly/src/main/resources/NOTICE.txt
similarity index 100%
rename from tiles-parent/assembly/src/main/resources/NOTICE.txt
rename to assembly/src/main/resources/NOTICE.txt
diff --git a/tiles-parent/assembly/src/site/site.xml b/assembly/src/site/site.xml
similarity index 100%
rename from tiles-parent/assembly/src/site/site.xml
rename to assembly/src/site/site.xml
diff --git a/pom.xml b/pom.xml
index 58a4f36..810cdd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,34 +24,216 @@
<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">
<parent>
- <groupId>org.apache.tiles</groupId>
<artifactId>tiles-master</artifactId>
+ <groupId>org.apache.tiles</groupId>
<version>4</version>
+ <relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tiles</groupId>
- <artifactId>tiles-reactor</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>tiles-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Tiles Reactor</name>
- <description>Tiles Reactor</description>
- <url>http://tiles.apache.org/reactor/</url>
-
+ <name>Tiles 3</name>
+ <description>Tiles 3: A framework for page composition.</description>
+ <url>http://tiles.apache.org/framework/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/tiles/framework/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tiles/framework/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/tiles/framework/trunk/</url>
+ <connection>scm:svn:http://svn.eu.apache.org/repos/asf/tiles/framework/trunk/tiles-parent/</connection>
+ <developerConnection>scm:svn:https://svn.eu.apache.org/repos/asf/tiles/framework/trunk/tiles-parent/</developerConnection>
+ <url>http://svn.eu.apache.org/viewvc/tiles/framework/trunk/tiles-parent/</url>
</scm>
<ciManagement />
<modules>
- <module>tiles-request</module>
- <module>tiles-autotag</module>
- <module>tiles-parent</module>
+ <module>tiles-api</module>
+ <module>tiles-core</module>
+ <module>tiles-template</module>
+ <module>tiles-servlet</module>
+ <module>tiles-jsp</module>
+ <module>tiles-freemarker</module>
+ <module>tiles-velocity</module>
+ <module>tiles-el</module>
+ <module>tiles-mvel</module>
+ <module>tiles-ognl</module>
+ <module>tiles-compat</module>
+ <module>tiles-extras</module>
+ <module>assembly</module>
+ <module>tiles-test-pom</module>
</modules>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/TILES</url>
+ </issueManagement>
+
+ <distributionManagement>
+ <site>
+ <id>apache-site</id>
+ <url>scp://people.apache.org/www/tiles.apache.org/framework</url>
+ </site>
+ </distributionManagement>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-servlet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-template</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools</artifactId>
+ <version>2.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>struts-taglib</artifactId>
+ <groupId>org.apache.struts</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>struts-tiles</artifactId>
+ <groupId>org.apache.struts</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>struts-core</artifactId>
+ <groupId>org.apache.struts</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>sslext</artifactId>
+ <groupId>sslext</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-chain</artifactId>
+ <groupId>commons-chain</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-validator</artifactId>
+ <groupId>commons-validator</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-digester</artifactId>
+ <groupId>commons-digester</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>dom4j</artifactId>
+ <groupId>dom4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.15</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <version>2.7.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel2</artifactId>
+ <version>2.0.11</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>1.0.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>3.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.8</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-request-api</artifactId>
+ <version>${tiles.request.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<pluginManagement>
<plugins>
@@ -70,7 +252,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>2.3.7</version>
<inherited>true</inherited>
</plugin>
</plugins>
@@ -109,78 +291,19 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <releaseProfiles>apache-release</releaseProfiles><!-- xxx tiles still uses "release" instead of "apache-release" -->
+ <goals>deploy site-deploy</goals>
+ </configuration>
+ </plugin>
</plugins>
<defaultGoal>install</defaultGoal>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>http://svn.apache.org/repos/asf/tiles/maven/trunk/build/tiles_checks.xml
- </configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- <excludePackageNames>org.apache.tiles.test</excludePackageNames>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
- <link>http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api</link>
- <link>http://commons.apache.org/chain/apidocs</link>
- <link>http://commons.apache.org/digester/commons-digester-1.6/docs/api</link>
- <link>http://commons.apache.org/logging/commons-logging-1.1/apidocs</link>
- </links>
- <doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>gr.spinellis</groupId>
- <artifactId>UmlGraph</artifactId>
- <version>4.6</version>
- </docletArtifact>
- <additionalparam>
- -inferrel -inferdep -quiet -hide java.*
- -collpackages java.util.* -qualify
- -postfixpackage -nodefontsize 9
- -nodefontpackagesize 7
- </additionalparam>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <includes>
- <include>pom.xml</include>
- <include>src/**</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
<properties>
<tiles.osgi.symbolicName>org.apache.${project.artifactId}</tiles.osgi.symbolicName>
<tiles.osgi.export>org.apache.tiles.*;version=${project.version}</tiles.osgi.export>
@@ -188,63 +311,28 @@
<tiles.osgi.dynamicImport />
<tiles.osgi.private />
<tiles.manifestfile>target/osgi/MANIFEST.MF</tiles.manifestfile>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <tiles.request.version>1.0-SNAPSHOT</tiles.request.version>
+ <tiles.autotag.version>1.0-SNAPSHOT</tiles.autotag.version>
</properties>
<dependencies />
<profiles>
<profile>
- <id>release</id>
- <activation>
- <property>
- <name>release</name>
- </property>
- </activation>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ </configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- This configuration will be useful when the RAT plugin
- will be able to fail when a license header is missing
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-3</version>
<executions>
<execution>
<phase>verify</phase>
@@ -253,44 +341,46 @@
</goals>
<configuration>
<addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
- <licenseMatchers>
+ <licenseMatchers>
<classNames>
- <className>rat.license.standard.ApacheSoftwareLicense20</className>
+ <className>rat.analysis.license.ApacheSoftwareLicense20</className>
</classNames>
</licenseMatchers>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*LICENSE.txt</exclude>
+ <exclude>**/*MANIFEST.MF</exclude>
+ </excludes>
</configuration>
</execution>
</executions>
</plugin>
- -->
</plugins>
</build>
</profile>
+ <profile>
+ <id>linkcheck</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-linkcheck-plugin</artifactId>
+ <version>1.1</version>
+ <configuration>
+ <excludedLinks>
+ <excludedLink>/*</excludedLink>
+ <excludedLink>**/index.html</excludedLink>
+ <excludedLink>**/logo.png</excludedLink>
+ <excludedLink>**/tiles-jsp/tagreference.html</excludedLink>
+ </excludedLinks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+
</profiles>
- <!-- Needs to be commented out for releases -->
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <url>https://repository.apache.org/content/groups/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <url>https://repository.apache.org/content/groups/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
</project>
diff --git a/tiles-parent/src/site/apt/config-reference.apt b/src/site/apt/config-reference.apt
similarity index 100%
rename from tiles-parent/src/site/apt/config-reference.apt
rename to src/site/apt/config-reference.apt
diff --git a/tiles-parent/src/site/apt/dev/release.apt b/src/site/apt/dev/release.apt
similarity index 100%
rename from tiles-parent/src/site/apt/dev/release.apt
rename to src/site/apt/dev/release.apt
diff --git a/tiles-parent/src/site/apt/getting_started.apt b/src/site/apt/getting_started.apt
similarity index 100%
rename from tiles-parent/src/site/apt/getting_started.apt
rename to src/site/apt/getting_started.apt
diff --git a/tiles-parent/src/site/apt/index.apt b/src/site/apt/index.apt
similarity index 100%
rename from tiles-parent/src/site/apt/index.apt
rename to src/site/apt/index.apt
diff --git a/tiles-parent/src/site/apt/migration/apis.apt b/src/site/apt/migration/apis.apt
similarity index 100%
rename from tiles-parent/src/site/apt/migration/apis.apt
rename to src/site/apt/migration/apis.apt
diff --git a/tiles-parent/src/site/apt/migration/configuration.apt b/src/site/apt/migration/configuration.apt
similarity index 100%
rename from tiles-parent/src/site/apt/migration/configuration.apt
rename to src/site/apt/migration/configuration.apt
diff --git a/tiles-parent/src/site/apt/migration/extension.apt b/src/site/apt/migration/extension.apt
similarity index 100%
rename from tiles-parent/src/site/apt/migration/extension.apt
rename to src/site/apt/migration/extension.apt
diff --git a/tiles-parent/src/site/apt/migration/index.apt b/src/site/apt/migration/index.apt
similarity index 100%
rename from tiles-parent/src/site/apt/migration/index.apt
rename to src/site/apt/migration/index.apt
diff --git a/tiles-parent/src/site/apt/migration/tags.apt b/src/site/apt/migration/tags.apt
similarity index 100%
rename from tiles-parent/src/site/apt/migration/tags.apt
rename to src/site/apt/migration/tags.apt
diff --git a/tiles-parent/src/site/apt/security/index.apt b/src/site/apt/security/index.apt
similarity index 100%
rename from tiles-parent/src/site/apt/security/index.apt
rename to src/site/apt/security/index.apt
diff --git a/tiles-parent/src/site/apt/security/security-bulletin-1.apt b/src/site/apt/security/security-bulletin-1.apt
similarity index 100%
rename from tiles-parent/src/site/apt/security/security-bulletin-1.apt
rename to src/site/apt/security/security-bulletin-1.apt
diff --git a/tiles-parent/src/site/apt/selenium.apt b/src/site/apt/selenium.apt
similarity index 100%
rename from tiles-parent/src/site/apt/selenium.apt
rename to src/site/apt/selenium.apt
diff --git a/tiles-parent/src/site/apt/tutorial/advanced/attribute-rendering.apt b/src/site/apt/tutorial/advanced/attribute-rendering.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/advanced/attribute-rendering.apt
rename to src/site/apt/tutorial/advanced/attribute-rendering.apt
diff --git a/tiles-parent/src/site/apt/tutorial/advanced/el-support.apt b/src/site/apt/tutorial/advanced/el-support.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/advanced/el-support.apt
rename to src/site/apt/tutorial/advanced/el-support.apt
diff --git a/tiles-parent/src/site/apt/tutorial/advanced/index.apt b/src/site/apt/tutorial/advanced/index.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/advanced/index.apt
rename to src/site/apt/tutorial/advanced/index.apt
diff --git a/tiles-parent/src/site/apt/tutorial/advanced/l10n.apt b/src/site/apt/tutorial/advanced/l10n.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/advanced/l10n.apt
rename to src/site/apt/tutorial/advanced/l10n.apt
diff --git a/tiles-parent/src/site/apt/tutorial/advanced/list-attributes.apt b/src/site/apt/tutorial/advanced/list-attributes.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/advanced/list-attributes.apt
rename to src/site/apt/tutorial/advanced/list-attributes.apt
diff --git a/tiles-parent/src/site/apt/tutorial/advanced/multiple-containers.apt b/src/site/apt/tutorial/advanced/multiple-containers.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/advanced/multiple-containers.apt
rename to src/site/apt/tutorial/advanced/multiple-containers.apt
diff --git a/tiles-parent/src/site/apt/tutorial/advanced/nesting-extending.apt b/src/site/apt/tutorial/advanced/nesting-extending.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/advanced/nesting-extending.apt
rename to src/site/apt/tutorial/advanced/nesting-extending.apt
diff --git a/tiles-parent/src/site/apt/tutorial/advanced/preparer.apt b/src/site/apt/tutorial/advanced/preparer.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/advanced/preparer.apt
rename to src/site/apt/tutorial/advanced/preparer.apt
diff --git a/tiles-parent/src/site/apt/tutorial/advanced/runtime.apt b/src/site/apt/tutorial/advanced/runtime.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/advanced/runtime.apt
rename to src/site/apt/tutorial/advanced/runtime.apt
diff --git a/tiles-parent/src/site/apt/tutorial/advanced/security.apt b/src/site/apt/tutorial/advanced/security.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/advanced/security.apt
rename to src/site/apt/tutorial/advanced/security.apt
diff --git a/tiles-parent/src/site/apt/tutorial/advanced/utils.apt b/src/site/apt/tutorial/advanced/utils.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/advanced/utils.apt
rename to src/site/apt/tutorial/advanced/utils.apt
diff --git a/tiles-parent/src/site/apt/tutorial/advanced/wildcard.apt b/src/site/apt/tutorial/advanced/wildcard.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/advanced/wildcard.apt
rename to src/site/apt/tutorial/advanced/wildcard.apt
diff --git a/tiles-parent/src/site/apt/tutorial/basic/concepts.apt b/src/site/apt/tutorial/basic/concepts.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/basic/concepts.apt
rename to src/site/apt/tutorial/basic/concepts.apt
diff --git a/tiles-parent/src/site/apt/tutorial/basic/index.apt b/src/site/apt/tutorial/basic/index.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/basic/index.apt
rename to src/site/apt/tutorial/basic/index.apt
diff --git a/tiles-parent/src/site/apt/tutorial/basic/pages.apt b/src/site/apt/tutorial/basic/pages.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/basic/pages.apt
rename to src/site/apt/tutorial/basic/pages.apt
diff --git a/tiles-parent/src/site/apt/tutorial/configuration.apt b/src/site/apt/tutorial/configuration.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/configuration.apt
rename to src/site/apt/tutorial/configuration.apt
diff --git a/tiles-parent/src/site/apt/tutorial/index.apt b/src/site/apt/tutorial/index.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/index.apt
rename to src/site/apt/tutorial/index.apt
diff --git a/tiles-parent/src/site/apt/tutorial/integration/frameworks.apt b/src/site/apt/tutorial/integration/frameworks.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/integration/frameworks.apt
rename to src/site/apt/tutorial/integration/frameworks.apt
diff --git a/tiles-parent/src/site/apt/tutorial/integration/freemarker.apt b/src/site/apt/tutorial/integration/freemarker.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/integration/freemarker.apt
rename to src/site/apt/tutorial/integration/freemarker.apt
diff --git a/tiles-parent/src/site/apt/tutorial/integration/index.apt b/src/site/apt/tutorial/integration/index.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/integration/index.apt
rename to src/site/apt/tutorial/integration/index.apt
diff --git a/tiles-parent/src/site/apt/tutorial/integration/velocity.apt b/src/site/apt/tutorial/integration/velocity.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/integration/velocity.apt
rename to src/site/apt/tutorial/integration/velocity.apt
diff --git a/tiles-parent/src/site/apt/tutorial/integration/view.apt b/src/site/apt/tutorial/integration/view.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/integration/view.apt
rename to src/site/apt/tutorial/integration/view.apt
diff --git a/tiles-parent/src/site/apt/tutorial/pattern.apt b/src/site/apt/tutorial/pattern.apt
similarity index 100%
rename from tiles-parent/src/site/apt/tutorial/pattern.apt
rename to src/site/apt/tutorial/pattern.apt
diff --git a/tiles-parent/src/site/apt/whats-new.apt b/src/site/apt/whats-new.apt
similarity index 100%
rename from tiles-parent/src/site/apt/whats-new.apt
rename to src/site/apt/whats-new.apt
diff --git a/tiles-parent/src/site/resources/images/page_to_page.png b/src/site/resources/images/page_to_page.png
similarity index 100%
rename from tiles-parent/src/site/resources/images/page_to_page.png
rename to src/site/resources/images/page_to_page.png
Binary files differ
diff --git a/tiles-parent/src/site/resources/images/tiled_page.png b/src/site/resources/images/tiled_page.png
similarity index 100%
rename from tiles-parent/src/site/resources/images/tiled_page.png
rename to src/site/resources/images/tiled_page.png
Binary files differ
diff --git a/tiles-parent/src/site/site.xml b/src/site/site.xml
similarity index 100%
rename from tiles-parent/src/site/site.xml
rename to src/site/site.xml
diff --git a/tiles-parent/src/site/xdoc/dev/building.xml b/src/site/xdoc/dev/building.xml
similarity index 100%
rename from tiles-parent/src/site/xdoc/dev/building.xml
rename to src/site/xdoc/dev/building.xml
diff --git a/tiles-parent/src/site/xdoc/dev/snapshots.xml b/src/site/xdoc/dev/snapshots.xml
similarity index 100%
rename from tiles-parent/src/site/xdoc/dev/snapshots.xml
rename to src/site/xdoc/dev/snapshots.xml
diff --git a/tiles-parent/src/site/xdoc/images/page_to_page.svg b/src/site/xdoc/images/page_to_page.svg
similarity index 100%
rename from tiles-parent/src/site/xdoc/images/page_to_page.svg
rename to src/site/xdoc/images/page_to_page.svg
diff --git a/tiles-parent/src/site/xdoc/images/tiled_page.svg b/src/site/xdoc/images/tiled_page.svg
similarity index 100%
rename from tiles-parent/src/site/xdoc/images/tiled_page.svg
rename to src/site/xdoc/images/tiled_page.svg
diff --git a/tiles-parent/tiles-api/pom.xml b/tiles-api/pom.xml
similarity index 100%
rename from tiles-parent/tiles-api/pom.xml
rename to tiles-api/pom.xml
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/Attribute.java b/tiles-api/src/main/java/org/apache/tiles/Attribute.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/Attribute.java
rename to tiles-api/src/main/java/org/apache/tiles/Attribute.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java b/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java
rename to tiles-api/src/main/java/org/apache/tiles/AttributeContext.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java b/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
rename to tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/CompareUtil.java b/tiles-api/src/main/java/org/apache/tiles/CompareUtil.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/CompareUtil.java
rename to tiles-api/src/main/java/org/apache/tiles/CompareUtil.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/Definition.java b/tiles-api/src/main/java/org/apache/tiles/Definition.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/Definition.java
rename to tiles-api/src/main/java/org/apache/tiles/Definition.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/Expression.java b/tiles-api/src/main/java/org/apache/tiles/Expression.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/Expression.java
rename to tiles-api/src/main/java/org/apache/tiles/Expression.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java b/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/ListAttribute.java
rename to tiles-api/src/main/java/org/apache/tiles/ListAttribute.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/NoSuchContainerException.java b/tiles-api/src/main/java/org/apache/tiles/NoSuchContainerException.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/NoSuchContainerException.java
rename to tiles-api/src/main/java/org/apache/tiles/NoSuchContainerException.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java b/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
rename to tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/TilesContainerWrapper.java b/tiles-api/src/main/java/org/apache/tiles/TilesContainerWrapper.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/TilesContainerWrapper.java
rename to tiles-api/src/main/java/org/apache/tiles/TilesContainerWrapper.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/TilesException.java b/tiles-api/src/main/java/org/apache/tiles/TilesException.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/TilesException.java
rename to tiles-api/src/main/java/org/apache/tiles/TilesException.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java b/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
rename to tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/access/package-info.java b/tiles-api/src/main/java/org/apache/tiles/access/package-info.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/access/package-info.java
rename to tiles-api/src/main/java/org/apache/tiles/access/package-info.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java b/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
rename to tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/mgmt/package-info.java b/tiles-api/src/main/java/org/apache/tiles/mgmt/package-info.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/mgmt/package-info.java
rename to tiles-api/src/main/java/org/apache/tiles/mgmt/package-info.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/package-info.java b/tiles-api/src/main/java/org/apache/tiles/package-info.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/package-info.java
rename to tiles-api/src/main/java/org/apache/tiles/package-info.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/PreparerException.java b/tiles-api/src/main/java/org/apache/tiles/preparer/PreparerException.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/PreparerException.java
rename to tiles-api/src/main/java/org/apache/tiles/preparer/PreparerException.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/ViewPreparer.java b/tiles-api/src/main/java/org/apache/tiles/preparer/ViewPreparer.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/ViewPreparer.java
rename to tiles-api/src/main/java/org/apache/tiles/preparer/ViewPreparer.java
diff --git a/tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/package-info.java b/tiles-api/src/main/java/org/apache/tiles/preparer/package-info.java
similarity index 100%
rename from tiles-parent/tiles-api/src/main/java/org/apache/tiles/preparer/package-info.java
rename to tiles-api/src/main/java/org/apache/tiles/preparer/package-info.java
diff --git a/tiles-parent/tiles-api/src/main/resources/LICENSE.txt b/tiles-api/src/main/resources/LICENSE.txt
similarity index 100%
rename from tiles-parent/tiles-api/src/main/resources/LICENSE.txt
rename to tiles-api/src/main/resources/LICENSE.txt
diff --git a/tiles-parent/tiles-api/src/main/resources/NOTICE.txt b/tiles-api/src/main/resources/NOTICE.txt
similarity index 100%
rename from tiles-parent/tiles-api/src/main/resources/NOTICE.txt
rename to tiles-api/src/main/resources/NOTICE.txt
diff --git a/tiles-parent/tiles-api/src/site/site.xml b/tiles-api/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-api/src/site/site.xml
rename to tiles-api/src/site/site.xml
diff --git a/tiles-parent/tiles-api/src/test/java/org/apache/tiles/AttributeTest.java b/tiles-api/src/test/java/org/apache/tiles/AttributeTest.java
similarity index 100%
rename from tiles-parent/tiles-api/src/test/java/org/apache/tiles/AttributeTest.java
rename to tiles-api/src/test/java/org/apache/tiles/AttributeTest.java
diff --git a/tiles-parent/tiles-api/src/test/java/org/apache/tiles/BasicAttributeContextTest.java b/tiles-api/src/test/java/org/apache/tiles/BasicAttributeContextTest.java
similarity index 100%
rename from tiles-parent/tiles-api/src/test/java/org/apache/tiles/BasicAttributeContextTest.java
rename to tiles-api/src/test/java/org/apache/tiles/BasicAttributeContextTest.java
diff --git a/tiles-parent/tiles-api/src/test/java/org/apache/tiles/CompareUtilTest.java b/tiles-api/src/test/java/org/apache/tiles/CompareUtilTest.java
similarity index 100%
rename from tiles-parent/tiles-api/src/test/java/org/apache/tiles/CompareUtilTest.java
rename to tiles-api/src/test/java/org/apache/tiles/CompareUtilTest.java
diff --git a/tiles-parent/tiles-api/src/test/java/org/apache/tiles/ExpressionTest.java b/tiles-api/src/test/java/org/apache/tiles/ExpressionTest.java
similarity index 100%
rename from tiles-parent/tiles-api/src/test/java/org/apache/tiles/ExpressionTest.java
rename to tiles-api/src/test/java/org/apache/tiles/ExpressionTest.java
diff --git a/tiles-parent/tiles-api/src/test/java/org/apache/tiles/ListAttributeTest.java b/tiles-api/src/test/java/org/apache/tiles/ListAttributeTest.java
similarity index 100%
rename from tiles-parent/tiles-api/src/test/java/org/apache/tiles/ListAttributeTest.java
rename to tiles-api/src/test/java/org/apache/tiles/ListAttributeTest.java
diff --git a/tiles-parent/tiles-api/src/test/java/org/apache/tiles/NoSuchContainerExceptionTest.java b/tiles-api/src/test/java/org/apache/tiles/NoSuchContainerExceptionTest.java
similarity index 100%
rename from tiles-parent/tiles-api/src/test/java/org/apache/tiles/NoSuchContainerExceptionTest.java
rename to tiles-api/src/test/java/org/apache/tiles/NoSuchContainerExceptionTest.java
diff --git a/tiles-parent/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java b/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
similarity index 100%
rename from tiles-parent/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
rename to tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
diff --git a/tiles-parent/tiles-api/src/test/java/org/apache/tiles/TilesContainerWrapperTest.java b/tiles-api/src/test/java/org/apache/tiles/TilesContainerWrapperTest.java
similarity index 100%
rename from tiles-parent/tiles-api/src/test/java/org/apache/tiles/TilesContainerWrapperTest.java
rename to tiles-api/src/test/java/org/apache/tiles/TilesContainerWrapperTest.java
diff --git a/tiles-parent/tiles-api/src/test/java/org/apache/tiles/TilesExceptionTest.java b/tiles-api/src/test/java/org/apache/tiles/TilesExceptionTest.java
similarity index 100%
rename from tiles-parent/tiles-api/src/test/java/org/apache/tiles/TilesExceptionTest.java
rename to tiles-api/src/test/java/org/apache/tiles/TilesExceptionTest.java
diff --git a/tiles-parent/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java b/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java
similarity index 100%
rename from tiles-parent/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java
rename to tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java
diff --git a/tiles-parent/tiles-api/src/test/java/org/apache/tiles/preparer/PreparerExceptionTest.java b/tiles-api/src/test/java/org/apache/tiles/preparer/PreparerExceptionTest.java
similarity index 100%
rename from tiles-parent/tiles-api/src/test/java/org/apache/tiles/preparer/PreparerExceptionTest.java
rename to tiles-api/src/test/java/org/apache/tiles/preparer/PreparerExceptionTest.java
diff --git a/tiles-parent/tiles-compat/pom.xml b/tiles-compat/pom.xml
similarity index 100%
rename from tiles-parent/tiles-compat/pom.xml
rename to tiles-compat/pom.xml
diff --git a/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/beans/MenuItem.java b/tiles-compat/src/main/java/org/apache/tiles/beans/MenuItem.java
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/java/org/apache/tiles/beans/MenuItem.java
rename to tiles-compat/src/main/java/org/apache/tiles/beans/MenuItem.java
diff --git a/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java b/tiles-compat/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java
rename to tiles-compat/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java
diff --git a/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/beans/package-info.java b/tiles-compat/src/main/java/org/apache/tiles/beans/package-info.java
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/java/org/apache/tiles/beans/package-info.java
rename to tiles-compat/src/main/java/org/apache/tiles/beans/package-info.java
diff --git a/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java b/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
rename to tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
diff --git a/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/package-info.java b/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/package-info.java
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/package-info.java
rename to tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/package-info.java
diff --git a/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java b/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
rename to tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
diff --git a/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java b/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java
rename to tiles-compat/src/main/java/org/apache/tiles/compat/preparer/UrlPreparer.java
diff --git a/tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/package-info.java b/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/package-info.java
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/package-info.java
rename to tiles-compat/src/main/java/org/apache/tiles/compat/preparer/package-info.java
diff --git a/tiles-parent/tiles-compat/src/main/resources/LICENSE.txt b/tiles-compat/src/main/resources/LICENSE.txt
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/resources/LICENSE.txt
rename to tiles-compat/src/main/resources/LICENSE.txt
diff --git a/tiles-parent/tiles-compat/src/main/resources/NOTICE.txt b/tiles-compat/src/main/resources/NOTICE.txt
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/resources/NOTICE.txt
rename to tiles-compat/src/main/resources/NOTICE.txt
diff --git a/tiles-parent/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd b/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd
rename to tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_1.dtd
diff --git a/tiles-parent/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd b/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd
rename to tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_3.dtd
diff --git a/tiles-parent/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd b/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd
rename to tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_1_4.dtd
diff --git a/tiles-parent/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_2_0.dtd b/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_2_0.dtd
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_2_0.dtd
rename to tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_2_0.dtd
diff --git a/tiles-parent/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_2_1.dtd b/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_2_1.dtd
similarity index 100%
rename from tiles-parent/tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_2_1.dtd
rename to tiles-compat/src/main/resources/org/apache/tiles/compat/resources/tiles-config_2_1.dtd
diff --git a/tiles-parent/tiles-compat/src/site/site.xml b/tiles-compat/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-compat/src/site/site.xml
rename to tiles-compat/src/site/site.xml
diff --git a/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/beans/SimpleMenuItemTest.java b/tiles-compat/src/test/java/org/apache/tiles/beans/SimpleMenuItemTest.java
similarity index 100%
rename from tiles-parent/tiles-compat/src/test/java/org/apache/tiles/beans/SimpleMenuItemTest.java
rename to tiles-compat/src/test/java/org/apache/tiles/beans/SimpleMenuItemTest.java
diff --git a/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java b/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java
similarity index 100%
rename from tiles-parent/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java
rename to tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java
diff --git a/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactoryTest.java b/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactoryTest.java
rename to tiles-compat/src/test/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactoryTest.java
diff --git a/tiles-parent/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java b/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
similarity index 100%
rename from tiles-parent/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
rename to tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
diff --git a/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-1.1.xml b/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-1.1.xml
similarity index 100%
rename from tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-1.1.xml
rename to tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-1.1.xml
diff --git a/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.0.xml b/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.0.xml
similarity index 100%
rename from tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.0.xml
rename to tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.0.xml
diff --git a/tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml b/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml
similarity index 100%
rename from tiles-parent/tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml
rename to tiles-compat/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml
diff --git a/tiles-parent/tiles-core/pom.xml b/tiles-core/pom.xml
similarity index 100%
rename from tiles-parent/tiles-core/pom.xml
rename to tiles-core/pom.xml
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/awareness/TilesContainerAware.java b/tiles-core/src/main/java/org/apache/tiles/awareness/TilesContainerAware.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/awareness/TilesContainerAware.java
rename to tiles-core/src/main/java/org/apache/tiles/awareness/TilesContainerAware.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/awareness/package-info.java b/tiles-core/src/main/java/org/apache/tiles/awareness/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/awareness/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/awareness/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextHolder.java b/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextHolder.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextHolder.java
rename to tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextHolder.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/context/package-info.java b/tiles-core/src/main/java/org/apache/tiles/context/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/context/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/context/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java b/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactoryException.java b/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactoryException.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactoryException.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactoryException.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java b/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/FactoryNotFoundException.java b/tiles-core/src/main/java/org/apache/tiles/definition/FactoryNotFoundException.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/FactoryNotFoundException.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/FactoryNotFoundException.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java b/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/NoSuchDefinitionException.java b/tiles-core/src/main/java/org/apache/tiles/definition/NoSuchDefinitionException.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/NoSuchDefinitionException.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/NoSuchDefinitionException.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/RefreshMonitor.java b/tiles-core/src/main/java/org/apache/tiles/definition/RefreshMonitor.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/RefreshMonitor.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/RefreshMonitor.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java b/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactory.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java b/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java b/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/DefinitionDAO.java b/tiles-core/src/main/java/org/apache/tiles/definition/dao/DefinitionDAO.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/DefinitionDAO.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/dao/DefinitionDAO.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAO.java b/tiles-core/src/main/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAO.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAO.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAO.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java b/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/package-info.java b/tiles-core/src/main/java/org/apache/tiles/definition/dao/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/dao/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java b/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderException.java b/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderException.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderException.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderException.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/digester/package-info.java b/tiles-core/src/main/java/org/apache/tiles/definition/digester/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/digester/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/digester/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/package-info.java b/tiles-core/src/main/java/org/apache/tiles/definition/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolver.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolver.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolver.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolver.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/DefinitionPatternMatcher.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/DefinitionPatternMatcher.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/DefinitionPatternMatcher.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/DefinitionPatternMatcher.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/DefinitionPatternMatcherFactory.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/DefinitionPatternMatcherFactory.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/DefinitionPatternMatcherFactory.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/DefinitionPatternMatcherFactory.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternDefinitionResolver.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternDefinitionResolver.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternDefinitionResolver.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternDefinitionResolver.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternDefinitionResolverAware.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternDefinitionResolverAware.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternDefinitionResolverAware.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternDefinitionResolverAware.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternRecognizer.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternRecognizer.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternRecognizer.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternRecognizer.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/PatternUtil.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PrefixedPatternDefinitionResolver.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PrefixedPatternDefinitionResolver.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/PrefixedPatternDefinitionResolver.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/PrefixedPatternDefinitionResolver.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/package-info.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcher.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcher.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcher.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcher.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcherFactory.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcherFactory.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcherFactory.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcherFactory.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/package-info.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcher.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcher.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcher.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcher.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcherFactory.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcherFactory.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcherFactory.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcherFactory.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/package-info.java b/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/doc-files/image001.gif b/tiles-core/src/main/java/org/apache/tiles/doc-files/image001.gif
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/doc-files/image001.gif
rename to tiles-core/src/main/java/org/apache/tiles/doc-files/image001.gif
Binary files differ
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/AbstractAttributeEvaluator.java b/tiles-core/src/main/java/org/apache/tiles/evaluator/AbstractAttributeEvaluator.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/AbstractAttributeEvaluator.java
rename to tiles-core/src/main/java/org/apache/tiles/evaluator/AbstractAttributeEvaluator.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java b/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java
rename to tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluator.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluatorFactory.java b/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluatorFactory.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluatorFactory.java
rename to tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluatorFactory.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluatorFactoryAware.java b/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluatorFactoryAware.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluatorFactoryAware.java
rename to tiles-core/src/main/java/org/apache/tiles/evaluator/AttributeEvaluatorFactoryAware.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/BasicAttributeEvaluatorFactory.java b/tiles-core/src/main/java/org/apache/tiles/evaluator/BasicAttributeEvaluatorFactory.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/BasicAttributeEvaluatorFactory.java
rename to tiles-core/src/main/java/org/apache/tiles/evaluator/BasicAttributeEvaluatorFactory.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/EvaluationException.java b/tiles-core/src/main/java/org/apache/tiles/evaluator/EvaluationException.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/EvaluationException.java
rename to tiles-core/src/main/java/org/apache/tiles/evaluator/EvaluationException.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java b/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java
rename to tiles-core/src/main/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluator.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/package-info.java b/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/evaluator/impl/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/package-info.java b/tiles-core/src/main/java/org/apache/tiles/evaluator/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/evaluator/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/evaluator/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java b/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java
rename to tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java b/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
rename to tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactoryException.java b/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactoryException.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactoryException.java
rename to tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactoryException.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/package-info.java b/tiles-core/src/main/java/org/apache/tiles/factory/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/factory/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/factory/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java b/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
rename to tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/InvalidTemplateException.java b/tiles-core/src/main/java/org/apache/tiles/impl/InvalidTemplateException.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/InvalidTemplateException.java
rename to tiles-core/src/main/java/org/apache/tiles/impl/InvalidTemplateException.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java b/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
rename to tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/package-info.java b/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/impl/mgmt/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/package-info.java b/tiles-core/src/main/java/org/apache/tiles/impl/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/impl/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/impl/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java b/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java
rename to tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java b/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
rename to tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/locale/impl/package-info.java b/tiles-core/src/main/java/org/apache/tiles/locale/impl/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/locale/impl/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/locale/impl/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/locale/package-info.java b/tiles-core/src/main/java/org/apache/tiles/locale/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/locale/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/locale/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java b/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java
rename to tiles-core/src/main/java/org/apache/tiles/preparer/factory/BasicPreparerFactory.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/NoSuchPreparerException.java b/tiles-core/src/main/java/org/apache/tiles/preparer/factory/NoSuchPreparerException.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/NoSuchPreparerException.java
rename to tiles-core/src/main/java/org/apache/tiles/preparer/factory/NoSuchPreparerException.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/PreparerFactory.java b/tiles-core/src/main/java/org/apache/tiles/preparer/factory/PreparerFactory.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/PreparerFactory.java
rename to tiles-core/src/main/java/org/apache/tiles/preparer/factory/PreparerFactory.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/package-info.java b/tiles-core/src/main/java/org/apache/tiles/preparer/factory/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/preparer/factory/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/preparer/factory/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java b/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java
rename to tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/renderer/package-info.java b/tiles-core/src/main/java/org/apache/tiles/renderer/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/renderer/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/renderer/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java b/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
rename to tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/DefaultTilesInitializer.java b/tiles-core/src/main/java/org/apache/tiles/startup/DefaultTilesInitializer.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/DefaultTilesInitializer.java
rename to tiles-core/src/main/java/org/apache/tiles/startup/DefaultTilesInitializer.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java b/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java
rename to tiles-core/src/main/java/org/apache/tiles/startup/TilesInitializer.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/package-info.java b/tiles-core/src/main/java/org/apache/tiles/startup/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/startup/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/startup/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/util/CombinedBeanInfo.java b/tiles-core/src/main/java/org/apache/tiles/util/CombinedBeanInfo.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/util/CombinedBeanInfo.java
rename to tiles-core/src/main/java/org/apache/tiles/util/CombinedBeanInfo.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java b/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java
rename to tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java
diff --git a/tiles-parent/tiles-core/src/main/java/org/apache/tiles/util/package-info.java b/tiles-core/src/main/java/org/apache/tiles/util/package-info.java
similarity index 100%
rename from tiles-parent/tiles-core/src/main/java/org/apache/tiles/util/package-info.java
rename to tiles-core/src/main/java/org/apache/tiles/util/package-info.java
diff --git a/tiles-parent/tiles-core/src/main/resources/LICENSE.txt b/tiles-core/src/main/resources/LICENSE.txt
similarity index 100%
rename from tiles-parent/tiles-core/src/main/resources/LICENSE.txt
rename to tiles-core/src/main/resources/LICENSE.txt
diff --git a/tiles-parent/tiles-core/src/main/resources/NOTICE.txt b/tiles-core/src/main/resources/NOTICE.txt
similarity index 100%
rename from tiles-parent/tiles-core/src/main/resources/NOTICE.txt
rename to tiles-core/src/main/resources/NOTICE.txt
diff --git a/tiles-parent/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_3_0.dtd b/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_3_0.dtd
similarity index 100%
rename from tiles-parent/tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_3_0.dtd
rename to tiles-core/src/main/resources/org/apache/tiles/resources/tiles-config_3_0.dtd
diff --git a/tiles-parent/tiles-core/src/site/site.xml b/tiles-core/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/site/site.xml
rename to tiles-core/src/site/site.xml
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/context/TilesRequestContextHolderTest.java b/tiles-core/src/test/java/org/apache/tiles/context/TilesRequestContextHolderTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/context/TilesRequestContextHolderTest.java
rename to tiles-core/src/test/java/org/apache/tiles/context/TilesRequestContextHolderTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/DefinitionsFactoryExceptionTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/DefinitionsFactoryExceptionTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/DefinitionsFactoryExceptionTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/DefinitionsFactoryExceptionTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/FactoryNotFoundExceptitonTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/FactoryNotFoundExceptitonTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/FactoryNotFoundExceptitonTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/FactoryNotFoundExceptitonTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java b/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/NoSuchDefinitionExceptionTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/NoSuchDefinitionExceptionTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/NoSuchDefinitionExceptionTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/NoSuchDefinitionExceptionTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/UnresolvingLocaleDefinitionsFactoryTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderExceptionTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderExceptionTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderExceptionTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderExceptionTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java b/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolverTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolverTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolverTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/pattern/AbstractPatternDefinitionResolverTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolverTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolverTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolverTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolverTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/pattern/PatternUtilTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PrefixedPatternDefinitionResolverTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PrefixedPatternDefinitionResolverTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/PrefixedPatternDefinitionResolverTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/pattern/PrefixedPatternDefinitionResolverTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcherFactoryTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcherFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcherFactoryTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcherFactoryTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcherTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcherTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcherTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/pattern/regexp/RegexpDefinitionPatternMatcherTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcherFactoryTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcherFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcherFactoryTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcherFactoryTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcherTest.java b/tiles-core/src/test/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcherTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcherTest.java
rename to tiles-core/src/test/java/org/apache/tiles/definition/pattern/wildcard/WildcardDefinitionPatternMatcherTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/evaluator/BasicAttributeEvaluatorFactoryTest.java b/tiles-core/src/test/java/org/apache/tiles/evaluator/BasicAttributeEvaluatorFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/evaluator/BasicAttributeEvaluatorFactoryTest.java
rename to tiles-core/src/test/java/org/apache/tiles/evaluator/BasicAttributeEvaluatorFactoryTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/evaluator/EvaluatorExceptionTest.java b/tiles-core/src/test/java/org/apache/tiles/evaluator/EvaluatorExceptionTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/evaluator/EvaluatorExceptionTest.java
rename to tiles-core/src/test/java/org/apache/tiles/evaluator/EvaluatorExceptionTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java b/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
rename to tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java b/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
rename to tiles-core/src/test/java/org/apache/tiles/factory/BasicTilesContainerFactoryTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryExceptionTest.java b/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryExceptionTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryExceptionTest.java
rename to tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryExceptionTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java b/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java
rename to tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java b/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java
rename to tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/CannotRenderExceptionTest.java b/tiles-core/src/test/java/org/apache/tiles/impl/CannotRenderExceptionTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/CannotRenderExceptionTest.java
rename to tiles-core/src/test/java/org/apache/tiles/impl/CannotRenderExceptionTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/InvalidTemplateExceptionTest.java b/tiles-core/src/test/java/org/apache/tiles/impl/InvalidTemplateExceptionTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/InvalidTemplateExceptionTest.java
rename to tiles-core/src/test/java/org/apache/tiles/impl/InvalidTemplateExceptionTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/mgmt/CachingTilesContainerTest.java b/tiles-core/src/test/java/org/apache/tiles/impl/mgmt/CachingTilesContainerTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/impl/mgmt/CachingTilesContainerTest.java
rename to tiles-core/src/test/java/org/apache/tiles/impl/mgmt/CachingTilesContainerTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/locale/impl/DefaultLocaleResolverTest.java b/tiles-core/src/test/java/org/apache/tiles/locale/impl/DefaultLocaleResolverTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/locale/impl/DefaultLocaleResolverTest.java
rename to tiles-core/src/test/java/org/apache/tiles/locale/impl/DefaultLocaleResolverTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/factory/BasicPreparerFactoryTest.java b/tiles-core/src/test/java/org/apache/tiles/preparer/factory/BasicPreparerFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/factory/BasicPreparerFactoryTest.java
rename to tiles-core/src/test/java/org/apache/tiles/preparer/factory/BasicPreparerFactoryTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/factory/NoSuchPreparerExceptionTest.java b/tiles-core/src/test/java/org/apache/tiles/preparer/factory/NoSuchPreparerExceptionTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/preparer/factory/NoSuchPreparerExceptionTest.java
rename to tiles-core/src/test/java/org/apache/tiles/preparer/factory/NoSuchPreparerExceptionTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/renderer/DefinitionRendererTest.java b/tiles-core/src/test/java/org/apache/tiles/renderer/DefinitionRendererTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/renderer/DefinitionRendererTest.java
rename to tiles-core/src/test/java/org/apache/tiles/renderer/DefinitionRendererTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java b/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java
rename to tiles-core/src/test/java/org/apache/tiles/startup/AbstractTilesInitializerTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/DefaultTilesInitializerTest.java b/tiles-core/src/test/java/org/apache/tiles/startup/DefaultTilesInitializerTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/startup/DefaultTilesInitializerTest.java
rename to tiles-core/src/test/java/org/apache/tiles/startup/DefaultTilesInitializerTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java b/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java
rename to tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java
diff --git a/tiles-parent/tiles-core/src/test/java/org/apache/tiles/util/RollingVectorEnumeration.java b/tiles-core/src/test/java/org/apache/tiles/util/RollingVectorEnumeration.java
similarity index 100%
rename from tiles-parent/tiles-core/src/test/java/org/apache/tiles/util/RollingVectorEnumeration.java
rename to tiles-core/src/test/java/org/apache/tiles/util/RollingVectorEnumeration.java
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-tiles-513.xml b/tiles-core/src/test/resources/org/apache/tiles/config/defs-tiles-513.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-tiles-513.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/defs-tiles-513.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-wildcard.xml b/tiles-core/src/test/resources/org/apache/tiles/config/defs-wildcard.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs-wildcard.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/defs-wildcard.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1.xml b/tiles-core/src/test/resources/org/apache/tiles/config/defs1.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/defs1.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_en_US.xml b/tiles-core/src/test/resources/org/apache/tiles/config/defs1_en_US.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_en_US.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/defs1_en_US.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr.xml b/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr_CA.xml b/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr_CA.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr_CA.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/defs1_fr_CA.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs2.xml b/tiles-core/src/test/resources/org/apache/tiles/config/defs2.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs2.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/defs2.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs3.xml b/tiles-core/src/test/resources/org/apache/tiles/config/defs3.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs3.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/defs3.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs_regression_TILES-352.xml b/tiles-core/src/test/resources/org/apache/tiles/config/defs_regression_TILES-352.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/defs_regression_TILES-352.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/defs_regression_TILES-352.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/invalid-defs.xml b/tiles-core/src/test/resources/org/apache/tiles/config/invalid-defs.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/invalid-defs.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/invalid-defs.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/malformed-defs.xml b/tiles-core/src/test/resources/org/apache/tiles/config/malformed-defs.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/malformed-defs.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/malformed-defs.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/temp-defs.xml b/tiles-core/src/test/resources/org/apache/tiles/config/temp-defs.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/temp-defs.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/temp-defs.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml b/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1_it.xml b/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1_it.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1_it.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs-2.1_it.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs.xml b/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs.xml
rename to tiles-core/src/test/resources/org/apache/tiles/config/tiles-defs.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-one.xml b/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-one.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-one.xml
rename to tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-one.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-two.xml b/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-two.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-two.xml
rename to tiles-core/src/test/resources/org/apache/tiles/factory/test-defs-key-two.xml
diff --git a/tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs.xml b/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs.xml
similarity index 100%
rename from tiles-parent/tiles-core/src/test/resources/org/apache/tiles/factory/test-defs.xml
rename to tiles-core/src/test/resources/org/apache/tiles/factory/test-defs.xml
diff --git a/tiles-parent/tiles-el/pom.xml b/tiles-el/pom.xml
similarity index 100%
rename from tiles-parent/tiles-el/pom.xml
rename to tiles-el/pom.xml
diff --git a/tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java b/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
similarity index 100%
rename from tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
rename to tiles-el/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java
diff --git a/tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java b/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java
similarity index 100%
rename from tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java
rename to tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java
diff --git a/tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java b/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java
similarity index 100%
rename from tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java
rename to tiles-el/src/main/java/org/apache/tiles/el/ExpressionFactoryFactory.java
diff --git a/tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java b/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
similarity index 100%
rename from tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
rename to tiles-el/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java
diff --git a/tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/ScopeELResolver.java b/tiles-el/src/main/java/org/apache/tiles/el/ScopeELResolver.java
similarity index 100%
rename from tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/ScopeELResolver.java
rename to tiles-el/src/main/java/org/apache/tiles/el/ScopeELResolver.java
diff --git a/tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java b/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
similarity index 100%
rename from tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
rename to tiles-el/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java
diff --git a/tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java b/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
similarity index 100%
rename from tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
rename to tiles-el/src/main/java/org/apache/tiles/el/TilesContextELResolver.java
diff --git a/tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/package-info.java b/tiles-el/src/main/java/org/apache/tiles/el/package-info.java
similarity index 100%
rename from tiles-parent/tiles-el/src/main/java/org/apache/tiles/el/package-info.java
rename to tiles-el/src/main/java/org/apache/tiles/el/package-info.java
diff --git a/tiles-parent/tiles-el/src/site/site.xml b/tiles-el/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-el/src/site/site.xml
rename to tiles-el/src/site/site.xml
diff --git a/tiles-parent/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java b/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
similarity index 100%
rename from tiles-parent/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
rename to tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
diff --git a/tiles-parent/tiles-el/src/test/java/org/apache/tiles/el/ELContextImplTest.java b/tiles-el/src/test/java/org/apache/tiles/el/ELContextImplTest.java
similarity index 100%
rename from tiles-parent/tiles-el/src/test/java/org/apache/tiles/el/ELContextImplTest.java
rename to tiles-el/src/test/java/org/apache/tiles/el/ELContextImplTest.java
diff --git a/tiles-parent/tiles-el/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java b/tiles-el/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-el/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java
rename to tiles-el/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java
diff --git a/tiles-parent/tiles-el/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java b/tiles-el/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java
similarity index 100%
rename from tiles-parent/tiles-el/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java
rename to tiles-el/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java
diff --git a/tiles-parent/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java b/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
similarity index 100%
rename from tiles-parent/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
rename to tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
diff --git a/tiles-parent/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java b/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
similarity index 100%
rename from tiles-parent/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
rename to tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
diff --git a/tiles-parent/tiles-extras/pom.xml b/tiles-extras/pom.xml
similarity index 100%
rename from tiles-parent/tiles-extras/pom.xml
rename to tiles-extras/pom.xml
diff --git a/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java b/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
rename to tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactory.java
diff --git a/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java b/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java
rename to tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializer.java
diff --git a/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesListener.java b/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesListener.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesListener.java
rename to tiles-extras/src/main/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesListener.java
diff --git a/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/package-info.java b/tiles-extras/src/main/java/org/apache/tiles/extras/complete/package-info.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/complete/package-info.java
rename to tiles-extras/src/main/java/org/apache/tiles/extras/complete/package-info.java
diff --git a/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java b/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java
rename to tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesInitializer.java
diff --git a/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesListener.java b/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesListener.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesListener.java
rename to tiles-extras/src/main/java/org/apache/tiles/extras/module/ModularTilesListener.java
diff --git a/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/module/package-info.java b/tiles-extras/src/main/java/org/apache/tiles/extras/module/package-info.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/module/package-info.java
rename to tiles-extras/src/main/java/org/apache/tiles/extras/module/package-info.java
diff --git a/tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java b/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
rename to tiles-extras/src/main/java/org/apache/tiles/extras/renderer/OptionsRenderer.java
diff --git a/tiles-parent/tiles-extras/src/main/resources/LICENSE.txt b/tiles-extras/src/main/resources/LICENSE.txt
similarity index 100%
rename from tiles-parent/tiles-extras/src/main/resources/LICENSE.txt
rename to tiles-extras/src/main/resources/LICENSE.txt
diff --git a/tiles-parent/tiles-extras/src/main/resources/NOTICE.txt b/tiles-extras/src/main/resources/NOTICE.txt
similarity index 100%
rename from tiles-parent/tiles-extras/src/main/resources/NOTICE.txt
rename to tiles-extras/src/main/resources/NOTICE.txt
diff --git a/tiles-parent/tiles-extras/src/site/site.xml b/tiles-extras/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-extras/src/site/site.xml
rename to tiles-extras/src/site/site.xml
diff --git a/tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java b/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
rename to tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesContainerFactoryTest.java
diff --git a/tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java b/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java
rename to tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesInitializerTest.java
diff --git a/tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesListenerTest.java b/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesListenerTest.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesListenerTest.java
rename to tiles-extras/src/test/java/org/apache/tiles/extras/complete/CompleteAutoloadTilesListenerTest.java
diff --git a/tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesInitializerTest.java b/tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesInitializerTest.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesInitializerTest.java
rename to tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesInitializerTest.java
diff --git a/tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesListenerTest.java b/tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesListenerTest.java
similarity index 100%
rename from tiles-parent/tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesListenerTest.java
rename to tiles-extras/src/test/java/org/apache/tiles/extras/module/ModularTilesListenerTest.java
diff --git a/tiles-parent/tiles-extras/src/test/resources/FAKE-MANIFEST.MF b/tiles-extras/src/test/resources/FAKE-MANIFEST.MF
similarity index 100%
rename from tiles-parent/tiles-extras/src/test/resources/FAKE-MANIFEST.MF
rename to tiles-extras/src/test/resources/FAKE-MANIFEST.MF
diff --git a/tiles-parent/tiles-extras/src/test/resources/META-INF/MANIFEST.MF b/tiles-extras/src/test/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from tiles-parent/tiles-extras/src/test/resources/META-INF/MANIFEST.MF
rename to tiles-extras/src/test/resources/META-INF/MANIFEST.MF
diff --git a/tiles-parent/tiles-extras/src/test/resources/VM_global_library.vm b/tiles-extras/src/test/resources/VM_global_library.vm
similarity index 100%
rename from tiles-parent/tiles-extras/src/test/resources/VM_global_library.vm
rename to tiles-extras/src/test/resources/VM_global_library.vm
diff --git a/tiles-parent/tiles-extras/src/test/resources/tools.xml b/tiles-extras/src/test/resources/tools.xml
similarity index 100%
rename from tiles-parent/tiles-extras/src/test/resources/tools.xml
rename to tiles-extras/src/test/resources/tools.xml
diff --git a/tiles-parent/tiles-extras/src/test/resources/velocity.properties b/tiles-extras/src/test/resources/velocity.properties
similarity index 100%
rename from tiles-parent/tiles-extras/src/test/resources/velocity.properties
rename to tiles-extras/src/test/resources/velocity.properties
diff --git a/tiles-parent/tiles-freemarker/pom.xml b/tiles-freemarker/pom.xml
similarity index 100%
rename from tiles-parent/tiles-freemarker/pom.xml
rename to tiles-freemarker/pom.xml
diff --git a/tiles-parent/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/TilesSharedVariableFactory.java b/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/TilesSharedVariableFactory.java
similarity index 100%
rename from tiles-parent/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/TilesSharedVariableFactory.java
rename to tiles-freemarker/src/main/java/org/apache/tiles/freemarker/TilesSharedVariableFactory.java
diff --git a/tiles-parent/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/package-info.java b/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/package-info.java
similarity index 100%
rename from tiles-parent/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/package-info.java
rename to tiles-freemarker/src/main/java/org/apache/tiles/freemarker/package-info.java
diff --git a/tiles-parent/tiles-freemarker/src/site/site.xml b/tiles-freemarker/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-freemarker/src/site/site.xml
rename to tiles-freemarker/src/site/site.xml
diff --git a/tiles-parent/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/TilesSharedVariableFactoryTest.java b/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/TilesSharedVariableFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-freemarker/src/test/java/org/apache/tiles/freemarker/TilesSharedVariableFactoryTest.java
rename to tiles-freemarker/src/test/java/org/apache/tiles/freemarker/TilesSharedVariableFactoryTest.java
diff --git a/tiles-parent/tiles-jsp/pom.xml b/tiles-jsp/pom.xml
similarity index 100%
rename from tiles-parent/tiles-jsp/pom.xml
rename to tiles-jsp/pom.xml
diff --git a/tiles-parent/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java b/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
similarity index 100%
rename from tiles-parent/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
rename to tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
diff --git a/tiles-parent/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/package-info.java b/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/package-info.java
similarity index 100%
rename from tiles-parent/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/package-info.java
rename to tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/package-info.java
diff --git a/tiles-parent/tiles-jsp/src/main/resources/LICENSE.txt b/tiles-jsp/src/main/resources/LICENSE.txt
similarity index 100%
rename from tiles-parent/tiles-jsp/src/main/resources/LICENSE.txt
rename to tiles-jsp/src/main/resources/LICENSE.txt
diff --git a/tiles-parent/tiles-jsp/src/main/resources/META-INF/tld/tiles-extras-jsp.tld b/tiles-jsp/src/main/resources/META-INF/tld/tiles-extras-jsp.tld
similarity index 100%
rename from tiles-parent/tiles-jsp/src/main/resources/META-INF/tld/tiles-extras-jsp.tld
rename to tiles-jsp/src/main/resources/META-INF/tld/tiles-extras-jsp.tld
diff --git a/tiles-parent/tiles-jsp/src/main/resources/NOTICE.txt b/tiles-jsp/src/main/resources/NOTICE.txt
similarity index 100%
rename from tiles-parent/tiles-jsp/src/main/resources/NOTICE.txt
rename to tiles-jsp/src/main/resources/NOTICE.txt
diff --git a/tiles-parent/tiles-jsp/src/site/site.xml b/tiles-jsp/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-jsp/src/site/site.xml
rename to tiles-jsp/src/site/site.xml
diff --git a/tiles-parent/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/UseAttributeTagTest.java b/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/UseAttributeTagTest.java
similarity index 100%
rename from tiles-parent/tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/UseAttributeTagTest.java
rename to tiles-jsp/src/test/java/org/apache/tiles/jsp/taglib/UseAttributeTagTest.java
diff --git a/tiles-parent/tiles-mvel/pom.xml b/tiles-mvel/pom.xml
similarity index 100%
rename from tiles-parent/tiles-mvel/pom.xml
rename to tiles-mvel/pom.xml
diff --git a/tiles-parent/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java b/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java
similarity index 100%
rename from tiles-parent/tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java
rename to tiles-mvel/src/main/java/org/apache/tiles/mvel/MVELAttributeEvaluator.java
diff --git a/tiles-parent/tiles-mvel/src/main/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactory.java b/tiles-mvel/src/main/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactory.java
similarity index 100%
rename from tiles-parent/tiles-mvel/src/main/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactory.java
rename to tiles-mvel/src/main/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactory.java
diff --git a/tiles-parent/tiles-mvel/src/main/java/org/apache/tiles/mvel/ScopeVariableResolverFactory.java b/tiles-mvel/src/main/java/org/apache/tiles/mvel/ScopeVariableResolverFactory.java
similarity index 100%
rename from tiles-parent/tiles-mvel/src/main/java/org/apache/tiles/mvel/ScopeVariableResolverFactory.java
rename to tiles-mvel/src/main/java/org/apache/tiles/mvel/ScopeVariableResolverFactory.java
diff --git a/tiles-parent/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java b/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
similarity index 100%
rename from tiles-parent/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
rename to tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
diff --git a/tiles-parent/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java b/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
similarity index 100%
rename from tiles-parent/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
rename to tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextVariableResolverFactory.java
diff --git a/tiles-parent/tiles-mvel/src/main/java/org/apache/tiles/mvel/package-info.java b/tiles-mvel/src/main/java/org/apache/tiles/mvel/package-info.java
similarity index 100%
rename from tiles-parent/tiles-mvel/src/main/java/org/apache/tiles/mvel/package-info.java
rename to tiles-mvel/src/main/java/org/apache/tiles/mvel/package-info.java
diff --git a/tiles-parent/tiles-mvel/src/site/site.xml b/tiles-mvel/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-mvel/src/site/site.xml
rename to tiles-mvel/src/site/site.xml
diff --git a/tiles-parent/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java b/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
similarity index 100%
rename from tiles-parent/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
rename to tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
diff --git a/tiles-parent/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactoryTest.java b/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactoryTest.java
rename to tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverFactoryTest.java
diff --git a/tiles-parent/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverTest.java b/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverTest.java
similarity index 100%
rename from tiles-parent/tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverTest.java
rename to tiles-mvel/src/test/java/org/apache/tiles/mvel/ReadOnlyVariableResolverTest.java
diff --git a/tiles-parent/tiles-mvel/src/test/java/org/apache/tiles/mvel/ScopeVariableResolverFactoryTest.java b/tiles-mvel/src/test/java/org/apache/tiles/mvel/ScopeVariableResolverFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-mvel/src/test/java/org/apache/tiles/mvel/ScopeVariableResolverFactoryTest.java
rename to tiles-mvel/src/test/java/org/apache/tiles/mvel/ScopeVariableResolverFactoryTest.java
diff --git a/tiles-parent/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java b/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java
rename to tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactoryTest.java
diff --git a/tiles-parent/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java b/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
rename to tiles-mvel/src/test/java/org/apache/tiles/mvel/TilesContextVariableResolverFactoryTest.java
diff --git a/tiles-parent/tiles-ognl/pom.xml b/tiles-ognl/pom.xml
similarity index 100%
rename from tiles-parent/tiles-ognl/pom.xml
rename to tiles-ognl/pom.xml
diff --git a/tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java b/tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java
rename to tiles-ognl/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java
diff --git a/tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java b/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java
rename to tiles-ognl/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java
diff --git a/tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java b/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java
rename to tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java
diff --git a/tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectExtractor.java b/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectExtractor.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectExtractor.java
rename to tiles-ognl/src/main/java/org/apache/tiles/ognl/NestedObjectExtractor.java
diff --git a/tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java b/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java
rename to tiles-ognl/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java
diff --git a/tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java b/tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java
rename to tiles-ognl/src/main/java/org/apache/tiles/ognl/PropertyAccessorDelegateFactory.java
diff --git a/tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java b/tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java
rename to tiles-ognl/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java
diff --git a/tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java b/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java
rename to tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractor.java
diff --git a/tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java b/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
rename to tiles-ognl/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java
diff --git a/tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/package-info.java b/tiles-ognl/src/main/java/org/apache/tiles/ognl/package-info.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/main/java/org/apache/tiles/ognl/package-info.java
rename to tiles-ognl/src/main/java/org/apache/tiles/ognl/package-info.java
diff --git a/tiles-parent/tiles-ognl/src/site/site.xml b/tiles-ognl/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-ognl/src/site/site.xml
rename to tiles-ognl/src/site/site.xml
diff --git a/tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/AnyScopePropertyAccessorTest.java b/tiles-ognl/src/test/java/org/apache/tiles/ognl/AnyScopePropertyAccessorTest.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/AnyScopePropertyAccessorTest.java
rename to tiles-ognl/src/test/java/org/apache/tiles/ognl/AnyScopePropertyAccessorTest.java
diff --git a/tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java b/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java
rename to tiles-ognl/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java
diff --git a/tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java b/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java
rename to tiles-ognl/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java
diff --git a/tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java b/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
rename to tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
diff --git a/tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/ScopePropertyAccessorTest.java b/tiles-ognl/src/test/java/org/apache/tiles/ognl/ScopePropertyAccessorTest.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/ScopePropertyAccessorTest.java
rename to tiles-ognl/src/test/java/org/apache/tiles/ognl/ScopePropertyAccessorTest.java
diff --git a/tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java b/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java
rename to tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java
diff --git a/tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java b/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java
similarity index 100%
rename from tiles-parent/tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java
rename to tiles-ognl/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java
diff --git a/tiles-parent/pom.xml b/tiles-parent/pom.xml
deleted file mode 100644
index 810cdd7..0000000
--- a/tiles-parent/pom.xml
+++ /dev/null
@@ -1,386 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/*
- * $Id$
- *
- * 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 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">
-
- <parent>
- <artifactId>tiles-master</artifactId>
- <groupId>org.apache.tiles</groupId>
- <version>4</version>
- <relativePath/>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Tiles 3</name>
- <description>Tiles 3: A framework for page composition.</description>
- <url>http://tiles.apache.org/framework/</url>
- <scm>
- <connection>scm:svn:http://svn.eu.apache.org/repos/asf/tiles/framework/trunk/tiles-parent/</connection>
- <developerConnection>scm:svn:https://svn.eu.apache.org/repos/asf/tiles/framework/trunk/tiles-parent/</developerConnection>
- <url>http://svn.eu.apache.org/viewvc/tiles/framework/trunk/tiles-parent/</url>
- </scm>
-
- <ciManagement />
-
- <modules>
- <module>tiles-api</module>
- <module>tiles-core</module>
- <module>tiles-template</module>
- <module>tiles-servlet</module>
- <module>tiles-jsp</module>
- <module>tiles-freemarker</module>
- <module>tiles-velocity</module>
- <module>tiles-el</module>
- <module>tiles-mvel</module>
- <module>tiles-ognl</module>
- <module>tiles-compat</module>
- <module>tiles-extras</module>
- <module>assembly</module>
- <module>tiles-test-pom</module>
- </modules>
-
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/TILES</url>
- </issueManagement>
-
- <distributionManagement>
- <site>
- <id>apache-site</id>
- <url>scp://people.apache.org/www/tiles.apache.org/framework</url>
- </site>
- </distributionManagement>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-servlet</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-template</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
- <version>2.0</version>
- <exclusions>
- <exclusion>
- <artifactId>struts-taglib</artifactId>
- <groupId>org.apache.struts</groupId>
- </exclusion>
- <exclusion>
- <artifactId>struts-tiles</artifactId>
- <groupId>org.apache.struts</groupId>
- </exclusion>
- <exclusion>
- <artifactId>struts-core</artifactId>
- <groupId>org.apache.struts</groupId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>sslext</artifactId>
- <groupId>sslext</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-chain</artifactId>
- <groupId>commons-chain</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-validator</artifactId>
- <groupId>commons-validator</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-digester</artifactId>
- <groupId>commons-digester</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-beanutils</artifactId>
- <groupId>commons-beanutils</groupId>
- </exclusion>
- <exclusion>
- <artifactId>dom4j</artifactId>
- <groupId>dom4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>2.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.15</version>
- </dependency>
-
- <dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- <version>2.7.3</version>
- </dependency>
- <dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- <version>2.0.11</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.5.8</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.8</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.tiles</groupId>
- <artifactId>tiles-request-api</artifactId>
- <version>${tiles.request.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${tiles.manifestfile}</manifestFile>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
- <inherited>true</inherited>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <excludeDependencies>true</excludeDependencies>
- <manifestLocation>target/osgi</manifestLocation>
- <instructions>
- <_nouses>true</_nouses>
- <Bundle-SymbolicName>${tiles.osgi.symbolicName}</Bundle-SymbolicName>
- <Export-Package>${tiles.osgi.export}</Export-Package>
- <Private-Package>${tiles.osgi.private}</Private-Package>
- <Import-Package>${tiles.osgi.import}</Import-Package>
- <DynamicImport-Package>${tiles.osgi.dynamicImport}</DynamicImport-Package>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <releaseProfiles>apache-release</releaseProfiles><!-- xxx tiles still uses "release" instead of "apache-release" -->
- <goals>deploy site-deploy</goals>
- </configuration>
- </plugin>
- </plugins>
-
- <defaultGoal>install</defaultGoal>
- </build>
-
- <properties>
- <tiles.osgi.symbolicName>org.apache.${project.artifactId}</tiles.osgi.symbolicName>
- <tiles.osgi.export>org.apache.tiles.*;version=${project.version}</tiles.osgi.export>
- <tiles.osgi.import>*</tiles.osgi.import>
- <tiles.osgi.dynamicImport />
- <tiles.osgi.private />
- <tiles.manifestfile>target/osgi/MANIFEST.MF</tiles.manifestfile>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tiles.request.version>1.0-SNAPSHOT</tiles.request.version>
- <tiles.autotag.version>1.0-SNAPSHOT</tiles.autotag.version>
- </properties>
-
- <dependencies />
-
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-install-plugin</artifactId>
- <configuration>
- <createChecksum>true</createChecksum>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
- <licenseMatchers>
- <classNames>
- <className>rat.analysis.license.ApacheSoftwareLicense20</className>
- </classNames>
- </licenseMatchers>
- <includes>
- <include>pom.xml</include>
- <include>src/**</include>
- </includes>
- <excludes>
- <exclude>**/*LICENSE.txt</exclude>
- <exclude>**/*MANIFEST.MF</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>linkcheck</id>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-linkcheck-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <excludedLinks>
- <excludedLink>/*</excludedLink>
- <excludedLink>**/index.html</excludedLink>
- <excludedLink>**/logo.png</excludedLink>
- <excludedLink>**/tiles-jsp/tagreference.html</excludedLink>
- </excludedLinks>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- </profile>
-
- </profiles>
-
-</project>
diff --git a/tiles-parent/tiles-servlet/pom.xml b/tiles-servlet/pom.xml
similarity index 100%
rename from tiles-parent/tiles-servlet/pom.xml
rename to tiles-servlet/pom.xml
diff --git a/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java b/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java
rename to tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesInitializerServlet.java
diff --git a/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java b/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java
rename to tiles-servlet/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java
diff --git a/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/package-info.java b/tiles-servlet/src/main/java/org/apache/tiles/web/startup/package-info.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/package-info.java
rename to tiles-servlet/src/main/java/org/apache/tiles/web/startup/package-info.java
diff --git a/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServlet.java b/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServlet.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServlet.java
rename to tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServlet.java
diff --git a/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/SimpleTilesListener.java b/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/SimpleTilesListener.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/SimpleTilesListener.java
rename to tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/SimpleTilesListener.java
diff --git a/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/package-info.java b/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/package-info.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/package-info.java
rename to tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/package-info.java
diff --git a/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java b/tiles-servlet/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java
rename to tiles-servlet/src/main/java/org/apache/tiles/web/util/AttributeContextMutator.java
diff --git a/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java b/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java
rename to tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java
diff --git a/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java b/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
rename to tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
diff --git a/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java b/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
rename to tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
diff --git a/tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/util/package-info.java b/tiles-servlet/src/main/java/org/apache/tiles/web/util/package-info.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/java/org/apache/tiles/web/util/package-info.java
rename to tiles-servlet/src/main/java/org/apache/tiles/web/util/package-info.java
diff --git a/tiles-parent/tiles-servlet/src/main/resources/LICENSE.txt b/tiles-servlet/src/main/resources/LICENSE.txt
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/resources/LICENSE.txt
rename to tiles-servlet/src/main/resources/LICENSE.txt
diff --git a/tiles-parent/tiles-servlet/src/main/resources/NOTICE.txt b/tiles-servlet/src/main/resources/NOTICE.txt
similarity index 100%
rename from tiles-parent/tiles-servlet/src/main/resources/NOTICE.txt
rename to tiles-servlet/src/main/resources/NOTICE.txt
diff --git a/tiles-parent/tiles-servlet/src/site/site.xml b/tiles-servlet/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-servlet/src/site/site.xml
rename to tiles-servlet/src/site/site.xml
diff --git a/tiles-parent/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesInitializerServletTest.java b/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesInitializerServletTest.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesInitializerServletTest.java
rename to tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesInitializerServletTest.java
diff --git a/tiles-parent/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java b/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java
rename to tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java
diff --git a/tiles-parent/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServletTest.java b/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServletTest.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServletTest.java
rename to tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServletTest.java
diff --git a/tiles-parent/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesListenerTest.java b/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesListenerTest.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesListenerTest.java
rename to tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesListenerTest.java
diff --git a/tiles-parent/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java b/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
rename to tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
diff --git a/tiles-parent/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java b/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java
similarity index 100%
rename from tiles-parent/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java
rename to tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java
diff --git a/tiles-parent/tiles-template/pom.xml b/tiles-template/pom.xml
similarity index 100%
rename from tiles-parent/tiles-template/pom.xml
rename to tiles-template/pom.xml
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java b/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
rename to tiles-template/src/main/java/org/apache/tiles/template/AddAttributeModel.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java b/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
rename to tiles-template/src/main/java/org/apache/tiles/template/AddListAttributeModel.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java b/tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java
rename to tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java b/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java
rename to tiles-template/src/main/java/org/apache/tiles/template/ComposeStackUtil.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java b/tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java
rename to tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java b/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
rename to tiles-template/src/main/java/org/apache/tiles/template/DefinitionModel.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java b/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
rename to tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java b/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java
rename to tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java b/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
rename to tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java b/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java
rename to tiles-template/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java b/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java
rename to tiles-template/src/main/java/org/apache/tiles/template/InsertTemplateModel.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/NoSuchAttributeException.java b/tiles-template/src/main/java/org/apache/tiles/template/NoSuchAttributeException.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/NoSuchAttributeException.java
rename to tiles-template/src/main/java/org/apache/tiles/template/NoSuchAttributeException.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java b/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
rename to tiles-template/src/main/java/org/apache/tiles/template/PutAttributeModel.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java b/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
rename to tiles-template/src/main/java/org/apache/tiles/template/PutListAttributeModel.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/SetCurrentContainerModel.java b/tiles-template/src/main/java/org/apache/tiles/template/SetCurrentContainerModel.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/SetCurrentContainerModel.java
rename to tiles-template/src/main/java/org/apache/tiles/template/SetCurrentContainerModel.java
diff --git a/tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/package-info.java b/tiles-template/src/main/java/org/apache/tiles/template/package-info.java
similarity index 100%
rename from tiles-parent/tiles-template/src/main/java/org/apache/tiles/template/package-info.java
rename to tiles-template/src/main/java/org/apache/tiles/template/package-info.java
diff --git a/tiles-parent/tiles-template/src/site/site.xml b/tiles-template/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-template/src/site/site.xml
rename to tiles-template/src/site/site.xml
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java b/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java b/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java b/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/DefaultAttributeResolverTest.java b/tiles-template/src/test/java/org/apache/tiles/template/DefaultAttributeResolverTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/DefaultAttributeResolverTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/DefaultAttributeResolverTest.java
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java b/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/DefinitionModelTest.java
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java b/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java b/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java b/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java b/tiles-template/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/InsertTemplateModelTest.java b/tiles-template/src/test/java/org/apache/tiles/template/InsertTemplateModelTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/InsertTemplateModelTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/InsertTemplateModelTest.java
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java b/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java b/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java
diff --git a/tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java b/tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java
similarity index 100%
rename from tiles-parent/tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java
rename to tiles-template/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java
diff --git a/tiles-parent/tiles-test-pom/pom.xml b/tiles-test-pom/pom.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/pom.xml
rename to tiles-test-pom/pom.xml
diff --git a/tiles-parent/tiles-test-pom/src/site/site.xml b/tiles-test-pom/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/src/site/site.xml
rename to tiles-test-pom/src/site/site.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test-alt/pom.xml b/tiles-test-pom/tiles-test-alt/pom.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-alt/pom.xml
rename to tiles-test-pom/tiles-test-alt/pom.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java b/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java
rename to tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesContainerFactory.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java b/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java
rename to tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/TestAlternateTilesInitializer.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html b/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html
rename to tiles-test-pom/tiles-test-alt/src/main/java/org/apache/tiles/test/alt/package.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/MANIFEST.MF b/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/MANIFEST.MF
rename to tiles-test-pom/tiles-test-alt/src/main/resources/META-INF/MANIFEST.MF
diff --git a/tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-defs.xml b/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-defs.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-defs.xml
rename to tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-defs.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-freemarker-defs.xml b/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-freemarker-defs.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-freemarker-defs.xml
rename to tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-freemarker-defs.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-velocity-defs.xml b/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-velocity-defs.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-velocity-defs.xml
rename to tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/defs/tiles-alt-velocity-defs.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/body.ftl b/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/body.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/body.ftl
rename to tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/body.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/testinsertdefinition_alt.ftl b/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/testinsertdefinition_alt.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/testinsertdefinition_alt.ftl
rename to tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/freemarker/testinsertdefinition_alt.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/body.vm b/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/body.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/body.vm
rename to tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/body.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm b/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm
rename to tiles-test-pom/tiles-test-alt/src/main/resources/org/apache/tiles/test/alt/velocity/testinsertdefinition_alt.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test-common/pom.xml b/tiles-test-pom/tiles-test-common/pom.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-common/pom.xml
rename to tiles-test-pom/tiles-test-common/pom.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java b/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
rename to tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/factory/TestTilesContainerFactory.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/ReverseStringRenderer.java b/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/ReverseStringRenderer.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/ReverseStringRenderer.java
rename to tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/ReverseStringRenderer.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/package.html b/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/package.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/package.html
rename to tiles-test-pom/tiles-test-common/src/main/java/org/apache/tiles/test/renderer/package.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test-db/pom.xml b/tiles-test-pom/tiles-test-db/pom.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-db/pom.xml
rename to tiles-test-pom/tiles-test-db/pom.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java b/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java
rename to tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/LocaleDbDefinitionDAO.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java b/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java
rename to tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesContainerFactory.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java b/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java
rename to tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/TestDbTilesInitializer.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html b/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html
rename to tiles-test-pom/tiles-test-db/src/main/java/org/apache/tiles/test/db/package.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/MANIFEST.MF b/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test-db/src/main/resources/META-INF/MANIFEST.MF
rename to tiles-test-pom/tiles-test-db/src/main/resources/META-INF/MANIFEST.MF
diff --git a/tiles-parent/tiles-test-pom/tiles-test/pom.xml b/tiles-test-pom/tiles-test/pom.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/pom.xml
rename to tiles-test-pom/tiles-test/pom.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/etc/db/project/tiles.architect b/tiles-test-pom/tiles-test/src/etc/db/project/tiles.architect
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/etc/db/project/tiles.architect
rename to tiles-test-pom/tiles-test/src/etc/db/project/tiles.architect
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/exception/TilesTestRuntimeException.java b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/exception/TilesTestRuntimeException.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/exception/TilesTestRuntimeException.java
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/exception/TilesTestRuntimeException.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/exception/package.html b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/exception/package.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/exception/package.html
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/exception/package.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/filter/SecurityWrappingFilter.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/filter/package.html b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/filter/package.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/filter/package.html
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/filter/package.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/InitContextListener.java b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/InitContextListener.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/InitContextListener.java
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/InitContextListener.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/TestTilesInitializer.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/package.html b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/package.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/package.html
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/init/package.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/TestPortlet.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/package.html b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/package.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/package.html
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/portlet/package.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/AttributeViewPreparer.java b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/AttributeViewPreparer.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/AttributeViewPreparer.java
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/AttributeViewPreparer.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/RequestSettingViewPreparer.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/package.html b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/package.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/package.html
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/preparer/package.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/package.html b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/package.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/package.html
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/package.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/velocity/ExceptionTool.java b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/velocity/ExceptionTool.java
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/velocity/ExceptionTool.java
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/velocity/ExceptionTool.java
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/velocity/package.html b/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/velocity/package.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/velocity/package.html
rename to tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/velocity/package.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/resources/LICENSE.txt b/tiles-test-pom/tiles-test/src/main/resources/LICENSE.txt
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/resources/LICENSE.txt
rename to tiles-test-pom/tiles-test/src/main/resources/LICENSE.txt
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/resources/META-INF/MANIFEST.MF b/tiles-test-pom/tiles-test/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/resources/META-INF/MANIFEST.MF
rename to tiles-test-pom/tiles-test/src/main/resources/META-INF/MANIFEST.MF
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/resources/NOTICE.txt b/tiles-test-pom/tiles-test/src/main/resources/NOTICE.txt
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/resources/NOTICE.txt
rename to tiles-test-pom/tiles-test/src/main/resources/NOTICE.txt
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/classpath-defs.xml b/tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/classpath-defs.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/classpath-defs.xml
rename to tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/classpath-defs.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/freemarker-classpath-defs.xml b/tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/freemarker-classpath-defs.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/freemarker-classpath-defs.xml
rename to tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/freemarker-classpath-defs.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/test/db/schema.sql b/tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/test/db/schema.sql
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/test/db/schema.sql
rename to tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/test/db/schema.sql
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/velocity-classpath-defs.xml b/tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/velocity-classpath-defs.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/velocity-classpath-defs.xml
rename to tiles-test-pom/tiles-test/src/main/resources/org/apache/tiles/velocity-classpath-defs.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/VM_global_library.vm b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/VM_global_library.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/VM_global_library.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/VM_global_library.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs-1.1.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs-1.1.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs-1.1.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs-1.1.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_en_GB.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_en_GB.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_en_GB.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_en_GB.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_en_US.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_en_US.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_en_US.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_en_US.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_fr.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_fr.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_fr.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_fr.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_it.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_it.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_it.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/freemarker/tiles-defs_it.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/jsp/index.jsp b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/jsp/index.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/jsp/index.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/jsp/index.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/jsp/nosuchdefinition.jsp b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/jsp/nosuchdefinition.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/jsp/nosuchdefinition.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/jsp/nosuchdefinition.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/portlet.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/portlet.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/portlet.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/portlet.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs-1.1.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs-1.1.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs-1.1.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs-1.1.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_en_GB.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_en_GB.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_en_GB.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_en_GB.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_en_US.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_en_US.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_en_US.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_en_US.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_fr.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_fr.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_fr.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_fr.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_it.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_it.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_it.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tiles-defs_it.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/tools.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity.properties b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity.properties
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity.properties
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity.properties
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs-1.1.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs-1.1.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs-1.1.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs-1.1.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_en_GB.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_en_GB.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_en_GB.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_en_GB.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_en_US.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_en_US.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_en_US.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_en_US.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_fr.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_fr.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_fr.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_fr.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_it.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_it.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_it.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/velocity/tiles-defs_it.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml b/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml
rename to tiles-test-pom/tiles-test/src/main/webapp/WEB-INF/web.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/alternate-header.jsp b/tiles-test-pom/tiles-test/src/main/webapp/alternate-header.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/alternate-header.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/alternate-header.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/body.jsp b/tiles-test-pom/tiles-test/src/main/webapp/body.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/body.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/body.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/classpath.jsp b/tiles-test-pom/tiles-test/src/main/webapp/classpath.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/classpath.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/classpath.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/defaultlocale.jsp b/tiles-test-pom/tiles-test/src/main/webapp/defaultlocale.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/defaultlocale.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/defaultlocale.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/defaultlocale_db.jsp b/tiles-test-pom/tiles-test/src/main/webapp/defaultlocale_db.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/defaultlocale_db.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/defaultlocale_db.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/errorInclude.jsp b/tiles-test-pom/tiles-test/src/main/webapp/errorInclude.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/errorInclude.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/errorInclude.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/exception.jsp b/tiles-test-pom/tiles-test/src/main/webapp/exception.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/exception.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/exception.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/alternate-header.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/alternate-header.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/alternate-header.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/alternate-header.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/body.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/body.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/body.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/body.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/classpath.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/classpath.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/classpath.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/classpath.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/defaultlocale.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/defaultlocale.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/defaultlocale.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/defaultlocale.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/defaultlocale_db.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/defaultlocale_db.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/defaultlocale_db.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/defaultlocale_db.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/errorInclude.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/errorInclude.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/errorInclude.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/errorInclude.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/exception.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/exception.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/exception.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/exception.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/header.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/header.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/header.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/header.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layoutOne.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layoutOne.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layoutOne.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layoutOne.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layoutTwo.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layoutTwo.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layoutTwo.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layoutTwo.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_alt_title.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_alt_title.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_alt_title.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_alt_title.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_closebody.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_closebody.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_closebody.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_closebody.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_default.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_default.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_default.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_default.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_flush.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_flush.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_flush.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_flush.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_ignore.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_ignore.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_ignore.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_ignore.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_list.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_list.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_list.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_list.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_nobody.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_nobody.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_nobody.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_nobody.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_override.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_override.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_override.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_override.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_preparer.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_preparer.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_preparer.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_preparer.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_roles.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_roles.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_roles.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/layout_roles.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/override.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/override.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/override.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/override.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/putallattributeslayout.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/putallattributeslayout.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/putallattributeslayout.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/putallattributeslayout.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/putattributeslayout.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/putattributeslayout.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/putattributeslayout.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/putattributeslayout.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/selectlocale.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/selectlocale.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/selectlocale.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/selectlocale.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdecorationfilter.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdecorationfilter.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdecorationfilter.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdecorationfilter.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef_extend.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef_extend.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef_extend.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef_extend.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef_list_inherit.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef_list_inherit.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef_list_inherit.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef_list_inherit.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef_preparer.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef_preparer.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef_preparer.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testdef_preparer.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testimportattribute.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testimportattribute.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testimportattribute.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testimportattribute.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testimportattribute_all.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testimportattribute_all.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testimportattribute_all.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testimportattribute_all.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testimportattribute_inherit.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testimportattribute_inherit.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testimportattribute_inherit.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testimportattribute_inherit.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_preparer.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_preparer.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_preparer.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_preparer.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles_tags.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles_tags.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles_tags.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_attribute_roles_tags.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded_list.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded_list.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded_list.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded_list.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded_overridden.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded_overridden.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded_overridden.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded_overridden.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded_template.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded_template.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded_template.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_cascaded_template.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_classpath.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_classpath.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_classpath.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_classpath.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured_notype.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured_notype.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured_notype.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags_includes_configured_notype.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags_notype.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags_notype.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags_notype.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_composite_tags_notype.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_db.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_db.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_db.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_db.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_defaultvalues.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_defaultvalues.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_defaultvalues.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_defaultvalues.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_el.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_el.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_el.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_el.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_el_singleeval.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_el_singleeval.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_el_singleeval.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_el_singleeval.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_exception.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_exception.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_exception.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_exception.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_extended_db.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_extended_db.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_extended_db.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_extended_db.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_flush.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_flush.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_flush.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_flush.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_freemarker.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_freemarker.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_freemarker.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_freemarker.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_ignore.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_ignore.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_ignore.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_ignore.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_inline.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_inline.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_inline.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_inline.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_mvel.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_mvel.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_mvel.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_mvel.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_ognl.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_ognl.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_ognl.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_ognl.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_old.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_old.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_old.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_old.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_openbody.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_openbody.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_openbody.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_openbody.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_override.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_override.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_override.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_override.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_override_and_not.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_override_and_not.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_override_and_not.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_override_and_not.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_override_template.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_override_template.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_override_template.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_override_template.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_preparer.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_preparer.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_preparer.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_preparer.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_preparer_configured.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_preparer_configured.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_preparer_configured.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_preparer_configured.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_regexp.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_regexp.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_regexp.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_regexp.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_reversed.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_reversed.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_reversed.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_reversed.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_role.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_role.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_role.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_role.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_role_tag.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_role_tag.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_role_tag.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_role_tag.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_wildcard.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_wildcard.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_wildcard.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertdefinition_wildcard.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnesteddefinition.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnesteddefinition.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnesteddefinition.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnesteddefinition.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnesteddefinition_tags.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnestedlistdefinition.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnestedlistdefinition.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnestedlistdefinition.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnestedlistdefinition.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testinsertnestedlistdefinition_tags.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_cascaded.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_cascaded.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_cascaded.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_cascaded.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_cascaded_overridden.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_cascaded_overridden.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_cascaded_overridden.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_cascaded_overridden.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_cascaded_template.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_cascaded_template.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_cascaded_template.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_cascaded_template.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_el.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_el.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_el.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_el.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_el_singleeval.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_el_singleeval.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_el_singleeval.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_el_singleeval.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_flush.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_flush.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_flush.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_flush.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_reversed.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_reversed.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_reversed.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_reversed.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_servlet.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_servlet.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_servlet.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testput_servlet.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testputlist.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testputlist.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testputlist.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testputlist.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testputlist_cascaded.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testputlist_cascaded.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testputlist_cascaded.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testputlist_cascaded.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testputlist_inherit.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testputlist_inherit.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testputlist_inherit.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testputlist_inherit.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testsetcurrentcontainer.ftl b/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testsetcurrentcontainer.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/freemarker/testsetcurrentcontainer.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/freemarker/testsetcurrentcontainer.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/header.jsp b/tiles-test-pom/tiles-test/src/main/webapp/header.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/header.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/header.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/index.jsp b/tiles-test-pom/tiles-test/src/main/webapp/index.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/index.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/index.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout.ftl b/tiles-test-pom/tiles-test/src/main/webapp/layout.ftl
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout.ftl
rename to tiles-test-pom/tiles-test/src/main/webapp/layout.ftl
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layout.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layout.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layoutOne.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layoutOne.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layoutOne.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layoutOne.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layoutTwo.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layoutTwo.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layoutTwo.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layoutTwo.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_alt_title.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layout_alt_title.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_alt_title.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layout_alt_title.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_closebody.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layout_closebody.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_closebody.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layout_closebody.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_default.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layout_default.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_default.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layout_default.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_flush.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layout_flush.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_flush.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layout_flush.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_ignore.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layout_ignore.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_ignore.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layout_ignore.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_list.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layout_list.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_list.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layout_list.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_nobody.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layout_nobody.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_nobody.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layout_nobody.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_override.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layout_override.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_override.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layout_override.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_preparer.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layout_preparer.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_preparer.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layout_preparer.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_roles.jsp b/tiles-test-pom/tiles-test/src/main/webapp/layout_roles.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/layout_roles.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/layout_roles.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/override.jsp b/tiles-test-pom/tiles-test/src/main/webapp/override.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/override.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/override.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/putallattributeslayout.jsp b/tiles-test-pom/tiles-test/src/main/webapp/putallattributeslayout.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/putallattributeslayout.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/putallattributeslayout.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/putattributeslayout.jsp b/tiles-test-pom/tiles-test/src/main/webapp/putattributeslayout.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/putattributeslayout.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/putattributeslayout.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/selectlocale.jsp b/tiles-test-pom/tiles-test/src/main/webapp/selectlocale.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/selectlocale.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/selectlocale.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/selectlocale_db.jsp b/tiles-test-pom/tiles-test/src/main/webapp/selectlocale_db.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/selectlocale_db.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/selectlocale_db.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testdecorationfilter.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testdecorationfilter.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testdecorationfilter.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testdecorationfilter.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testdef.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testdef.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testdef.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testdef.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testdef_extend.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testdef_extend.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testdef_extend.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testdef_extend.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testdef_list_inherit.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testdef_list_inherit.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testdef_list_inherit.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testdef_list_inherit.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testdef_preparer.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testdef_preparer.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testdef_preparer.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testdef_preparer.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testimportattribute.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testimportattribute.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testimportattribute.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testimportattribute.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testimportattribute_all.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testimportattribute_all.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testimportattribute_all.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testimportattribute_all.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testimportattribute_inherit.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testimportattribute_inherit.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testimportattribute_inherit.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testimportattribute_inherit.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_attribute_preparer.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_attribute_preparer.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_attribute_preparer.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_attribute_preparer.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_attribute_roles_tags.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded_list.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded_list.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded_list.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded_list.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded_overridden.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded_overridden.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded_overridden.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded_overridden.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded_template.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded_template.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded_template.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_cascaded_template.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_classpath.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_classpath.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_classpath.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_classpath.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_db.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_db.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_db.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_db.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_defaultvalues.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_defaultvalues.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_defaultvalues.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_defaultvalues.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_el.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_el.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_el.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_el.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_el_singleeval.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_el_singleeval.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_el_singleeval.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_el_singleeval.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_exception.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_exception.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_exception.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_exception.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_extended_db.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_extended_db.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_extended_db.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_extended_db.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_flush.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_flush.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_flush.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_flush.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_freemarker.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_freemarker.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_freemarker.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_freemarker.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_ignore.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_ignore.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_ignore.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_ignore.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_mvel.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_mvel.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_mvel.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_mvel.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_ognl.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_ognl.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_ognl.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_ognl.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_old.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_old.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_old.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_old.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_openbody.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_openbody.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_openbody.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_openbody.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_override.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_override_and_not.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_override_and_not.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_override_and_not.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_override_and_not.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_override_template.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_override_template.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_override_template.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_override_template.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_preparer.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_preparer.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_preparer.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_preparer.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_preparer_configured.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_preparer_configured.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_preparer_configured.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_preparer_configured.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_regexp.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_regexp.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_regexp.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_regexp.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_reversed.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_reversed.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_reversed.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_reversed.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_role.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_role.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_role.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_role.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_role_tag.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_wildcard.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_wildcard.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_wildcard.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertdefinition_wildcard.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertnesteddefinition.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertnesteddefinition.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertnesteddefinition.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertnesteddefinition.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertnesteddefinition_tags.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertnesteddefinition_tags.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertnesteddefinition_tags.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertnesteddefinition_tags.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertnestedlistdefinition.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertnestedlistdefinition.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertnestedlistdefinition.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertnestedlistdefinition.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertnestedlistdefinition_tags.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testinsertnestedlistdefinition_tags.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testinsertnestedlistdefinition_tags.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testinsertnestedlistdefinition_tags.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testput.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testput.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_cascaded.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testput_cascaded.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_cascaded.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testput_cascaded.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_cascaded_overridden.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testput_cascaded_overridden.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_cascaded_overridden.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testput_cascaded_overridden.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_cascaded_template.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testput_cascaded_template.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_cascaded_template.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testput_cascaded_template.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_el.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testput_el.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_el.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testput_el.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_el_singleeval.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testput_el_singleeval.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_el_singleeval.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testput_el_singleeval.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_flush.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testput_flush.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_flush.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testput_flush.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_reversed.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testput_reversed.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_reversed.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testput_reversed.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_servlet.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testput_servlet.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testput_servlet.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testput_servlet.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testputlist.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testputlist.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testputlist.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testputlist.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testputlist_cascaded.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testputlist_cascaded.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testputlist_cascaded.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testputlist_cascaded.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testputlist_inherit.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testputlist_inherit.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testputlist_inherit.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testputlist_inherit.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testsetcurrentcontainer.jsp b/tiles-test-pom/tiles-test/src/main/webapp/testsetcurrentcontainer.jsp
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/testsetcurrentcontainer.jsp
rename to tiles-test-pom/tiles-test/src/main/webapp/testsetcurrentcontainer.jsp
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/alternate-header.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/alternate-header.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/alternate-header.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/alternate-header.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/body.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/body.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/body.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/body.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/classpath.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/classpath.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/classpath.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/classpath.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/defaultlocale.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/defaultlocale.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/defaultlocale.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/defaultlocale.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/errorInclude.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/errorInclude.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/errorInclude.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/errorInclude.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/exception.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/exception.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/exception.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/exception.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/header.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/header.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/header.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/header.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layout.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutOne.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutOne.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutOne.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutOne.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutTwo.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutTwo.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutTwo.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layoutTwo.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_alt_title.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_alt_title.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_alt_title.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_alt_title.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_closebody.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_closebody.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_closebody.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_closebody.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_default.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_default.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_default.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_default.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_flush.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_flush.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_flush.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_flush.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_ignore.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_ignore.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_ignore.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_ignore.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_list.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_list.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_list.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_list.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_nobody.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_nobody.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_nobody.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_nobody.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_override.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_override.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_override.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_override.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_preparer.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_preparer.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_preparer.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_preparer.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_roles.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_roles.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_roles.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/layout_roles.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/override.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/override.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/override.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/override.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/putallattributeslayout.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/putallattributeslayout.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/putallattributeslayout.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/putallattributeslayout.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/putattributeslayout.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/putattributeslayout.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/putattributeslayout.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/putattributeslayout.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/selectlocale.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/selectlocale.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/selectlocale.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/selectlocale.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdecorationfilter.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdecorationfilter.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdecorationfilter.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testdecorationfilter.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_extend.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_extend.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_extend.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_extend.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_list_inherit.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_list_inherit.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_list_inherit.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_list_inherit.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_preparer.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_preparer.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_preparer.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testdef_preparer.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_all.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_all.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_all.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_all.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_inherit.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_inherit.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_inherit.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testimportattribute_inherit.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_preparer.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_attribute_roles_tags.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_list.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_overridden.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_cascaded_template.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_classpath.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_classpath.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_classpath.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_classpath.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_includes_configured_notype.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_composite_tags_notype.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_db.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_db.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_db.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_db.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_defaultvalues.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_el_singleeval.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_exception.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_exception.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_exception.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_exception.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_extended_db.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_extended_db.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_extended_db.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_extended_db.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_flush.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_flush.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_flush.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_flush.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ignore.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ignore.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ignore.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ignore.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_inline.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_inline.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_inline.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_inline.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_mvel.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_mvel.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_mvel.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_mvel.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ognl.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ognl.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ognl.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_ognl.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_old.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_old.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_old.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_old.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_openbody.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_openbody.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_openbody.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_openbody.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_and_not.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_template.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_template.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_template.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_override_template.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_preparer_configured.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_regexp.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_regexp.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_regexp.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_regexp.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_reversed.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_reversed.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_reversed.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_reversed.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_role.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_role.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_role.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_role.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_role_tag.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_role_tag.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_role_tag.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_role_tag.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_wildcard.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_wildcard.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_wildcard.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertdefinition_wildcard.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnesteddefinition.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnesteddefinition.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnesteddefinition.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnesteddefinition.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnesteddefinition_tags.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnesteddefinition_tags.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnesteddefinition_tags.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnesteddefinition_tags.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnestedlistdefinition.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnestedlistdefinition.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnestedlistdefinition.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnestedlistdefinition.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnestedlistdefinition_tags.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnestedlistdefinition_tags.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnestedlistdefinition_tags.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testinsertnestedlistdefinition_tags.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testput.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded_overridden.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded_overridden.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded_overridden.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded_overridden.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded_template.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded_template.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded_template.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_cascaded_template.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_el.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_el.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_el.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_el.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_el_singleeval.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_el_singleeval.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_el_singleeval.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_el_singleeval.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_flush.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_flush.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_flush.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_flush.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_reversed.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_reversed.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_reversed.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_reversed.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_servlet.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_servlet.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_servlet.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testput_servlet.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist_cascaded.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist_cascaded.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist_cascaded.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist_cascaded.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist_inherit.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist_inherit.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist_inherit.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testputlist_inherit.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testsetcurrentcontainer.vm b/tiles-test-pom/tiles-test/src/main/webapp/velocity/testsetcurrentcontainer.vm
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/main/webapp/velocity/testsetcurrentcontainer.vm
rename to tiles-test-pom/tiles-test/src/main/webapp/velocity/testsetcurrentcontainer.vm
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/site/site.xml b/tiles-test-pom/tiles-test/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/site/site.xml
rename to tiles-test-pom/tiles-test/src/site/site.xml
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html b/tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerConfiguredDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerConfiguredDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerConfiguredDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerConfiguredDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerDefinitionNoTypeTest.html b/tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerDefinitionNoTypeTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerDefinitionNoTypeTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerDefinitionNoTypeTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/CompositeDefinitionWithInnerDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredCompositeDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredCompositeDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredCompositeDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredCompositeDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionAttributePreparerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionAttributePreparerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionAttributePreparerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionAttributePreparerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTagsTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionAttributeRolesTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedListTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedListTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedListTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedListTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedOverriddenTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedOverriddenTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedOverriddenTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedOverriddenTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedTemplateTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedTemplateTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedTemplateTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedTemplateTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionCascadedTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionDbTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionDbTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionDbTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionDbTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionDefaultValuesTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionDefaultValuesTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionDefaultValuesTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionDefaultValuesTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionELSingleEvalTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionELSingleEvalTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionELSingleEvalTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionELSingleEvalTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionELTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionELTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionELTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionELTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionExceptionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionExceptionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionExceptionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionExceptionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionExtendedDbTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionExtendedDbTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionExtendedDbTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionExtendedDbTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionFlushTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionFlushTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionFlushTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionFlushTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionFreeMarkerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionFreeMarkerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionFreeMarkerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionFreeMarkerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionFromClasspathTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionFromClasspathTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionFromClasspathTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionFromClasspathTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionIgnoreTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionIgnoreTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionIgnoreTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionIgnoreTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionInlineTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionInlineTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionInlineTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionInlineTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionMVELTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionMVELTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionMVELTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionMVELTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOGNLTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOGNLTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOGNLTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOGNLTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOldFormatTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOldFormatTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOldFormatTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOldFormatTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOpenBodyTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOpenBodyTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOpenBodyTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOpenBodyTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideAndNotTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideAndNotTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideAndNotTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideAndNotTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideTemplateTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideTemplateTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideTemplateTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideTemplateTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionRegexpTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionRegexpTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionRegexpTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionRegexpTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionReversedTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionReversedTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionReversedTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionReversedTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionRoleTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWildcardTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWildcardTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWildcardTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWildcardTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWithConfiguredPreparerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWithConfiguredPreparerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWithConfiguredPreparerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWithConfiguredPreparerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWithPreparerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWithPreparerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWithPreparerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredDefinitionWithPreparerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredNestedDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredNestedDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredNestedDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredNestedDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredNestedListDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredNestedListDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ConfiguredNestedListDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ConfiguredNestedListDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagExtendTest.html b/tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagExtendTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagExtendTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagExtendTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagListInheritTest.html b/tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagListInheritTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagListInheritTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagListInheritTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagPreparerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagPreparerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagPreparerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagPreparerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/DefinitionTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ImportAttributeTagAllTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ImportAttributeTagAllTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ImportAttributeTagAllTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ImportAttributeTagAllTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ImportAttributeTagInheritTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ImportAttributeTagInheritTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ImportAttributeTagInheritTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ImportAttributeTagInheritTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ImportAttributeTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/ImportAttributeTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/ImportAttributeTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/ImportAttributeTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/LocalizationDbTest.html b/tiles-test-pom/tiles-test/src/test/selenium/LocalizationDbTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/LocalizationDbTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/LocalizationDbTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/LocalizationTest.html b/tiles-test-pom/tiles-test/src/test/selenium/LocalizationTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/LocalizationTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/LocalizationTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutListCascadedTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutListCascadedTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutListCascadedTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutListCascadedTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutListTagInheritTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutListTagInheritTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutListTagInheritTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutListTagInheritTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutListTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutListTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutListTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutListTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagCascadedOverriddenTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutTagCascadedOverriddenTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagCascadedOverriddenTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutTagCascadedOverriddenTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagCascadedTemplateTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutTagCascadedTemplateTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagCascadedTemplateTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutTagCascadedTemplateTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagCascadedTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutTagCascadedTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagCascadedTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutTagCascadedTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagFlushTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutTagFlushTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagFlushTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutTagFlushTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagNestedDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutTagNestedDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagNestedDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutTagNestedDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagNestedListDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutTagNestedListDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagNestedListDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutTagNestedListDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagReversedTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutTagReversedTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagReversedTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutTagReversedTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagWithELSingleEvalTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutTagWithELSingleEvalTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagWithELSingleEvalTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutTagWithELSingleEvalTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagWithELTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutTagWithELTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagWithELTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutTagWithELTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagWithServletTest.html b/tiles-test-pom/tiles-test/src/test/selenium/PutTagWithServletTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/PutTagWithServletTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/PutTagWithServletTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/SetCurrentContainerTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/SetCurrentContainerTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/SetCurrentContainerTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/SetCurrentContainerTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html b/tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html
rename to tiles-test-pom/tiles-test/src/test/selenium/TestSuite.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/TilesDefinitionFilterTest.html b/tiles-test-pom/tiles-test/src/test/selenium/TilesDefinitionFilterTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/TilesDefinitionFilterTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/TilesDefinitionFilterTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/TilesDispatchServletTest.html b/tiles-test-pom/tiles-test/src/test/selenium/TilesDispatchServletTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/TilesDispatchServletTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/TilesDispatchServletTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/WelcomePageTest.html b/tiles-test-pom/tiles-test/src/test/selenium/WelcomePageTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/WelcomePageTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/WelcomePageTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerConfiguredDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerConfiguredDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerConfiguredDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerConfiguredDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerDefinitionNoTypeTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerDefinitionNoTypeTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerDefinitionNoTypeTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerDefinitionNoTypeTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/CompositeDefinitionWithInnerDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredCompositeDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredCompositeDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredCompositeDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredCompositeDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributePreparerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributePreparerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributePreparerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributePreparerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTagsTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTagsTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTagsTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTagsTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionAttributeRolesTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedListTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedListTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedListTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedListTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedOverriddenTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedOverriddenTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedOverriddenTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedOverriddenTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedTemplateTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedTemplateTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedTemplateTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedTemplateTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionCascadedTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionDbTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionDbTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionDbTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionDbTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionDefaultValuesTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionDefaultValuesTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionDefaultValuesTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionDefaultValuesTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionELSingleEvalTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionELSingleEvalTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionELSingleEvalTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionELSingleEvalTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionELTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionELTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionELTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionELTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionExceptionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionExceptionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionExceptionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionExceptionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionExtendedDbTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionExtendedDbTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionExtendedDbTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionExtendedDbTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionFlushTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionFlushTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionFlushTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionFlushTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionFromClasspathTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionFromClasspathTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionFromClasspathTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionFromClasspathTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionIgnoreTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionIgnoreTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionIgnoreTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionIgnoreTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionInModuleTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionInModuleTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionInModuleTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionInModuleTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionInlineTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionInlineTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionInlineTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionInlineTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionMVELTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionMVELTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionMVELTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionMVELTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOGNLTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOGNLTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOGNLTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOGNLTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOldFormatTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOldFormatTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOldFormatTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOldFormatTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOpenBodyTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOpenBodyTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOpenBodyTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOpenBodyTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOverrideAndNotTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOverrideAndNotTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOverrideAndNotTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOverrideAndNotTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOverrideTemplateTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOverrideTemplateTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOverrideTemplateTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOverrideTemplateTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOverrideTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOverrideTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOverrideTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionOverrideTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRegexpTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRegexpTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRegexpTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRegexpTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionReversedTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionReversedTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionReversedTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionReversedTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRoleTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRoleTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRoleTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRoleTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRoleTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRoleTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRoleTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionRoleTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWildcardTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWildcardTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWildcardTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWildcardTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWithConfiguredPreparerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWithConfiguredPreparerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWithConfiguredPreparerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWithConfiguredPreparerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWithPreparerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWithPreparerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWithPreparerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredDefinitionWithPreparerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredNestedDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredNestedDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredNestedDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredNestedDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredNestedListDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredNestedListDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredNestedListDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ConfiguredNestedListDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagExtendTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagExtendTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagExtendTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagExtendTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagListInheritTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagListInheritTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagListInheritTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagListInheritTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagPreparerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagPreparerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagPreparerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagPreparerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/DefinitionTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ImportAttributeTagAllTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ImportAttributeTagAllTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ImportAttributeTagAllTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ImportAttributeTagAllTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ImportAttributeTagInheritTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ImportAttributeTagInheritTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ImportAttributeTagInheritTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ImportAttributeTagInheritTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ImportAttributeTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ImportAttributeTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/ImportAttributeTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/ImportAttributeTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/LocalizationTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/LocalizationTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/LocalizationTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/LocalizationTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutListCascadedTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutListCascadedTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutListCascadedTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutListCascadedTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutListTagInheritTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutListTagInheritTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutListTagInheritTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutListTagInheritTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutListTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutListTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutListTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutListTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagCascadedOverriddenTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagCascadedOverriddenTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagCascadedOverriddenTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagCascadedOverriddenTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagCascadedTemplateTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagCascadedTemplateTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagCascadedTemplateTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagCascadedTemplateTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagCascadedTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagCascadedTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagCascadedTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagCascadedTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagFlushTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagFlushTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagFlushTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagFlushTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagNestedDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagNestedDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagNestedDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagNestedDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagNestedListDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagNestedListDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagNestedListDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagNestedListDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagReversedTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagReversedTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagReversedTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagReversedTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagWithELSingleEvalTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagWithELSingleEvalTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagWithELSingleEvalTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagWithELSingleEvalTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagWithELTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagWithELTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagWithELTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagWithELTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagWithServletTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagWithServletTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagWithServletTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/PutTagWithServletTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/SetCurrentContainerTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/SetCurrentContainerTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/SetCurrentContainerTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/SetCurrentContainerTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/TilesDefinitionFilterTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/TilesDefinitionFilterTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/TilesDefinitionFilterTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/TilesDefinitionFilterTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/TilesDispatchServletTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/TilesDispatchServletTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/TilesDispatchServletTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/TilesDispatchServletTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/WelcomePageTest.html b/tiles-test-pom/tiles-test/src/test/selenium/freemarker/WelcomePageTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/freemarker/WelcomePageTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/freemarker/WelcomePageTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerConfiguredDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionNoTypeTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/CompositeDefinitionWithInnerDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredCompositeDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributePreparerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTagsTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionAttributeRolesTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedListTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedOverriddenTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTemplateTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionCascadedTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionDbTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionDbTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionDbTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionDbTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionDefaultValuesTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionDefaultValuesTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionDefaultValuesTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionDefaultValuesTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionELSingleEvalTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionELSingleEvalTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionELSingleEvalTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionELSingleEvalTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionELTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionELTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionELTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionELTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionExceptionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionExceptionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionExceptionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionExceptionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionExtendedDbTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionExtendedDbTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionExtendedDbTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionExtendedDbTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionFlushTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionFlushTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionFlushTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionFlushTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionFromClasspathTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionFromClasspathTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionFromClasspathTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionFromClasspathTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionIgnoreTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionIgnoreTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionIgnoreTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionIgnoreTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionInModuleTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionInModuleTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionInModuleTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionInModuleTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionInlineTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionInlineTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionInlineTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionInlineTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionMVELTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionMVELTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionMVELTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionMVELTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOGNLTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOGNLTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOGNLTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOGNLTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOldFormatTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOldFormatTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOldFormatTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOldFormatTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOpenBodyTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOpenBodyTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOpenBodyTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOpenBodyTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideAndNotTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideAndNotTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideAndNotTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideAndNotTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideTemplateTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideTemplateTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideTemplateTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideTemplateTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionOverrideTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRegexpTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRegexpTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRegexpTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRegexpTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionReversedTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionReversedTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionReversedTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionReversedTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRoleTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRoleTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRoleTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRoleTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRoleTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRoleTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRoleTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionRoleTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWildcardTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWildcardTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWildcardTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWildcardTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithConfiguredPreparerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithConfiguredPreparerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithConfiguredPreparerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithConfiguredPreparerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithPreparerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithPreparerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithPreparerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredDefinitionWithPreparerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredNestedDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredNestedDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredNestedDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredNestedDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredNestedListDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredNestedListDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredNestedListDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ConfiguredNestedListDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagExtendTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagExtendTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagExtendTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagExtendTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagListInheritTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagListInheritTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagListInheritTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagListInheritTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagPreparerTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagPreparerTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagPreparerTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagPreparerTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/DefinitionTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ImportAttributeTagAllTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ImportAttributeTagAllTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ImportAttributeTagAllTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ImportAttributeTagAllTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ImportAttributeTagInheritTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ImportAttributeTagInheritTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ImportAttributeTagInheritTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ImportAttributeTagInheritTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ImportAttributeTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/ImportAttributeTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/ImportAttributeTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/ImportAttributeTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/LocalizationTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/LocalizationTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/LocalizationTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/LocalizationTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutListCascadedTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutListCascadedTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutListCascadedTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutListCascadedTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutListTagInheritTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutListTagInheritTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutListTagInheritTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutListTagInheritTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutListTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutListTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutListTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutListTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagCascadedOverriddenTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagCascadedOverriddenTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagCascadedOverriddenTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagCascadedOverriddenTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagCascadedTemplateTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagCascadedTemplateTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagCascadedTemplateTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagCascadedTemplateTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagCascadedTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagCascadedTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagCascadedTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagCascadedTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagFlushTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagFlushTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagFlushTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagFlushTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagNestedDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagNestedDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagNestedDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagNestedDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagNestedListDefinitionTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagNestedListDefinitionTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagNestedListDefinitionTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagNestedListDefinitionTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagReversedTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagReversedTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagReversedTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagReversedTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagWithELSingleEvalTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagWithELSingleEvalTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagWithELSingleEvalTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagWithELSingleEvalTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagWithELTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagWithELTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagWithELTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagWithELTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagWithServletTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagWithServletTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagWithServletTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/PutTagWithServletTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/SetCurrentContainerTagTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/SetCurrentContainerTagTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/SetCurrentContainerTagTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/SetCurrentContainerTagTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/TilesDefinitionFilterTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/TilesDefinitionFilterTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/TilesDefinitionFilterTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/TilesDefinitionFilterTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/TilesDispatchServletTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/TilesDispatchServletTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/TilesDispatchServletTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/TilesDispatchServletTest.html
diff --git a/tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/WelcomePageTest.html b/tiles-test-pom/tiles-test/src/test/selenium/velocity/WelcomePageTest.html
similarity index 100%
rename from tiles-parent/tiles-test-pom/tiles-test/src/test/selenium/velocity/WelcomePageTest.html
rename to tiles-test-pom/tiles-test/src/test/selenium/velocity/WelcomePageTest.html
diff --git a/tiles-parent/tiles-velocity/pom.xml b/tiles-velocity/pom.xml
similarity index 100%
rename from tiles-parent/tiles-velocity/pom.xml
rename to tiles-velocity/pom.xml
diff --git a/tiles-parent/tiles-velocity/src/main/java/org/apache/tiles/velocity/TilesVelocityException.java b/tiles-velocity/src/main/java/org/apache/tiles/velocity/TilesVelocityException.java
similarity index 100%
rename from tiles-parent/tiles-velocity/src/main/java/org/apache/tiles/velocity/TilesVelocityException.java
rename to tiles-velocity/src/main/java/org/apache/tiles/velocity/TilesVelocityException.java
diff --git a/tiles-parent/tiles-velocity/src/main/java/org/apache/tiles/velocity/package-info.java b/tiles-velocity/src/main/java/org/apache/tiles/velocity/package-info.java
similarity index 100%
rename from tiles-parent/tiles-velocity/src/main/java/org/apache/tiles/velocity/package-info.java
rename to tiles-velocity/src/main/java/org/apache/tiles/velocity/package-info.java
diff --git a/tiles-parent/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java b/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java
similarity index 100%
rename from tiles-parent/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java
rename to tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java
diff --git a/tiles-parent/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java b/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java
similarity index 100%
rename from tiles-parent/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java
rename to tiles-velocity/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java
diff --git a/tiles-parent/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java b/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java
similarity index 100%
rename from tiles-parent/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java
rename to tiles-velocity/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java
diff --git a/tiles-parent/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/package-info.java b/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/package-info.java
similarity index 100%
rename from tiles-parent/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/package-info.java
rename to tiles-velocity/src/main/java/org/apache/tiles/velocity/template/package-info.java
diff --git a/tiles-parent/tiles-velocity/src/main/resources/LICENSE.txt b/tiles-velocity/src/main/resources/LICENSE.txt
similarity index 100%
rename from tiles-parent/tiles-velocity/src/main/resources/LICENSE.txt
rename to tiles-velocity/src/main/resources/LICENSE.txt
diff --git a/tiles-parent/tiles-velocity/src/main/resources/META-INF/velocity.properties b/tiles-velocity/src/main/resources/META-INF/velocity.properties
similarity index 100%
rename from tiles-parent/tiles-velocity/src/main/resources/META-INF/velocity.properties
rename to tiles-velocity/src/main/resources/META-INF/velocity.properties
diff --git a/tiles-parent/tiles-velocity/src/main/resources/NOTICE.txt b/tiles-velocity/src/main/resources/NOTICE.txt
similarity index 100%
rename from tiles-parent/tiles-velocity/src/main/resources/NOTICE.txt
rename to tiles-velocity/src/main/resources/NOTICE.txt
diff --git a/tiles-parent/tiles-velocity/src/main/resources/tools.xml b/tiles-velocity/src/main/resources/tools.xml
similarity index 100%
rename from tiles-parent/tiles-velocity/src/main/resources/tools.xml
rename to tiles-velocity/src/main/resources/tools.xml
diff --git a/tiles-parent/tiles-velocity/src/site/site.xml b/tiles-velocity/src/site/site.xml
similarity index 100%
rename from tiles-parent/tiles-velocity/src/site/site.xml
rename to tiles-velocity/src/site/site.xml
diff --git a/tiles-parent/tiles-velocity/src/test/java/org/apache/tiles/velocity/TilesVelocityExceptionTest.java b/tiles-velocity/src/test/java/org/apache/tiles/velocity/TilesVelocityExceptionTest.java
similarity index 100%
rename from tiles-parent/tiles-velocity/src/test/java/org/apache/tiles/velocity/TilesVelocityExceptionTest.java
rename to tiles-velocity/src/test/java/org/apache/tiles/velocity/TilesVelocityExceptionTest.java
diff --git a/tiles-parent/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderableTest.java b/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderableTest.java
similarity index 100%
rename from tiles-parent/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderableTest.java
rename to tiles-velocity/src/test/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderableTest.java
diff --git a/tiles-parent/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java b/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
similarity index 100%
rename from tiles-parent/tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
rename to tiles-velocity/src/test/java/org/apache/tiles/velocity/template/VelocityStyleTilesToolTest.java
