diff --git a/assembly/pom.xml b/assembly/pom.xml
index 5e5453f..fd0102d 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -59,6 +59,34 @@
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>make-assembly</id>
+                <goals>
+                  <goal>assembly</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/bin.xml</descriptor>
+                <descriptor>src/main/assembly/src.xml</descriptor>
+              </descriptors>
+              <tarLongFileMode>gnu</tarLongFileMode>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
   <dependencies>
 
@@ -81,6 +109,13 @@
     </dependency>
 
     <dependency>
+      <groupId>org.apache.tiles</groupId>
+      <artifactId>tiles-test</artifactId>
+      <version>${pom.version}</version>
+      <type>war</type>
+    </dependency>
+
+    <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
       <version>1.8</version>
diff --git a/assembly/src/main/assembly/bin.xml b/assembly/src/main/assembly/bin.xml
index 048fe6e..6306737 100644
--- a/assembly/src/main/assembly/bin.xml
+++ b/assembly/src/main/assembly/bin.xml
@@ -28,6 +28,7 @@
                 <exclude>org.apache.tiles:tiles-api</exclude>
                 <exclude>org.apache.tiles:tiles-core</exclude>
                 <exclude>org.apache.tiles:tiles-jsp</exclude>
+                <exclude>org.apache.tiles:tiles-test</exclude>
             </excludes>
         </dependencySet>
         <dependencySet>
@@ -38,6 +39,12 @@
                 <include>org.apache.tiles:tiles-jsp</include>
             </includes>
         </dependencySet>
+        <dependencySet>
+            <outputDirectory>/examples</outputDirectory>
+            <includes>
+                <include>org.apache.tiles:tiles-test</include>
+            </includes>
+        </dependencySet>
     </dependencySets>
 
     <fileSets>
diff --git a/assembly/src/main/assembly/src.xml b/assembly/src/main/assembly/src.xml
index 65c6828..de3a194 100644
--- a/assembly/src/main/assembly/src.xml
+++ b/assembly/src/main/assembly/src.xml
@@ -62,6 +62,14 @@
             </includes>
         </fileSet>
         <fileSet>
+            <directory>../tiles-test</directory>
+            <outputDirectory>src/tiles-test</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+        <fileSet>
             <directory>../assembly</directory>
             <outputDirectory>src/assembly</outputDirectory>
             <includes>
diff --git a/tiles-api/pom.xml b/tiles-api/pom.xml
index 337ae4c..c51568b 100644
--- a/tiles-api/pom.xml
+++ b/tiles-api/pom.xml
@@ -65,18 +65,6 @@
             </testResource>
         </testResources>
 
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/src.xml</descriptor>
-                    </descriptors>
-                    <tarLongFileMode>gnu</tarLongFileMode>
-                </configuration>
-            </plugin>
-        </plugins>
-
     </build>
 
     <profiles>
diff --git a/tiles-api/src/main/assembly/src.xml b/tiles-api/src/main/assembly/src.xml
deleted file mode 100644
index fb7264f..0000000
--- a/tiles-api/src/main/assembly/src.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly>
-    <id>src</id>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <includes>
-                <include>pom.xml</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>src/main/resources</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>src</directory>
-        </fileSet>
-    </fileSets>
-</assembly>
diff --git a/tiles-core/pom.xml b/tiles-core/pom.xml
index 6959c1a..b9b0ff3 100644
--- a/tiles-core/pom.xml
+++ b/tiles-core/pom.xml
@@ -69,16 +69,6 @@
           </archive>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/bin.xml</descriptor>
-            <descriptor>src/main/assembly/src.xml</descriptor>
-          </descriptors>
-          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
-      </plugin>
     </plugins>
 
   </build>
@@ -86,34 +76,6 @@
   <profiles>
 
     <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <executions>
-              <execution>
-                <id>make-assembly</id>
-                <goals>
-                  <goal>attached</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/bin.xml</descriptor>
-                <descriptor>src/main/assembly/src.xml</descriptor>
-              </descriptors>
-              <tarLongFileMode>gnu</tarLongFileMode>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-
-    <profile>
       <!--
          Run the translator for Java 1.4 compatiblity
 
diff --git a/tiles-core/src/main/assembly/bin.xml b/tiles-core/src/main/assembly/bin.xml
deleted file mode 100644
index 2e71d9c..0000000
--- a/tiles-core/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly>
-    <id>bin</id>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-    <includeSiteDirectory>false</includeSiteDirectory>
-
-    <dependencySets>
-        <dependencySet>
-            <scope>compile</scope>
-            <outputDirectory>/lib</outputDirectory>
-            <excludes>
-                <exclude>javax.servlet:servlet-api</exclude>
-                <exclude>javax.servlet:jsp-api</exclude>
-                <exclude>javax.portlet:portlet-api</exclude>
-                <exclude>org.apache.tiles:tiles-api</exclude>
-                <exclude>org.apache.tiles:tiles-core</exclude>
-            </excludes>
-        </dependencySet>
-        <dependencySet>
-            <scope>compile</scope>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>org.apache.tiles:tiles-api</include>
-            </includes>
-            <excludes>
-                <exclude>*</exclude>
-                <exclude>org.apache.tiles:tiles-core</exclude>
-            </excludes>
-        </dependencySet>
-    </dependencySets>
-
-    <fileSets>
-        <fileSet>
-            <directory>src/main/resources</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/apidocs</directory>
-            <outputDirectory>apidocs</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>
diff --git a/tiles-core/src/main/assembly/src.xml b/tiles-core/src/main/assembly/src.xml
deleted file mode 100644
index fed85f0..0000000
--- a/tiles-core/src/main/assembly/src.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly>
-    <id>src</id>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>src/main/resources</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <includes>
-                <include>pom.xml</include>
-            </includes>
-        </fileSet>
-        
-        <fileSet>
-            <directory>src</directory>
-        </fileSet>
-    </fileSets>
-</assembly>