Index: release-kits/wirk3/ant-scripts/build.xml
===================================================================
--- release-kits/wirk3/ant-scripts/build.xml	(revision 17849)
+++ release-kits/wirk3/ant-scripts/build.xml	(revision 17898)
@@ -16,4 +16,5 @@
 
 	<!-- for the benefit of the shared scripts, set release-kit home -->
+	<property name="rk.name" value="wirk3"/>
 	<property name="rk.home" value="${wirk3.home}" />
 	<property name="rk.os" value="windows" />
Index: release-kits/wirk3/ant-scripts/compile.xml
===================================================================
--- release-kits/wirk3/ant-scripts/compile.xml	(revision 17849)
+++ release-kits/wirk3/ant-scripts/compile.xml	(revision 17898)
@@ -4,11 +4,11 @@
 	<target name="compile">
 		<antcall target="checkout-greenstone3" />
-		<antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/greenstone3" /></antcall>
-		<ant target="prepare-windows" dir="greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false">
+		<antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/compiled" /></antcall>
+		<ant target="prepare-windows" dir="compiled" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false">
 			<property name="app.version" value="${version}"/>
 			<property name="branch.path" value="${branch.path}"/>
 			<property name="branch.revision" value="${branch.revision}"/>
 		</ant>
-		<ant target="build-windows" dir="greenstone3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false">
+		<ant target="build-windows" dir="compiled" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false">
 			<property name="app.version" value="${version}"/>
 			<property name="branch.path" value="${branch.path}"/>
@@ -21,5 +21,5 @@
 	<target name="checkout-greenstone3">
 		<svn>
-			<checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3" revision="${branch.revision}"/>
+			<checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled" revision="${branch.revision}"/>
 		</svn>
 	</target>
@@ -32,20 +32,20 @@
 
 	<target name="prepare-documentation">
-		<mkdir dir="greenstone3/gsdl-manuals"/>
+		<mkdir dir="compiled/gsdl-manuals"/>
 		<svn>
-			<checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals" revision="${branch.revision}"/>
-			<checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared" revision="${branch.revision}"/>
+			<checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals" revision="${branch.revision}"/>
+			<checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared" revision="${branch.revision}"/>
 		</svn>
-		<javac srcdir="greenstone3/gsdl-manuals/shared" destdir="greenstone3/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac>
-		<unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>
+		<javac srcdir="compiled/gsdl-manuals/shared" destdir="compiled/gsdl-manuals/shared" debug="on"><include name="*.java"/></javac>
+		<unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
 
 		<echo>Define Classpath</echo>
 		<path id="documentation.compile.classpath">
-			<fileset dir="greenstone3/gsdl-manuals">
+			<fileset dir="compiled/gsdl-manuals">
 				<include name="**/*.jar"/>
 			</fileset>
-			<pathelement path="greenstone3/gsdl-manuals/shared"/>
-			<pathelement path="greenstone3/gsdl-manuals/manuals"/>
-			<pathelement path="greenstone3/gli/classes"/>
+			<pathelement path="compiled/gsdl-manuals/shared"/>
+			<pathelement path="compiled/gsdl-manuals/manuals"/>
+			<pathelement path="compiled/gli/classes"/>
 		</path>
 					
@@ -53,13 +53,13 @@
 		<java classname="org.apache.xalan.xslt.Process" classpathref="documentation.compile.classpath" fork="true">
 			<jvmarg value="-DGSDLHOME=${basedir}/greenstone" />
-			<arg value="-IN"/><arg file="greenstone3/gli/help/en/help.xml" />
-			<arg value="-XSL"/><arg file="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
-			<arg value="-OUT"/><arg file="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml" />
+			<arg value="-IN"/><arg file="compiled/gli/help/en/help.xml" />
+			<arg value="-XSL"/><arg file="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
+			<arg value="-OUT"/><arg file="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml" />
 		</java>
 					
 		<echo>Run generate-pdf.bat</echo>
-		<exec dir="${basedir}\greenstone3/gsdl-manuals/manuals" executable="cmd">
+		<exec dir="${basedir}\compiled/gsdl-manuals/manuals" executable="cmd">
 			<arg value="/C" />
-			<arg file="${basedir}/greenstone3/gsdl-manuals/manuals/generate-pdf.bat" />
+			<arg file="${basedir}/compiled/gsdl-manuals/manuals/generate-pdf.bat" />
 			<arg value="u" />
 			<arg value="en" />
Index: release-kits/wirk3/ant-scripts/create-components.xml
===================================================================
--- release-kits/wirk3/ant-scripts/create-components.xml	(revision 17849)
+++ release-kits/wirk3/ant-scripts/create-components.xml	(revision 17898)
@@ -2,5 +2,5 @@
 <project name="wirk3-create-components" default="create-components">
 
-	<!-- create components from the distribution folder -->
+	<!-- create components from the distributions folder -->
 
 	<!-- 1st level -->
@@ -44,5 +44,5 @@
 				
 		<copy todir="components/tmp/core" overwrite="true">
-			<fileset dir="distribution/greenstone3">
+			<fileset dir="distributions/web">
 				<include name="**/*"/>
 
@@ -90,5 +90,5 @@
 		<mkdir dir="components/tmp/imagemagick"/>
 		<copy todir="components/tmp/imagemagick" overwrite="true">
-			<fileset dir="distribution/greenstone3/gs2build/bin/windows/">
+			<fileset dir="distributions/web/gs2build/bin/windows/">
 				<include name="imagemagick/**/*"/>
 			</fileset>
@@ -108,5 +108,5 @@
 		<mkdir dir="components/tmp/ghostscript"/>
 		<copy todir="components/tmp/ghostscript" overwrite="true">
-			<fileset dir="distribution/greenstone3/gs2build/bin/windows/">
+			<fileset dir="distributions/web/gs2build/bin/windows/">
 				<include name="ghostscript/**/*"/>
 			</fileset>
@@ -124,5 +124,5 @@
 		<mkdir dir="components/tmp/sourcecode"/>
 		<copy todir="components/tmp/sourcecode" overwrite="true">
-				<fileset dir="distribution/greenstone3">
+				<fileset dir="distributions/web">
 					<include name="src/**/*"/>
 					<include name="gs2build/common-src/**/*"/>
@@ -145,5 +145,5 @@
 
 		<copy todir="components/tmp/ant" overwrite="true">
-			<fileset dir="distribution/greenstone3/packages">
+			<fileset dir="distributions/web/packages">
 				<include name="ant/**/*"/>
 			</fileset>
@@ -161,5 +161,5 @@
 		<mkdir dir="components/tmp/tomcat"/>
 		<copy todir="components/tmp/tomcat" overwrite="true">
-			<fileset dir="distribution/greenstone3/packages">
+			<fileset dir="distributions/web/packages">
 				<include name="tomcat/**/*"/>
 			</fileset>
Index: release-kits/wirk3/ant-scripts/create-distribution.xml
===================================================================
--- release-kits/wirk3/ant-scripts/create-distribution.xml	(revision 17849)
+++ release-kits/wirk3/ant-scripts/create-distribution.xml	(revision 17898)
@@ -6,12 +6,12 @@
 		<!-- create distribution -->
 		<antcall target="export-greenstone3-gli" />
-		<antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distribution/greenstone3" /></antcall>
-		<antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli" /></antcall>
+		<antcall target="greenstone3-set-version-numbers"><param name="greenstone3basedir" value="${basedir}/distributions/web" /></antcall>
+		<antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli" /></antcall>
 		<antcall target="insert-user-manual"/>
 		<antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk3-targets -->
 
-		<antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
+		<antcall target="copy-web-to-source" /> <!-- from gs3-targets -->
 
-		<ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
+		<ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
 			<property name="app.version" value="${version}"/>
 			<property name="branch.path" value="${branch.path}"/>
@@ -21,10 +21,10 @@
 		<antcall target="insert-icon"/>
 
-		<ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
+		<ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
 			<property name="app.version" value="${version}"/>
 			<property name="branch.path" value="${branch.path}"/>
 			<property name="branch.revision" value="${branch.revision}"/>
 		</ant>
-		<ant target="create-distribution-3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
+		<ant target="create-distribution-3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" inheritAll="false">
 			<property name="app.version" value="${version}"/>
 			<property name="branch.path" value="${branch.path}"/>
@@ -37,9 +37,9 @@
 
 	<target name="export-greenstone3-gli">
-		<mkdir dir="distribution"/>
-		<delete dir="distribution/greenstone3"/>
+		<mkdir dir="distributions"/>
+		<delete dir="distributions/web"/>
 		<svn>
-			<export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3" revision="${branch.revision}"/>
-			<export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli" revision="${branch.revision}"/>
+			<export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web" revision="${branch.revision}"/>
+			<export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli" revision="${branch.revision}"/>
 		</svn>
 	</target>
@@ -47,24 +47,24 @@
 	<target name="copy-over-build-xml">
 		<if><bool><istrue value="${execute}"/></bool>
-			<move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
+			<move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/>
 		</if>
 	</target>
 
 	<target name="insert-user-manual">
-		<copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
+		<copy file="compiled/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distributions/web/docs/manual/gs2_user_en.pdf"/>
 	</target>
 
 	<target name="insert-compiled-binaries">
 
-		<delete dir="distribution/greenstone3/lib/jni"/>
-		<copy todir="distribution/greenstone3/lib/jni"><fileset dir="greenstone3/lib/jni"/></copy>
+		<delete dir="distributions/web/lib/jni"/>
+		<copy todir="distributions/web/lib/jni"><fileset dir="compiled/lib/jni"/></copy>
 		
-		<delete dir="distribution/greenstone3/gs2build/bin/windows"/>
-		<copy todir="distribution/greenstone3/gs2build/bin/windows"><fileset dir="greenstone3/gs2build/bin/windows"/></copy>
+		<delete dir="distributions/web/gs2build/bin/windows"/>
+		<copy todir="distributions/web/gs2build/bin/windows"><fileset dir="compiled/gs2build/bin/windows"/></copy>
 
-		<delete dir="distribution/greenstone3/gs2build/bin/java"/>
-		<copy todir="distribution/greenstone3/gs2build/bin/java"><fileset dir="greenstone3/gs2build/bin/java"/></copy>
+		<delete dir="distributions/web/gs2build/bin/java"/>
+		<copy todir="distributions/web/gs2build/bin/java"><fileset dir="compiled/gs2build/bin/java"/></copy>
 
-		<copy todir="distribution/greenstone3/bin" file="greenstone3/bin/search4j.exe"/>
+		<copy todir="distributions/web/bin" file="compiled/bin/search4j.exe"/>
 	</target>
 	
@@ -72,11 +72,5 @@
 		<copy
 			file="${wirk3.home}/greenstone3/icon/icon.ico"
-			tofile="distribution/greenstone3/resources/images/gs3.ico"/>
-	</target>
-
-	<target name="rename-build-xml-for-transit">
-		<move
-			file="distribution/greenstone3/build.xml"
-			tofile="distribution/greenstone3/greenstone3-build.xml" />
+			tofile="distributions/web/resources/images/gs3.ico"/>
 	</target>
 
Index: release-kits/wirk3/ant-scripts/create-installer.xml
===================================================================
--- release-kits/wirk3/ant-scripts/create-installer.xml	(revision 17849)
+++ release-kits/wirk3/ant-scripts/create-installer.xml	(revision 17898)
@@ -15,5 +15,5 @@
 		<copy todir="${basedir}/installer/classes" overwrite="true">
 			<fileset dir="${wirk3.home}/packages/7za" includes="7za.exe"/>
-			<fileset file="${basedir}/distribution/greenstone3/LICENSE.txt"/>
+			<fileset file="${basedir}/distributions/web/LICENSE.txt"/>
 		</copy>
 
