Index: /release-kits/lirk2/ant-scripts/build.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/build.xml	(revision 17897)
+++ /release-kits/lirk2/ant-scripts/build.xml	(revision 17898)
@@ -13,4 +13,5 @@
 
 	<!-- for the benefit of the shared scripts, set release-kit home -->
+	<property name="rk.name" value="lirk2"/>
 	<property name="rk.home" value="${lirk2.home}" />
 	<property name="rk.os" value="linux" />
Index: /release-kits/lirk2/ant-scripts/compile.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/compile.xml	(revision 17897)
+++ /release-kits/lirk2/ant-scripts/compile.xml	(revision 17898)
@@ -6,4 +6,5 @@
 		<!-- checkout -->
 		<antcall target="checkout-gsdl-gli" />
+		<antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
 		
 		<!-- configure -->
@@ -29,6 +30,6 @@
 	<target name="checkout-gsdl-gli">
 		<svn>
-			<checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
-			<checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
+			<checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/>
+			<checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/>
 		</svn>
 	</target>
@@ -36,17 +37,17 @@
 	<target name="add-static-to-configure-in">
 		<rsr
-			file="${basedir}/gsdl/configure.in"
+			file="${basedir}/compiled/configure.in"
 			pattern="^LDFLAGS=.*$"
 			replacement="LDFLAGS=-static" />
-		<exec dir="${basedir}/gsdl" executable="autoconf" output="${basedir}/gsdl/configure"><arg value="configure.in"/></exec>
+		<exec dir="${basedir}/compiled" executable="autoconf" output="${basedir}/compiled/configure"><arg value="configure.in"/></exec>
 	</target>
 
 	<target name="set-environment-in-packages-configure">
 		<rsr
-			file="${basedir}/gsdl/common-src/packages/configure"
+			file="${basedir}/compiled/common-src/packages/configure"
 			pattern="^ENVIRONMENT=.*$"
 			replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
 		<rsr
-			file="${basedir}/gsdl/build-src/packages/configure"
+			file="${basedir}/compiled/build-src/packages/configure"
 			pattern="^ENVIRONMENT=.*$"
 			replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
@@ -54,5 +55,5 @@
 
 	<target name="run-configure">
-		<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure">
+		<exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure">
 			<env key="LDFLAGS" value="-static"/>
 		</exec>
@@ -61,17 +62,17 @@
 	<target name="makefiles-add-static">
 		<rsr
-			file="${basedir}/gsdl/build-src/packages/wv/wv-gs/Makefile"
+			file="${basedir}/compiled/build-src/packages/wv/wv-gs/Makefile"
 			pattern="^LDFLAGS =.*$"
 			replacement="LDFLAGS = -static" />
 		<rsr
-			file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile"
+			file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile"
 			pattern="^LDFLAGS =.*$"
 			replacement="LDFLAGS = -static" />
 		<rsr
-			file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile"
+			file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile"
 			pattern="^LDFLAGS =.*$"
 			replacement="LDFLAGS = -static" />
 		<rsr
-			file="${basedir}/gsdl/build-src/packages/rtftohtml/rtftohtml_src/Makefile"
+			file="${basedir}/compiled/build-src/packages/rtftohtml/rtftohtml_src/Makefile"
 			pattern="(-o rtftohtml.{2}EXEEXT.{1})"
 			replacement="$1 -static" />
@@ -79,19 +80,19 @@
 
 	<target name="run-make">
-		<exec dir="${basedir}/gsdl" executable="make"/>
+		<exec dir="${basedir}/compiled" executable="make"/>
 	</target>
 
 
 	<target name="run-make-install">
-		<exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec>
+		<exec dir="${basedir}/compiled" executable="make"><arg value="install"/></exec>
 	</target>
 
 	<target name="copy-library-oai">
-		<exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/linux/library"/></exec>
-		<exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/linux/oaiserver"/></exec>
+		<exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/linux/library"/></exec>
+		<exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/oaiserver ${basedir}/compiled/bin/linux/oaiserver"/></exec>
 	</target>
 
 	<target name="strip-execs">
-		<exec dir="${basedir}/gsdl/bin/linux" executable="find">
+		<exec dir="${basedir}/compiled/bin/linux" executable="find">
 			<arg line="! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
 		</exec>
@@ -99,5 +100,5 @@
 
 	<target name="build-demo-collection">
-		<exec dir="${basedir}/gsdl" executable="${lirk2.home}/resources/build-demo.sh"/>
+		<exec dir="${basedir}/compiled" executable="${lirk2.home}/resources/build-demo.sh"/>
 	</target>
 
Index: /release-kits/lirk2/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/create-distribution.xml	(revision 17897)
+++ /release-kits/lirk2/ant-scripts/create-distribution.xml	(revision 17898)
@@ -5,5 +5,5 @@
 
 		<antcall target="export-gsdl-gli" />
-		<antcall target="dist-set-version" />
+		<antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall>
 		<antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
 		<antcall target="drop-in-docs" />
@@ -30,15 +30,4 @@
 			<export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/>
 		</svn>
-	</target>
-	
-	<target name="dist-set-version">
-		<echo level="info">Setting version in src/lib/gsdlconf.h</echo>
-		<rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
-
-		<echo level="info">Setting version in Install.sh</echo>
-		<rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
-
-		<echo level="info">Setting version in etc/VERSION</echo>
-		<rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
 	</target>
 
@@ -88,7 +77,7 @@
 		<echo level="info">Dropping compiled binaries into distribution</echo>
 		<delete dir="distributions/web/bin/linux" />
-		<exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/linux distributions/web/bin"/></exec>
-		<exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>
-		<exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>
+		<exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/linux distributions/web/bin"/></exec>
+		<exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library distributions/web/cgi-bin"/></exec>
+		<exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>
 	</target>
 
@@ -96,5 +85,5 @@
 		<echo level="info">Dropping rebuilt demo collection into distribution</echo>
 		<delete dir="distributions/web/collect/demo" />
-		<exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec>
+		<exec dir="${basedir}" executable="cp"><arg line="-r compiled/collect/demo distributions/web/collect"/></exec>
 	</target>
 
Index: /release-kits/lirk3/ant-scripts/build.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/build.xml	(revision 17897)
+++ /release-kits/lirk3/ant-scripts/build.xml	(revision 17898)
@@ -13,4 +13,5 @@
 
 	<!-- for the benefit of the shared scripts, set release-kit home -->
+	<property name="rk.name" value="lirk3"/>
 	<property name="rk.home" value="${lirk3.home}" />
 	<property name="rk.os" value="linux" />
Index: /release-kits/lirk3/ant-scripts/compile.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/compile.xml	(revision 17897)
+++ /release-kits/lirk3/ant-scripts/compile.xml	(revision 17898)
@@ -9,20 +9,20 @@
 		<!-- preparation -->
 		<antcall target="greenstone3-set-version-numbers">
-			<param name="greenstone3basedir" value="${basedir}/greenstone3"/>
+			<param name="greenstone3basedir" value="${basedir}/compiled"/>
 		</antcall>
-		<ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
+		<ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
 
 		<antcall target="tweak-configure-scripts" />
 
 		<!-- update -->
-		<ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/>
+		<ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/>
 
 		<!-- configure -->
 		<antcall target="regenerate-configure"/>
-		<ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
+		<ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
 		<antcall target="tweak-makefiles" />
 
 		<!-- build -->
-		<ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
+		<ant dir="compiled" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
 		<antcall target="linux-strip-execs" />
 
@@ -37,5 +37,5 @@
 	<target name="checkout-greenstone3">
 		<svn>
-			<checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3"/>
+			<checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled"/>
 		</svn>
 	</target>
@@ -48,8 +48,8 @@
 
 	<target name="regenerate-configure">
-		<exec dir="greenstone3/gs2build" executable="autoconf" output="greenstone3/gs2build/configure">
+		<exec dir="compiled/gs2build" executable="autoconf" output="compiled/gs2build/configure">
 			<arg line="configure.in"/>
 		</exec>
-		<chmod file="greenstone3/gs2build/configure" perm="+x"/>
+		<chmod file="compiled/gs2build/configure" perm="+x"/>
 	</target>
 
@@ -63,5 +63,5 @@
 
 	<target name="linux-strip-execs">
-		<exec dir="greenstone3/gs2build/bin/linux" executable="find">
+		<exec dir="compiled/gs2build/bin/linux" executable="find">
 			<arg line="! -name . -exec strip {} &#59;"/>
 		</exec>
@@ -69,33 +69,33 @@
 
 	<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"/>
-			<checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared"/>
+			<checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals"/>
+			<checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared"/>
 		</svn>
-		<javac srcdir="greenstone3/gsdl-manuals/shared"
-		      destdir="greenstone3/gsdl-manuals/shared"
+		<javac srcdir="compiled/gsdl-manuals/shared"
+		      destdir="compiled/gsdl-manuals/shared"
 		      debug="on">
 			<include name="*.java"/>
 		</javac>
-		<unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>
+		<unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
 
 		<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="compiled/gsdl-manuals/shared"/>
+			<pathelement path="compiled/gsdl-manuals/manuals"/>
 		</path>
 
-		<java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml">
-			<arg value="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
-			<arg value="greenstone3/gli/help/en/help.xml" />
-			<arg value="greenstone3" />
+		<java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml">
+			<arg value="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
+			<arg value="compiled/gli/help/en/help.xml" />
+			<arg value="compiled" />
 		</java>
 
-		<chmod perm="a+x" file="greenstone3/gsdl-manuals/shared/fop/fop.sh"/>
+		<chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/>
 		<echo>Run generate-pdf.sh</echo>
-		<exec dir="greenstone3/gsdl-manuals/manuals" executable="/bin/sh">
+		<exec dir="compiled/gsdl-manuals/manuals" executable="/bin/sh">
 			<arg line="generate-pdf.sh u en" />
 		</exec>
@@ -109,6 +109,6 @@
 
 	<target name="mgpp-add-static">
-		<rsr file="greenstone3/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
-		<exec dir="greenstone3/gs2build/common-src/indexers/mgpp" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mgpp/configure">
+		<rsr file="compiled/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
+		<exec dir="compiled/gs2build/common-src/indexers/mgpp" executable="autoconf" output="compiled/gs2build/common-src/indexers/mgpp/configure">
 			<arg line="configure.in"/>
 		</exec>
@@ -116,6 +116,6 @@
 
 	<target name="mg-add-static">
-		<rsr file="greenstone3/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
-		<exec dir="greenstone3/gs2build/common-src/indexers/mg" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mg/configure">
+		<rsr file="compiled/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
+		<exec dir="compiled/gs2build/common-src/indexers/mg" executable="autoconf" output="compiled/gs2build/common-src/indexers/mg/configure">
 			<arg line="configure.in"/>
 		</exec>
@@ -123,27 +123,27 @@
 
 	<target name="gs2build-add-static">
-		<rsr file="greenstone3/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
-		<rsr file="greenstone3/gs2build/build-src/packages/configure"  pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
-		<rsr file="greenstone3/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" />
+		<rsr file="compiled/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
+		<rsr file="compiled/gs2build/build-src/packages/configure"  pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
+		<rsr file="compiled/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" />
 	</target>
 
 	<target name="wv-add-static">
-		<rsr file="greenstone3/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
+		<rsr file="compiled/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
 	</target>
 
 	<target name="xlhtml-add-static">
-		<rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
+		<rsr file="compiled/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
 	</target>
 
 	<target name="ppthtml-add-static">
-		<rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
+		<rsr file="compiled/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
 	</target>
 
 	<target name="rtftohtml-add-static">
-		<rsr file="greenstone3/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
+		<rsr file="compiled/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
 	</target>
 
 	<target name="gdbm-add-static">
-		<rsr file="greenstone3/src/packages/javagdbm/jni/Makefile" pattern="^(GDBM_LIBS)\s*=\s*(.*)-lgdbm(.*)$" replacement="$1=$2/usr/lib/libgdbm.a$3" />
+		<rsr file="compiled/src/packages/javagdbm/jni/Makefile" pattern="^(GDBM_LIBS)\s*=\s*(.*)-lgdbm(.*)$" replacement="$1=$2/usr/lib/libgdbm.a$3" />
 	</target>
 
Index: /release-kits/lirk3/ant-scripts/create-components.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/create-components.xml	(revision 17897)
+++ /release-kits/lirk3/ant-scripts/create-components.xml	(revision 17898)
@@ -2,5 +2,5 @@
 <project name="lirk3-create-components" default="create-components">
 
-	<!-- create components from the distribution folder -->
+	<!-- create components from the distributions folder -->
 
 	<!-- 1st level -->
@@ -42,5 +42,5 @@
 				
 		<copy todir="components/tmp/core" overwrite="true">
-			<fileset dir="distribution/greenstone3">
+			<fileset dir="distributions/web">
 				<include name="**/*"/>
 
@@ -58,6 +58,6 @@
 				<exclude name="packages/tomcat"/>
 				<exclude name="packages/tomcat/**/*"/>
-				<exclude name="distributions/greenstone3/gs2build/bin/linux/imagemagick"/>
-				<exclude name="distributions/greenstone3/gs2build/bin/linux/imagemagick/**/*"/>
+				<exclude name="distributions/web/gs2build/bin/linux/imagemagick"/>
+				<exclude name="distributions/web/gs2build/bin/linux/imagemagick/**/*"/>
 
 			</fileset>
@@ -78,5 +78,5 @@
 
 		<copy todir="components/tmp/sourcecode" overwrite="true">
-				<fileset dir="distribution/greenstone3">
+				<fileset dir="distributions/web">
 					<include name="src/**/*"/>
 					<include name="gs2build/common-src/**/*"/>
@@ -100,5 +100,5 @@
 
 		<copy todir="components/tmp/ant" overwrite="true">
-			<fileset dir="distribution/greenstone3/packages">
+			<fileset dir="distributions/web/packages">
 				<include name="ant/**/*"/>
 			</fileset>
@@ -119,5 +119,5 @@
 
 		<copy todir="components/tmp/tomcat" overwrite="true">
-			<fileset dir="distribution/greenstone3/packages">
+			<fileset dir="distributions/web/packages">
 				<include name="tomcat/**/*"/>
 			</fileset>
@@ -138,5 +138,5 @@
 
 		<copy todir="components/tmp/imagemagick" overwrite="true">
-			<fileset dir="distribution/greenstone3/gs2build/bin/linux">
+			<fileset dir="distributions/web/gs2build/bin/linux">
 				<include name="imagemagick/**/*"/>
 			</fileset>
Index: /release-kits/lirk3/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/create-distribution.xml	(revision 17897)
+++ /release-kits/lirk3/ant-scripts/create-distribution.xml	(revision 17898)
@@ -6,20 +6,20 @@
 		<!-- 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="sh"/></antcall> <!-- from rk3-targets -->
 
-		<antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
+		<antcall target="copy-web-to-source" /> <!-- from init -->
 
-		<ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
+		<ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-1" inheritAll="false">
 			<property name="app.version" value="${version}"/>
 			<property name="branch.path" value="${branch.path}"/>
 		</ant>
-		<ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2" inheritAll="false">
+		<ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-2" inheritAll="false">
 			<property name="app.version" value="${version}"/>
 			<property name="branch.path" value="${branch.path}"/>
 		</ant>
-		<ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3" inheritAll="false">
+		<ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distributions/web" target="create-distribution-3" inheritAll="false">
 			<property name="app.version" value="${version}"/>
 			<property name="branch.path" value="${branch.path}"/>
@@ -29,43 +29,43 @@
 		<antcall target="export-imagemagick-linux-binaries" />
 	
-		<antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init -->
+		<antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init -->
 
 	</target>
 
 	<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"/>
-			<export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
+			<export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/>
+			<export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/>
 		</svn>
 	</target>
 	
 	<target name="export-imagemagick-linux-binaries">
-		<delete dir="distribution/greenstone3/gs2build/bin/linux/imagemagick"/>
+		<delete dir="distributions/web/gs2build/bin/linux/imagemagick"/>
 		<svn>
-			<export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distribution/greenstone3/gs2build/bin/linux/imagemagick"/>
+			<export srcurl="${svn.root}/other-projects/trunk/linux-binaries/imagemagick" destPath="distributions/web/gs2build/bin/linux/imagemagick"/>
 		</svn>
 	</target>
 
 	<target name="copy-over-build-xml">
-		<move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
+		<move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/>
 	</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"/>
-		<exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
+		<delete dir="distributions/web/lib/jni"/>
+		<exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec>
 
-		<delete dir="distribution/greenstone3/gs2build/bin/linux"/>
-		<exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec>
+		<delete dir="distributions/web/gs2build/bin/linux"/>
+		<exec executable="cp"><arg line="-r compiled/gs2build/bin/linux distributions/web/gs2build/bin"/></exec>
 
-		<delete dir="distribution/greenstone3/gs2build/bin/java"/>
-		<exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>
+		<delete dir="distributions/web/gs2build/bin/java"/>
+		<exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec>
 
-		<exec executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec>
+		<exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec>
 
 	</target>
Index: /release-kits/lirk3/ant-scripts/create-installer.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/create-installer.xml	(revision 17897)
+++ /release-kits/lirk3/ant-scripts/create-installer.xml	(revision 17898)
@@ -13,5 +13,5 @@
 
 		<copy todir="${basedir}/installer/classes" overwrite="true">
-			<fileset file="${basedir}/distribution/greenstone3/LICENSE.txt"/>
+			<fileset file="${basedir}/distributions/web/LICENSE.txt"/>
 		</copy>
 
Index: /release-kits/mark2/ant-scripts/build.xml
===================================================================
--- /release-kits/mark2/ant-scripts/build.xml	(revision 17897)
+++ /release-kits/mark2/ant-scripts/build.xml	(revision 17898)
@@ -16,6 +16,8 @@
 
 	<!-- for the benefit of the shared scripts, set release-kit home -->
+	<property name="rk.name" value="mark2"/>
 	<property name="rk.home" value="${mark2.home}" />
 	<property name="rk.os" value="linux" />
+	<!-- os.suffix set dynamically below -->
 
 	<!-- IMPORT OTHER ANT SCRIPTS -->
Index: /release-kits/mark2/ant-scripts/compile.xml
===================================================================
--- /release-kits/mark2/ant-scripts/compile.xml	(revision 17897)
+++ /release-kits/mark2/ant-scripts/compile.xml	(revision 17898)
@@ -6,4 +6,5 @@
 		<!-- checkout -->
 		<antcall target="checkout-gsdl-gli" />
+		<antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
 		
 		<!-- configure -->
@@ -27,11 +28,11 @@
 	<target name="checkout-gsdl-gli">
 		<svn javahl="false">
-			<checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
-			<checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
+			<checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/>
+			<checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/>
 		</svn>
 	</target>
 
 	<target name="run-configure">
-		<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure">
+		<exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure">
 			<arg line="--with-gdbm=${mark2.home}/mac/${processor}/gdbm"/>
 		</exec>
@@ -39,27 +40,27 @@
 
 	<target name="tweak-makefiles">
-		<rsr file="${basedir}/gsdl/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
-		<rsr file="${basedir}/gsdl/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
-		<rsr file="${basedir}/gsdl/common-src/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
-		<rsr file="${basedir}/gsdl/common-src/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
-		<rsr file="${basedir}/gsdl/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
-		<rsr file="${basedir}/gsdl/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
+		<rsr file="${basedir}/compiled/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+		<rsr file="${basedir}/compiled/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+		<rsr file="${basedir}/compiled/common-src/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+		<rsr file="${basedir}/compiled/common-src/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+		<rsr file="${basedir}/compiled/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
+		<rsr file="${basedir}/compiled/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
 	</target>
 
 	<target name="run-make">
-		<exec dir="${basedir}/gsdl" executable="make"/>
+		<exec dir="${basedir}/compiled" executable="make"/>
 	</target>
 
 	<target name="run-make-install">
-		<exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec>
+		<exec dir="${basedir}/compiled" executable="make"><arg value="install"/></exec>
 	</target>
 
 	<target name="copy-library-oai">
-		<exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/darwin/library"/></exec>
-		<exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/darwin/oaiserver"/></exec>
+		<exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/darwin/library"/></exec>
+		<exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/oaiserver ${basedir}/compiled/bin/darwin/oaiserver"/></exec>
 	</target>
 
 	<target name="strip-execs">
-		<exec dir="${basedir}/gsdl/bin/darwin" executable="find">
+		<exec dir="${basedir}/compiled/bin/darwin" executable="find">
 			<arg line=". ! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
 		</exec>
@@ -67,5 +68,5 @@
 
 	<target name="build-demo-collection">
-		<exec dir="${basedir}/gsdl" executable="${mark2.home}/resources/build-demo.sh"/>
+		<exec dir="${basedir}/compiled" executable="${mark2.home}/resources/build-demo.sh"/>
 	</target>
 
Index: /release-kits/mark2/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/mark2/ant-scripts/create-distribution.xml	(revision 17897)
+++ /release-kits/mark2/ant-scripts/create-distribution.xml	(revision 17898)
@@ -5,5 +5,5 @@
 
 		<antcall target="export-gsdl-gli" />
-		<antcall target="dist-set-version" />
+		<antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall>
 		<antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
 		<antcall target="drop-in-docs" />
@@ -47,26 +47,11 @@
 	</target>
 
-	<target name="dist-set-version">
-		<echo level="info">Setting version in common-src/src/lib/gsdlconf.h</echo>
-		<rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
-
-		<echo level="info">Setting version in Install.sh</echo>
-		<rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
-
-		<echo level="info">Setting version in etc/VERSION</echo>
-		<rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
-	</target>
-
-	<target name="dist-set-gli-version">
-
-	</target>
-
 	<target name="drop-in-binaries">
 		<echo level="info">Dropping compiled binaries into distribution</echo>
 		<delete dir="distributions/web/bin/linux" />
 		<delete dir="distributions/web/bin/darwin" />
-		<exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/darwin distributions/web/bin"/></exec>
-		<exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>
-		<exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>
+		<exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/darwin distributions/web/bin"/></exec>
+		<exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library distributions/web/cgi-bin"/></exec>
+		<exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>
 	</target>
 
@@ -74,5 +59,5 @@
 		<echo level="info">Dropping rebuilt demo collection into distribution</echo>
 		<delete dir="distributions/web/collect/demo" />
-		<exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec>
+		<exec dir="${basedir}" executable="cp"><arg line="-r compiled/collect/demo distributions/web/collect"/></exec>
 	</target>
 
Index: /release-kits/mark3/ant-scripts/build.xml
===================================================================
--- /release-kits/mark3/ant-scripts/build.xml	(revision 17897)
+++ /release-kits/mark3/ant-scripts/build.xml	(revision 17898)
@@ -16,6 +16,8 @@
 
 	<!-- for the benefit of the shared scripts, set release-kit home -->
+	<property name="rk.name" value="mark3"/>
 	<property name="rk.home" value="${mark3.home}" />
 	<property name="rk.os" value="linux" />
+	<!-- os.suffix set dynamically below -->
 
 	<!-- IMPORT OTHER ANT SCRIPTS -->
Index: /release-kits/mark3/ant-scripts/compile.xml
===================================================================
--- /release-kits/mark3/ant-scripts/compile.xml	(revision 17897)
+++ /release-kits/mark3/ant-scripts/compile.xml	(revision 17898)
@@ -9,18 +9,18 @@
 		<!-- preparation -->
 		<antcall target="greenstone3-set-version-numbers">
-			<param name="greenstone3basedir" value="${basedir}/greenstone3"/>
+			<param name="greenstone3basedir" value="${basedir}/compiled"/>
 		</antcall>
 		<antcall target="set-gdbm-installed-path" />
-		<ant target="prepare-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
+		<ant target="prepare-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
 		
 		<!-- update -->
-		<ant target="update-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
+		<ant target="update-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
 
 		<!-- configure -->
-		<ant target="configure-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
+		<ant target="configure-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
 		<antcall target="tweak-makefiles" />
 
 		<!-- build -->
-		<ant target="build-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
+		<ant target="build-unix" dir="compiled" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>
 		<antcall target="linux-strip-execs" />
 
@@ -35,29 +35,29 @@
 	<target name="checkout-greenstone3">
 		<svn javahl="false">
-			<checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3"/>
+			<checkout url="${svn.root}/greenstone3/${branch.path}" destPath="compiled"/>
 		</svn>
 	</target>
 
 	<target name="set-version-number-property">
-		<rsr file="greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
+		<rsr file="compiled/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
 	</target>
 
 	<target name="set-gdbm-installed-path">
-		<rsr file="greenstone3/build.properties" pattern="(gdbm.installed.path=).*" replacement="$1${mark3.home}/mac/${processor}/gdbm"/>
+		<rsr file="compiled/build.properties" pattern="(gdbm.installed.path=).*" replacement="$1${mark3.home}/mac/${processor}/gdbm"/>
 	</target>
 
 	<target name="tweak-makefiles">
 		<rsr
-			file="${basedir}/greenstone3/gs2build/common-src/src/gdbmedit/db2txt/Makefile"
+			file="${basedir}/compiled/gs2build/common-src/src/gdbmedit/db2txt/Makefile"
 			pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
 			replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
 
 		<rsr
-			file="${basedir}/greenstone3/gs2build/common-src/src/gdbmedit/txt2db/Makefile"
+			file="${basedir}/compiled/gs2build/common-src/src/gdbmedit/txt2db/Makefile"
 			pattern="^(LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
 			replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
 
 		<rsr
-			file="${basedir}/greenstone3/src/packages/javagdbm/jni/Makefile"
+			file="${basedir}/compiled/src/packages/javagdbm/jni/Makefile"
 			pattern="^(GDBM_LIBS ?=.*)-L${mark3.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$"
 			replacement="$1${mark3.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
@@ -65,5 +65,5 @@
 
 	<target name="linux-strip-execs">
-		<exec dir="greenstone3/gs2build/bin/darwin" executable="find">
+		<exec dir="compiled/gs2build/bin/darwin" executable="find">
 			<arg line=". ! -name . -exec strip {} &#59;"/>
 		</exec>
@@ -71,33 +71,33 @@
 
 	<target name="prepare-documentation">
-		<mkdir dir="greenstone3/gsdl-manuals"/>
+		<mkdir dir="compiled/gsdl-manuals"/>
 		<svn javahl="false">
-			<checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="greenstone3/gsdl-manuals/manuals"/>
-			<checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="greenstone3/gsdl-manuals/shared"/>
+			<checkout url="${svn.root}/documentation/${branch.path}/manuals" destPath="compiled/gsdl-manuals/manuals"/>
+			<checkout url="${svn.root}/documentation/${branch.path}/shared" destPath="compiled/gsdl-manuals/shared"/>
 		</svn>
-		<javac srcdir="greenstone3/gsdl-manuals/shared"
-		      destdir="greenstone3/gsdl-manuals/shared"
+		<javac srcdir="compiled/gsdl-manuals/shared"
+		      destdir="compiled/gsdl-manuals/shared"
 		      debug="on">
 			<include name="*.java"/>
 		</javac>
-		<unzip src="greenstone3/gsdl-manuals/shared/fop.zip" dest="greenstone3/gsdl-manuals/shared"/>
+		<unzip src="compiled/gsdl-manuals/shared/fop.zip" dest="compiled/gsdl-manuals/shared"/>
 
 		<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="compiled/gsdl-manuals/shared"/>
+			<pathelement path="compiled/gsdl-manuals/manuals"/>
 		</path>
 
-		<java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="greenstone3/gsdl-manuals/manuals/xml-source/en/help-en.xml">
-			<arg value="greenstone3/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
-			<arg value="greenstone3/gli/help/en/help.xml" />
-			<arg value="greenstone3" />
+		<java classname="ApplyXSLT" classpathref="documentation.compile.classpath" output="compiled/gsdl-manuals/manuals/xml-source/en/help-en.xml">
+			<arg value="compiled/gsdl-manuals/manuals/processing/gen-gli-help-to-manual-chapter.xsl" />
+			<arg value="compiled/gli/help/en/help.xml" />
+			<arg value="compiled" />
 		</java>
 
-		<chmod perm="a+x" file="greenstone3/gsdl-manuals/shared/fop/fop.sh"/>
+		<chmod perm="a+x" file="compiled/gsdl-manuals/shared/fop/fop.sh"/>
 		<echo>Run generate-pdf.sh</echo>
-		<exec dir="greenstone3/gsdl-manuals/manuals" executable="/bin/sh">
+		<exec dir="compiled/gsdl-manuals/manuals" executable="/bin/sh">
 			<arg line="generate-pdf.sh u en" />
 		</exec>
Index: /release-kits/mark3/ant-scripts/create-components.xml
===================================================================
--- /release-kits/mark3/ant-scripts/create-components.xml	(revision 17897)
+++ /release-kits/mark3/ant-scripts/create-components.xml	(revision 17898)
@@ -2,5 +2,5 @@
 <project name="mark3-create-components" default="create-components">
 
-	<!-- create components from the distribution folder -->
+	<!-- create components from the distributions folder -->
 
 	<!-- 1st level -->
@@ -43,5 +43,5 @@
 				
 		<copy todir="components/tmp/core" overwrite="true">
-			<fileset dir="distribution/greenstone3">
+			<fileset dir="distributions/web">
 				<include name="**/*"/>
 
@@ -85,5 +85,5 @@
 
 		<copy todir="components/tmp/sourcecode" overwrite="true">
-				<fileset dir="distribution/greenstone3">
+				<fileset dir="distributions/web">
 					<include name="src/**/*"/>
 					<include name="gs2build/common-src/**/*"/>
@@ -108,5 +108,5 @@
 
 		<copy todir="components/tmp/ant" overwrite="true">
-			<fileset dir="distribution/greenstone3/packages">
+			<fileset dir="distributions/web/packages">
 				<include name="ant/**/*"/>
 			</fileset>
@@ -127,5 +127,5 @@
 
 		<copy todir="components/tmp/tomcat" overwrite="true">
-			<fileset dir="distribution/greenstone3/packages">
+			<fileset dir="distributions/web/packages">
 				<include name="tomcat/**/*"/>
 			</fileset>
@@ -146,5 +146,5 @@
 
 		<copy todir="components/tmp/imagemagick" overwrite="true">
-			<fileset dir="distribution/greenstone3/gs2build/bin/darwin">
+			<fileset dir="distributions/web/gs2build/bin/darwin">
 				<include name="imagemagick/**/*"/>
 			</fileset>
@@ -165,5 +165,5 @@
 
 		<copy todir="components/tmp/ghostscript" overwrite="true">
-			<fileset dir="distribution/greenstone3/gs2build/bin/darwin">
+			<fileset dir="distributions/web/gs2build/bin/darwin">
 				<include name="ghostscript/**/*"/>
 			</fileset>
Index: /release-kits/mark3/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/mark3/ant-scripts/create-distribution.xml	(revision 17897)
+++ /release-kits/mark3/ant-scripts/create-distribution.xml	(revision 17898)
@@ -6,22 +6,22 @@
 		<!-- 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="sh"/></antcall> <!-- from rk3-targets -->
 
-		<antcall target="copy-web-to-source-greenstone3" /> <!-- from gs3-targets -->
+		<antcall target="copy-web-to-source" /> <!-- from init -->
 
-		<ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
+		<ant target="create-distribution-1" antfile="${mark3.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}"/>
 		</ant>
 
-		<ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
+		<ant target="create-distribution-2" antfile="${mark3.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}"/>
 		</ant>
 
-		<ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
+		<ant target="create-distribution-3" antfile="${mark3.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}"/>
@@ -32,61 +32,49 @@
 		<antcall target="export-imagemagick-darwin-binaries" />
 		<antcall target="export-ghostscript-darwin-binaries" />
-		<antcall target="strip-svn-dirs"><param name="dir" value="distribution"/></antcall> <!-- from init -->
+		<antcall target="strip-svn-dirs"><param name="dir" value="distributions"/></antcall> <!-- from init -->
 	</target>
 
 	<target name="export-greenstone3-gli">
-		<mkdir dir="distribution"/>
-		<delete dir="distribution/greenstone3"/>
+		<mkdir dir="distributions"/>
+		<delete dir="distributions/web"/>
 		<svn javahl="false">
-			<export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/>
-			<export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
+			<export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distributions/web"/>
+			<export srcurl="${svn.root}/gli/${branch.path}" destPath="distributions/web/gli"/>
 		</svn>
 	</target>
 	
 	<target name="export-imagemagick-darwin-binaries">
-		<delete dir="distribution/greenstone3/gs2build/bin/darwin/imagemagick"/>
+		<delete dir="distributions/web/gs2build/bin/darwin/imagemagick"/>
 		<svn>
-			<export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distribution/greenstone3/gs2build/bin/darwin/imagemagick"/>
+			<export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/imagemagick" destPath="distributions/web/gs2build/bin/darwin/imagemagick"/>
 		</svn>
 	</target>
 	
 	<target name="export-ghostscript-darwin-binaries">
-		<delete dir="distribution/greenstone3/gs2build/bin/darwin/ghostscript"/>
+		<delete dir="distributions/web/gs2build/bin/darwin/ghostscript"/>
 		<svn>
-			<export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distribution/greenstone3/gs2build/bin/darwin/ghostscript"/>
+			<export srcurl="${svn.root}/other-projects/trunk/mac-binaries/intel/ghostscript" destPath="distributions/web/gs2build/bin/darwin/ghostscript"/>
 		</svn>
 	</target>
 
-	<target name="dist-set-version-number-property">
-		<rsr
-			file="distribution/greenstone3/resources/java/global.properties.in"
-			pattern="(.*)@gsdl3version@(.*)"
-			replacement="$1${version}$2" />
-	</target>
-
 	<target name="copy-over-build-xml">
-		<move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
+		<move file="distributions/web/modified-build.xml" tofile="distributions/web/build.xml"/>
 	</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"/>
-		<exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
+		<delete dir="distributions/web/lib/jni"/>
+		<exec executable="cp"><arg line="-r compiled/lib/jni distributions/web/lib"/></exec>
 
-		<delete dir="distribution/greenstone3/gs2build/bin/darwin"/>
-		<exec executable="cp"><arg line="-r greenstone3/gs2build/bin/darwin distribution/greenstone3/gs2build/bin"/></exec>
+		<delete dir="distributions/web/gs2build/bin/darwin"/>
+		<exec executable="cp"><arg line="-r compiled/gs2build/bin/darwin distributions/web/gs2build/bin"/></exec>
 
-		<delete dir="distribution/greenstone3/gs2build/bin/java"/>
-		<exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>
-		<exec executable="cp"><arg line="greenstone3/bin/search4j distribution/greenstone3/bin"/></exec>
+		<delete dir="distributions/web/gs2build/bin/java"/>
+		<exec executable="cp"><arg line="-r compiled/gs2build/bin/java distributions/web/gs2build/bin"/></exec>
+		<exec executable="cp"><arg line="compiled/bin/search4j distributions/web/bin"/></exec>
 	</target>
 
-	<target name="rename-build-xml-for-transit">
-		<move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/>
-	</target>
-
-
 </project>
Index: /release-kits/mark3/ant-scripts/create-installer.xml
===================================================================
--- /release-kits/mark3/ant-scripts/create-installer.xml	(revision 17897)
+++ /release-kits/mark3/ant-scripts/create-installer.xml	(revision 17898)
@@ -13,5 +13,5 @@
 
 		<copy todir="${basedir}/installer/classes" overwrite="true">
-			<fileset file="${basedir}/distribution/greenstone3/LICENSE.txt" /> 
+			<fileset file="${basedir}/distributions/web/LICENSE.txt" /> 
 		</copy>
 
Index: /release-kits/shared/ant-scripts/init.xml
===================================================================
--- /release-kits/shared/ant-scripts/init.xml	(revision 17897)
+++ /release-kits/shared/ant-scripts/init.xml	(revision 17898)
@@ -3,5 +3,5 @@
 
 	<!-- load in static properties from build.properties -->
-	<property file="build.properties" />
+	<property file="${rk.name}-build.properties" />
 
 	<!-- CONSTANTS (overridable in build.properties) -->
@@ -52,17 +52,22 @@
 
 		<!-- our classes -->
-		<fileset dir="${rk.home}/ant-scripts/tasks">
-			<include name="**/*.jar"/>
-		</fileset>
-
-		<!-- jars in lib directory -->
-		<fileset dir="${rk.home}/lib">
-			<include name="*.jar"/>
-		</fileset>
-
-		<!-- a few ant-installer jars -->
-		<fileset dir="${rk.home}/packages/ant-installer/lib">
-			<include name="ant-installer-ext.jar"/>
-			<include name="ant-installer.jar"/>
+		<fileset dir="${rk.home}">
+			<include name="ant-scripts/tasks/antelope/AntelopeTasks_3.4.2.jar"/>
+			<include name="ant-scripts/tasks/orangevolt/roxes-win32forjava-1.1.1.jar"/>
+			<include name="ant-scripts/tasks/orangevolt/orangevolt-ant-tasks-1.3.8.jar"/>
+			<include name="ant-scripts/tasks/svnant/lib/ganymed.jar"/>
+			<include name="ant-scripts/tasks/svnant/lib/svnClientAdapter.jar"/>
+			<include name="ant-scripts/tasks/svnant/lib/svnant.jar"/>
+			<include name="ant-scripts/tasks/svnant/lib/svnjavahl.jar"/>
+			<include name="ant-scripts/tasks/svnant/lib/svnkit.jar"/>
+			<include name="ant-scripts/tasks/greenstone/anttasks.jar"/>
+			<include name="ant-scripts/tasks/7z-ant/7z.jar"/>
+			<include name="lib/crypt.jar"/>
+			<include name="lib/serializer.jar"/>
+			<include name="lib/xalan.jar"/>
+			<include name="lib/xercesImpl.jar"/>
+			<include name="lib/xml-apis.jar"/>
+			<include name="packages/ant-installer/lib/ant-installer-ext.jar"/>
+			<include name="packages/ant-installer/lib/ant-installer.jar"/>
 		</fileset>
 
@@ -118,5 +123,6 @@
 				<not><isset property="version"/></not>
 			</bool>
-			<fail>Version number not set</fail>
+			<fail>Version number not set.
+Check that the file '${rk.name}-build.properties' exists and defines property 'version'.</fail>
 		</if>
 		<property name="app.version" value="${version}"/>
@@ -224,4 +230,5 @@
 	</target>
 
+	<!-- fork the web distribution to preserve a source release -->
 	<target name="copy-web-to-source">
 		<copy todir="distributions/source"><fileset dir="distributions/web"/></copy>
@@ -415,3 +422,46 @@
 	</target>
 
+	<!-- shared target to compile the uninstaller -->
+	<target name="compile-uninstaller">
+		<echo>Compiling Uninstaller</echo>
+
+		<!-- create working build directory -->
+		<mkdir dir="${basedir}/compiled/uninstaller/build/resources" />
+
+		<!-- copile to build -->
+		<javac
+			srcdir="${rk.home}/uninstaller"
+			destdir="${basedir}/compiled/uninstaller/build" />
+
+		<!-- copy language bundle into place -->
+		<native2ascii
+			implementation="sun"
+			src="${rk.home}/language-strings"
+			dest="${basedir}/compiled/uninstaller/build/resources"/>
+
+		<!-- jar it all up -->
+		<jar
+			destfile="${basedir}/compiled/uninstaller/uninst.jar"
+			manifest="${rk.home}/uninstaller/manifest.mf"
+			basedir="${basedir}/compiled/uninstaller/build" />
+
+	</target>
+
+	<!-- copy the uninstaller from the compiled directory to web distribution -->
+	<target name="insert-uninstaller">
+		<copy file="compiled/uninstaller/uninst.jar" todir="distributions/web" />
+		<copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" />
+	</target>
+
+	<!-- creates the comp for the source release, works for all release kits -->
+	<target name="prepare-source-release">
+		<delete dir="components/tmp/source-release"/>
+		<mkdir dir="components/tmp/source-release"/>
+
+		<copy todir="components/tmp/source-release" overwrite="true">
+			<fileset dir="distributions/source"/>
+		</copy>
+		<zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false"/>
+	</target>
+
 </project>
Index: /release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml
===================================================================
--- /release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml	(revision 17897)
+++ /release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml	(revision 17898)
@@ -12,32 +12,13 @@
 	<property name="version.major" value="2"/>
 
-	<target name="compile-uninstaller">
-		<echo>Compiling Uninstaller</echo>
+	<target name="gsdl-set-version-numbers">
+		<echo level="info">Setting version in src/lib/gsdlconf.h</echo>
+		<rsr file="${gsdl.basedir}/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
 
-		<!-- create working build directory -->
-		<mkdir dir="${basedir}/gsdl/uninstaller/build/resources" />
+		<echo level="info">Setting version in Install.sh</echo>
+		<rsr file="${gsdl.basedir}/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
 
-		<!-- copile to build -->
-		<javac
-			srcdir="${rk.home}/uninstaller"
-			destdir="${basedir}/gsdl/uninstaller/build" />
-
-		<!-- copy language bundle into place -->
-		<native2ascii
-			implementation="sun"
-			src="${rk.home}/language-strings"
-			dest="${basedir}/gsdl/uninstaller/build/resources"/>
-
-		<!-- jar it all up -->
-		<jar
-			destfile="${basedir}/gsdl/uninstaller/uninst.jar"
-			manifest="${rk.home}/uninstaller/manifest.mf"
-			basedir="${basedir}/gsdl/uninstaller/build" />
-
-	</target>
-
-	<target name="insert-uninstaller">
-		<copy file="gsdl/uninstaller/uninst.jar" todir="distributions/web" />
-		<copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" />
+		<echo level="info">Setting version in etc/VERSION</echo>
+		<rsr file="${gsdl.basedir}/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
 	</target>
 
@@ -49,15 +30,3 @@
 	</target>
 
-	<!-- source-release -->
-	<target name="prepare-source-release">
-		<delete dir="components/tmp/source-release"/>
-		<mkdir dir="components/tmp/source-release"/>
-
-		<copy todir="components/tmp/source-release" overwrite="true">
-			<fileset dir="distributions/source"/>
-		</copy>
-		<zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false" includes="**/*"/>
-	</target>
-
-
 </project>
Index: /release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml
===================================================================
--- /release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml	(revision 17897)
+++ /release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml	(revision 17898)
@@ -12,34 +12,4 @@
 	<property name="version.major" value="3"/>
 
-	<target name="compile-uninstaller">
-		<echo>Compiling Uninstaller</echo>
-
-		<!-- create working build directory -->
-		<mkdir dir="${basedir}/greenstone3/uninstaller/build/resources" />
-
-		<!-- copile to build -->
-		<javac
-			srcdir="${rk.home}/uninstaller"
-			destdir="${basedir}/greenstone3/uninstaller/build" />
-
-		<!-- copy language bundle into place -->
-		<native2ascii
-			implementation="sun"
-			src="${rk.home}/language-strings"
-			dest="${basedir}/greenstone3/uninstaller/build/resources"/>
-
-		<!-- jar it all up -->
-		<jar
-			destfile="${basedir}/greenstone3/uninstaller/uninst.jar"
-			manifest="${rk.home}/uninstaller/manifest.mf"
-			basedir="${basedir}/greenstone3/uninstaller/build" />
-
-	</target>
-
-	<target name="insert-uninstaller">
-		<copy file="greenstone3/uninstaller/uninst.jar" todir="distribution/greenstone3" />
-		<copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distribution/greenstone3" />
-	</target>
-
 	<target name="greenstone3-set-version-numbers">
 		<rsr
@@ -49,20 +19,3 @@
 	</target>
 
-	<target name="copy-web-to-source-greenstone3">
-		<copy todir="distribution/source"><fileset dir="distribution/greenstone3"/></copy>
-	</target>
-
-
-	<!-- sourcecode-release -->
-	<target name="prepare-source-release">
-		<delete dir="components/tmp/source-release"/>
-		<mkdir dir="components/tmp/source-release"/>
-
-		<copy todir="components/tmp/source-release" overwrite="true">
-			<fileset dir="distribution/source"/>
-		</copy>
-		<zip destfile="components/source-release.comp" basedir="components/tmp/source-release" compress="false"/>
-	</target>
-
-
 </project>
Index: /release-kits/wirk2/ant-scripts/build.xml
===================================================================
--- /release-kits/wirk2/ant-scripts/build.xml	(revision 17897)
+++ /release-kits/wirk2/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="wirk2"/>
 	<property name="rk.home" value="${wirk2.home}" />
 	<property name="rk.os" value="windows" />
Index: /release-kits/wirk2/ant-scripts/compile.xml
===================================================================
--- /release-kits/wirk2/ant-scripts/compile.xml	(revision 17897)
+++ /release-kits/wirk2/ant-scripts/compile.xml	(revision 17898)
@@ -4,5 +4,5 @@
 	<target name="compile">
 		<antcall target="checkout-gsdl-gli" />
-		<antcall target="set-version-numbers" />
+		<antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
 		<antcall target="unzip-packages" />
 		<antcall target="get-winbin" />
@@ -15,42 +15,36 @@
 	<target name="checkout-gsdl-gli">
 		<svn>
-			<checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
-			<checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
+			<checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/>
+			<checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/>
 		</svn>
 	</target>
 
-	<target name="set-version-numbers">
-		<rsr file="${basedir}/gsdl/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1&quot;${version}&quot;" />
-		<rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
-		<rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
-	</target>
-
 	<target name="unzip-packages">
-		<unzip src="${basedir}/gsdl/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/common-src/packages/windows/crypt"/>
-		<unzip src="${basedir}/gsdl/common-src/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/common-src/packages/windows/expat"/>
-		<unzip src="${basedir}/gsdl/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/common-src/packages/windows/gdbm"/>
-		<unzip src="${basedir}/gsdl/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/common-src/packages/windows/stlport"/>
-		<unzip src="${basedir}/gsdl/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/gsdl/common-src/indexers/packages/windows/iconv"/>
+		<unzip src="${basedir}/compiled/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/compiled/common-src/packages/windows/crypt"/>
+		<unzip src="${basedir}/compiled/common-src/packages/windows/expat/expat.zip" dest="${basedir}/compiled/common-src/packages/windows/expat"/>
+		<unzip src="${basedir}/compiled/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/compiled/common-src/packages/windows/gdbm"/>
+		<unzip src="${basedir}/compiled/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/compiled/common-src/packages/windows/stlport"/>
+		<unzip src="${basedir}/compiled/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/compiled/common-src/indexers/packages/windows/iconv"/>
 	</target>
 
 	<target name="get-winbin">
 		<if>
-			<bool><not><available file="${basedir}/gsdl/bin/windows"/></not></bool>
-			<svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/gsdl/bin/windows" revision="${branch.revision}"/></svn>
+			<bool><not><available file="${basedir}/compiled/bin/windows"/></not></bool>
+			<svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/compiled/bin/windows" revision="${branch.revision}"/></svn>
 		</if>
 	</target>
 
 	<target name="insert-perl">
-		<mkdir dir="${basedir}/gsdl/bin/windows"/>
-		<delete dir="${basedir}/gsdl/bin/windows/perl"/>
-		<unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/gsdl/bin/windows"/>
+		<mkdir dir="${basedir}/compiled/bin/windows"/>
+		<delete dir="${basedir}/compiled/bin/windows/perl"/>
+		<unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/compiled/bin/windows"/>
 	</target>
 	
 	<target name="compile-c-code">
-		<copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/gsdl" overwrite="true"/>
-		<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/compile.bat" />
-		<move file="${basedir}/gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/>
-		<move todir="${basedir}/gsdl/bin/windows">
-			<fileset dir="${basedir}/gsdl/cgi-bin" includes="library.exe,oaiserver.exe"/>
+		<copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/compiled" overwrite="true"/>
+		<exec dir="${basedir}/compiled" executable="${basedir}/compiled/compile.bat" />
+		<move file="${basedir}/compiled/server.exe" todir="${basedir}/compiled/bin/windows"/>
+		<move todir="${basedir}/compiled/bin/windows">
+			<fileset dir="${basedir}/compiled/cgi-bin" includes="library.exe,oaiserver.exe"/>
 		</move>
 	</target>
@@ -58,21 +52,21 @@
 	<target name="build-demo-collection">
 		<!-- the envs on these execs simulate the environment when you run setup.bat -->
-		<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
+		<exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl.exe">
 			<arg line="bin\script\import.pl --removeold demo"/>
-			<env key="GSDLHOME" value="${basedir}/gsdl"/>
-			<env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
+			<env key="GSDLHOME" value="${basedir}/compiled"/>
+			<env key="GSDLCOLLECTDIR" value="${basedir}/compiled/collect"/>
 			<env key="GSDLOS" value="windows"/>
-			<env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
+			<env key="PATH" value="${basedir}\compiled\bin\windows\perl\bin;${basedir}\compiled\bin\windows;${basedir}\compiled\bin\script"/>
 		</exec>
-		<exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
+		<exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl.exe">
 			<arg line="bin\script\buildcol.pl --removeold demo"/>
-			<env key="GSDLHOME" value="${basedir}/gsdl"/>
-			<env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
+			<env key="GSDLHOME" value="${basedir}/compiled"/>
+			<env key="GSDLCOLLECTDIR" value="${basedir}/compiled/collect"/>
 			<env key="GSDLOS" value="windows"/>
-			<env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
+			<env key="PATH" value="${basedir}\compiled\bin\windows\perl\bin;${basedir}\compiled\bin\windows;${basedir}\compiled\bin\script"/>
 		</exec>
 		
-		<delete dir="${basedir}/gsdl/collect/demo/index"/>
-		<move file="${basedir}/gsdl/collect/demo/building" tofile="${basedir}/gsdl/collect/demo/index"/>
+		<delete dir="${basedir}/compiled/collect/demo/index"/>
+		<move file="${basedir}/compiled/collect/demo/building" tofile="${basedir}/compiled/collect/demo/index"/>
 	</target>
 	
Index: /release-kits/wirk2/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/wirk2/ant-scripts/create-distribution.xml	(revision 17897)
+++ /release-kits/wirk2/ant-scripts/create-distribution.xml	(revision 17898)
@@ -5,5 +5,5 @@
 
 		<antcall target="export-gsdl-gli" />
-		<antcall target="dist-set-version" />
+		<antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall>
 		<antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
 		<antcall target="drop-in-docs" />
@@ -32,18 +32,11 @@
 	</target>
 
-	<target name="dist-set-version">
-		<echo level="info">Setting version in src/lib/gsdlconf.h</echo>
-		<rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
-		<echo level="info">Setting version in etc/VERSION</echo>
-		<rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
-	</target>
-	
 	<target name="drop-in-binaries">
 		<echo level="info">Dropping compiled binaries into distribution</echo>
 		<delete dir="${basedir}/distributions/web/bin/windows" />
 		<copy todir="${basedir}/distributions/web/bin/windows">
-			<fileset dir="${basedir}/gsdl/bin/windows" includes="**/*"/>
+			<fileset dir="${basedir}/compiled/bin/windows" includes="**/*"/>
 		</copy>
-		<copy todir="${basedir}/distributions/web" file="${basedir}/gsdl/bin/windows/server.exe"/>
+		<copy todir="${basedir}/distributions/web" file="${basedir}/compiled/bin/windows/server.exe"/>
 		
 		<echo level="info">Dropping LuceneWrapper.jar in place</echo>
@@ -55,5 +48,5 @@
 		<delete dir="${basedir}/distributions/web/collect/demo" />
 		<copy todir="${basedir}/distributions/web/collect/demo">
-			<fileset dir="${basedir}/gsdl/collect/demo" includes="**/*"/>
+			<fileset dir="${basedir}/compiled/collect/demo" includes="**/*"/>
 		</copy>
 	</target>
Index: /release-kits/wirk3/ant-scripts/build.xml
===================================================================
--- /release-kits/wirk3/ant-scripts/build.xml	(revision 17897)
+++ /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 17897)
+++ /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 17897)
+++ /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 17897)
+++ /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 17897)
+++ /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>
 
