diff --git a/project-build.xml b/project-build.xml
index 0052f2a4c4..9453c3a9cc 100644
--- a/project-build.xml
+++ b/project-build.xml
@@ -110,31 +110,30 @@
        <fileset dir="${dir.build}/sample-website"/>
      </delete>
      <mkdir dir="${dir.build}/sample-website/alfresco"/>
-     <copy todir="${dir.build}/sample-website/alfresco">
-       <fileset dir="${dir.src}/test-resources/websites/alfresco" excludes="**/.svn"/>
-     </copy>
+     <mkdir dir="${dir.build}/sample-website/alfresco/classes"/>
      <javac srcdir="${dir.src}/test-resources/websites/alfresco/ROOT/WEB-INF/classes"
-	    destdir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/classes"
+	    destdir="${dir.build}/sample-website/alfresco/classes"
             deprecation="on" debug="on" target="1.5" source="1.5"
 	    classpathref="classpath.compile"/>
-     <mkdir dir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/lib"/>
      <jar basedir="${dir.build}/classes"
-          destfile="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/lib/alfresco-form-data-functions.jar"
+          destfile="${dir.build}/sample-website/alfresco/alfresco-form-data-functions.jar"
 	  includes="org/alfresco/web/forms/*.class"/>
-     <jar basedir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/classes"
-	  destfile="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/lib/alfresco-sample-website.jar"
+     <jar basedir="${dir.build}/sample-website/alfresco/classes"
+	  destfile="${dir.build}/sample-website/alfresco/alfresco-sample-website.jar"
 	  includes="**/*.class"/>
-     <delete>
-       <fileset dir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/classes" includes="**/*.class"/>
-     </delete>
-     <copy todir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/lib">
-       <fileset dir="${dir.common.lib}">
+     <mkdir dir="${dir.dist}"/>
+     <war destfile="${dir.dist}/alfresco-sample-website.war"
+	  webxml="${dir.src}/test-resources/websites/alfresco/ROOT/WEB-INF/web.xml">
+       <lib dir="${dir.common.lib}">
 	 <include name="standard.jar"/>
 	 <include name="jstl.jar"/>
+       </lib>
+       <lib dir="${dir.build}/sample-website/alfresco"/>
+       <fileset dir="${dir.src}/test-resources/websites/alfresco/ROOT">
+	 <exclude name="WEB-INF/**"/>
+	 <exclude name="**/.svn"/>
        </fileset>
-     </copy>
-     <mkdir dir="${dir.dist}"/>
-     <zip destfile="${dir.dist}/alfresco-sample-website.zip" 
-	  basedir="${dir.build}/sample-website/alfresco"/>
+       <webinf file="${dir.src}/test-resources/websites/alfresco/ROOT/WEB-INF/pr.tld"/>
+     </war>
    </target>
 </project>
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
index 2b98c336c0..6ecd4f2051 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
@@ -299,6 +299,7 @@ public class CreateWebContentWizard extends BaseContentWizard
    @Override
    protected void saveContent(File fileContent, String strContent) throws Exception
    {
+      final FormsService fs = FormsService.getInstance();
       if (logger.isDebugEnabled())
          logger.debug("saving file content to " + this.fileName);
       // get the parent path of the location to save the content
@@ -306,7 +307,7 @@ public class CreateWebContentWizard extends BaseContentWizard
       path = path.replaceFirst(AVMConstants.STORE_MAIN, AVMConstants.STORE_PREVIEW);
       if (MimetypeMap.MIMETYPE_XML.equals(this.mimeType) && this.formName != null)
       {
-         final FormsService fs = FormsService.getInstance();
+
          final Document formInstanceData = (fileContent != null 
                                             ? fs.parseXML(fileContent)
                                             : fs.parseXML(strContent));
@@ -315,15 +316,22 @@ public class CreateWebContentWizard extends BaseContentWizard
          final String[] sb = AVMNodeConverter.SplitBase(path);
          path = sb[0];
          this.fileName = sb[1];
-         fs.makeAllDirectories(path);
       }
 
+
+      if (logger.isDebugEnabled())
+         logger.debug("reseting layer " + path.split(":")[0] + ":/" + AVMConstants.DIR_APPBASE);
+
+      this.avmSyncService.resetLayer(path.split(":")[0] + ":/" + AVMConstants.DIR_APPBASE);
+
+      if (logger.isDebugEnabled())
+         logger.debug("creating all directories in path " + path);
+
+      fs.makeAllDirectories(path);
+
       if (logger.isDebugEnabled())
          logger.debug("creating file " + this.fileName + " in " + path);
 
-      
-      this.avmSyncService.resetLayer(path.split(":")[0] + ":/" + AVMConstants.DIR_APPBASE);
-
       // put the content of the file into the AVM store
       if (fileContent != null)
       {