Index: /release-kits/cdrk2/ant-scripts/build.xml
===================================================================
--- /release-kits/cdrk2/ant-scripts/build.xml	(revision 19005)
+++ /release-kits/cdrk2/ant-scripts/build.xml	(revision 19006)
@@ -19,5 +19,5 @@
 	
 	<!-- IMPORT OTHER ANT SCRIPTS -->
-	<import file="shared-ant-scripts/init.xml"/>
+	<import file="../core/ant-scripts/init.xml"/>
 	<import file="../greenstone2/ant-scripts/rk2-targets.xml"/>
 
Index: lease-kits/cdrk2/build.xml
===================================================================
--- /release-kits/cdrk2/build.xml	(revision 19005)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link lib/build.xml
Index: /release-kits/lirk2/ant-scripts/build.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/build.xml	(revision 19005)
+++ /release-kits/lirk2/ant-scripts/build.xml	(revision 19006)
@@ -20,6 +20,6 @@
 	
 	<!-- IMPORT OTHER ANT SCRIPTS -->
-	<import file="shared-ant-scripts/init.xml"/>
-	<import file="shared-ant-scripts/operations-on-gli.xml"/>
+	<import file="../core/ant-scripts/init.xml"/>
+	<import file="../core/ant-scripts/operations-on-gli.xml"/>
 	<import file="../greenstone2/ant-scripts/rk2-targets.xml"/>
 
Index: /release-kits/lirk2/ant-scripts/create-installer.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/create-installer.xml	(revision 19005)
+++ /release-kits/lirk2/ant-scripts/create-installer.xml	(revision 19006)
@@ -15,11 +15,11 @@
 		</copy>
 
-		<unjar src="${lirk2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${lirk2.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 
-		<unjar src="${lirk2.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${lirk2.home}/core/ant-tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 
-		<unjar src="${lirk2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${lirk2.home}/core/lib/crypt.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 
Index: /release-kits/lirk2/ant-scripts/wrap.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/wrap.xml	(revision 19005)
+++ /release-kits/lirk2/ant-scripts/wrap.xml	(revision 19006)
@@ -13,6 +13,6 @@
 		<mkdir dir="${basedir}/wrapped-installer/build"/>
 		<copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/wrapper.cpp"/>
-		<copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/libsearch4j.cpp"/>
-		<copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/libsearch4j.h"/>
+		<copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/core/search4j/libsearch4j.cpp"/>
+		<copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/core/search4j/libsearch4j.h"/>
 
 		<!-- copy bundled files -->
Index: lease-kits/lirk2/build.xml
===================================================================
--- /release-kits/lirk2/build.xml	(revision 19005)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link lib/build.xml
Index: /release-kits/lirk3/ant-scripts/build.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/build.xml	(revision 19005)
+++ /release-kits/lirk3/ant-scripts/build.xml	(revision 19006)
@@ -19,6 +19,6 @@
 
 	<!-- IMPORT OTHER ANT SCRIPTS -->
-	<import file="shared-ant-scripts/init.xml"/>
-	<import file="shared-ant-scripts/operations-on-gli.xml"/>
+	<import file="../core/ant-scripts/init.xml"/>
+	<import file="../core/ant-scripts/operations-on-gli.xml"/>
 	<import file="../greenstone3/ant-scripts/rk3-targets.xml"/>
 
Index: /release-kits/lirk3/ant-scripts/create-installer.xml
===================================================================
--- /release-kits/lirk3/ant-scripts/create-installer.xml	(revision 19005)
+++ /release-kits/lirk3/ant-scripts/create-installer.xml	(revision 19006)
@@ -15,8 +15,8 @@
 		</copy>
 
-		<unjar src="${lirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${lirk3.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 
-		<unjar src="${lirk3.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${lirk3.home}/core/ant-tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 
Index: lease-kits/lirk3/build.xml
===================================================================
--- /release-kits/lirk3/build.xml	(revision 19005)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link lib/build.xml
Index: /release-kits/mark2/ant-scripts/build.xml
===================================================================
--- /release-kits/mark2/ant-scripts/build.xml	(revision 19005)
+++ /release-kits/mark2/ant-scripts/build.xml	(revision 19006)
@@ -23,6 +23,6 @@
 
 	<!-- IMPORT OTHER ANT SCRIPTS -->
-	<import file="shared-ant-scripts/init.xml"/>
-	<import file="shared-ant-scripts/operations-on-gli.xml"/>
+	<import file="../core/ant-scripts/init.xml"/>
+	<import file="../core/ant-scripts/operations-on-gli.xml"/>
 	<import file="../greenstone2/ant-scripts/rk2-targets.xml"/>
 	<import file="compile.xml"/>
Index: /release-kits/mark2/ant-scripts/create-installer.xml
===================================================================
--- /release-kits/mark2/ant-scripts/create-installer.xml	(revision 19005)
+++ /release-kits/mark2/ant-scripts/create-installer.xml	(revision 19006)
@@ -15,11 +15,11 @@
 		</copy>
 
-		<unjar src="${mark2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${mark2.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 
-		<unjar src="${mark2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${mark2.home}/core/lib/crypt.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 
-		<unjar src="${mark2.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${mark2.home}/core/ant-tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 
Index: lease-kits/mark2/build.xml
===================================================================
--- /release-kits/mark2/build.xml	(revision 19005)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link lib/build.xml
Index: /release-kits/mark3/ant-scripts/build.xml
===================================================================
--- /release-kits/mark3/ant-scripts/build.xml	(revision 19005)
+++ /release-kits/mark3/ant-scripts/build.xml	(revision 19006)
@@ -22,6 +22,6 @@
 
 	<!-- IMPORT OTHER ANT SCRIPTS -->
-	<import file="shared-ant-scripts/init.xml"/>
-	<import file="shared-ant-scripts/operations-on-gli.xml"/>
+	<import file="../core/ant-scripts/init.xml"/>
+	<import file="../core/ant-scripts/operations-on-gli.xml"/>
 	<import file="../greenstone3/ant-scripts/rk3-targets.xml"/>
 	<import file="compile.xml"/>
Index: /release-kits/mark3/ant-scripts/create-installer.xml
===================================================================
--- /release-kits/mark3/ant-scripts/create-installer.xml	(revision 19005)
+++ /release-kits/mark3/ant-scripts/create-installer.xml	(revision 19006)
@@ -15,8 +15,8 @@
 		</copy>
 
-		<unjar src="${mark3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${mark3.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 
-		<unjar src="${mark3.home}/ant-scripts/tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${mark3.home}/core/ant-tasks/7z-ant/7z.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 
Index: lease-kits/mark3/build.xml
===================================================================
--- /release-kits/mark3/build.xml	(revision 19005)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link lib/build.xml
Index: /release-kits/shared/core/ant-scripts/init.xml
===================================================================
--- /release-kits/shared/core/ant-scripts/init.xml	(revision 19005)
+++ /release-kits/shared/core/ant-scripts/init.xml	(revision 19006)
@@ -52,15 +52,15 @@
 
 		<!-- our classes -->
-		<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"/>
+		<fileset dir="${rk.home}/core">
+			<include name="ant-tasks/antelope/AntelopeTasks_3.4.2.jar"/>
+			<include name="ant-tasks/orangevolt/roxes-win32forjava-1.1.1.jar"/>
+			<include name="ant-tasks/orangevolt/orangevolt-ant-tasks-1.3.8.jar"/>
+			<include name="ant-tasks/svnant/lib/ganymed.jar"/>
+			<include name="ant-tasks/svnant/lib/svnClientAdapter.jar"/>
+			<include name="ant-tasks/svnant/lib/svnant.jar"/>
+			<include name="ant-tasks/svnant/lib/svnjavahl.jar"/>
+			<include name="ant-tasks/svnant/lib/svnkit.jar"/>
+			<include name="ant-tasks/greenstone/anttasks.jar"/>
+			<include name="ant-tasks/7z-ant/7z.jar"/>
 			<include name="lib/crypt.jar"/>
 			<include name="lib/serializer.jar"/>
@@ -68,6 +68,6 @@
 			<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"/>
+			<include name="ant-installer/lib/ant-installer-ext.jar"/>
+			<include name="ant-installer/lib/ant-installer.jar"/>
 		</fileset>
 
@@ -87,16 +87,17 @@
 	
 	<!-- DATES IN DIFFERENT LANGUAGES -->
-	<get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="ar.Dates.${current.month}" outputProperty="month.ar"/>
-	<get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="ca.Dates.${current.month}" outputProperty="month.ca"/>
-	<get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="el.Dates.${current.month}" outputProperty="month.el"/>
-	<get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="es.Dates.${current.month}" outputProperty="month.es"/>
-	<get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="fr.Dates.${current.month}" outputProperty="month.fr"/>
-	<get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="lv.Dates.${current.month}" outputProperty="month.lv"/>
-	<get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="mr.Dates.${current.month}" outputProperty="month.mr"/>
-	<get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="ro.Dates.${current.month}" outputProperty="month.ro"/>
-	<get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="ru.Dates.${current.month}" outputProperty="month.ru"/>
-	<get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="vi.Dates.${current.month}" outputProperty="month.vi"/>
-	<get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="zh.Dates.${current.month}" outputProperty="month.zh"/>
-	<get-property-value propertiesFile="${rk.home}/lib/dates.properties" propertyName="default.Dates.${current.month}" outputProperty="month.default"/>
+	<get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="ar.Dates.${current.month}" outputProperty="month.ar"/>
+	<get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="ca.Dates.${current.month}" outputProperty="month.ca"/>
+	<get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="el.Dates.${current.month}" outputProperty="month.el"/>
+	<get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="es.Dates.${current.month}" outputProperty="month.es"/>
+	<get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="fr.Dates.${current.month}" outputProperty="month.fr"/>
+	<get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="lv.Dates.${current.month}" outputProperty="month.lv"/>
+	<get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="mr.Dates.${current.month}" outputProperty="month.mr"/>
+	<get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="ro.Dates.${current.month}" outputProperty="month.ro"/>
+	<get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="ru.Dates.${current.month}" outputProperty="month.ru"/>
+	<get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="vi.Dates.${current.month}" outputProperty="month.vi"/>
+	<get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="zh.Dates.${current.month}" outputProperty="month.zh"/>
+	<get-property-value propertiesFile="${rk.home}/core/lib/dates.properties" propertyName="default.Dates.${current.month}" outputProperty="month.default"/>
+
 	<!--
 	<echo level="info">Current Date</echo>
@@ -177,6 +178,6 @@
 			installConfig="${basedir}/installer/antinstall-config-binary.xml"
 			buildFile="${basedir}/installer/build.xml"
-			antInstallLib="${rk.home}/packages/ant-installer/lib"
-			antLib="${rk.home}/packages/ant/lib"
+			antInstallLib="${rk.home}/core/ant-installer/lib"
+			antLib="${rk.home}/core/ant/lib"
 			validateConfig="true"
 			icons="bluecurve">
@@ -199,6 +200,6 @@
 			installConfig="${basedir}/installer/antinstall-config-minimal.xml"
 			buildFile="${basedir}/installer/build.xml"
-			antInstallLib="${rk.home}/packages/ant-installer/lib"
-			antLib="${rk.home}/packages/ant/lib"
+			antInstallLib="${rk.home}/core/ant-installer/lib"
+			antLib="${rk.home}/core/ant/lib"
 			validateConfig="true"
 			icons="bluecurve">
@@ -219,6 +220,6 @@
 			installConfig="${basedir}/installer/antinstall-config-source.xml"
 			buildFile="${basedir}/installer/build.xml"
-			antInstallLib="${rk.home}/packages/ant-installer/lib"
-			antLib="${rk.home}/packages/ant/lib"
+			antInstallLib="${rk.home}/core/ant-installer/lib"
+			antLib="${rk.home}/core/ant/lib"
 			validateConfig="true"
 			icons="bluecurve">
@@ -247,5 +248,5 @@
 			implementation="sun"
 			encoding="UTF-8"
-			src="${rk.home}/language-strings"
+			src="${rk.home}/core/language-strings"
 			dest="${basedir}/installer/classes/resources"/>
 
@@ -348,5 +349,5 @@
 		<!-- copile to build -->
 		<javac
-			srcdir="${rk.home}/uninstaller"
+			srcdir="${rk.home}/core/uninstaller"
 			destdir="${basedir}/compiled/uninstaller/build" />
 
@@ -354,5 +355,5 @@
 		<native2ascii
 			implementation="sun"
-			src="${rk.home}/language-strings"
+			src="${rk.home}/core/language-strings"
 			dest="${basedir}/compiled/uninstaller/build/resources"/>
 
@@ -360,5 +361,5 @@
 		<jar
 			destfile="${basedir}/compiled/uninst.jar"
-			manifest="${rk.home}/uninstaller/manifest.mf"
+			manifest="${rk.home}/core/uninstaller/manifest.mf"
 			basedir="${basedir}/compiled/uninstaller/build" />
 
@@ -367,5 +368,5 @@
 	<!-- copy the uninstaller script from the rk to web distribution -->
 	<target name="insert-uninstaller">
-		<copy file="${rk.home}/uninstaller/Uninstall.${script-format}" todir="distributions/web" />
+		<copy file="${rk.home}/core/uninstaller/Uninstall.${script-format}" todir="distributions/web" />
 	</target>
 
Index: /release-kits/shared/core/build.xml
===================================================================
--- /release-kits/shared/core/build.xml	(revision 19005)
+++ /release-kits/shared/core/build.xml	(revision 19006)
@@ -3,6 +3,6 @@
 
 	<target name="compile">
-		<ant dir="ant-scripts/tasks/greenstone" inheritAll="false">
-			<property name="crypt.jar" value="${basedir}/lib/crypt.jar"/>
+		<ant dir="ant-tasks/greenstone" inheritAll="false">
+			<property name="crypt.jar" value="lib/crypt.jar"/>
 		</ant>
 	</target>
Index: /release-kits/shared/linux/rk
===================================================================
--- /release-kits/shared/linux/rk	(revision 19005)
+++ /release-kits/shared/linux/rk	(revision 19006)
@@ -1,12 +1,14 @@
 #!/bin/bash
 function show_title() {
-	echo    "O---------------------------------------------O"
-	echo    "|                                             |"
-	echo -n "|   $rk_name ";
-	for a in `seq 0 $(( 40 - ${#rk_name} ))`; do echo -n " "; done; echo "|"
-	echo -n "|   $rk_fullname ";
-	for a in `seq 0 $(( 40 - ${#rk_fullname} ))`; do echo -n " "; done; echo "|"
-	echo    "|                                             |"
-	echo    "O---------------------------------------------O"
+	echo "O---------------------------------------------O"
+	echo 
+	echo "   $rk_name ";
+	echo "   $rk_fullname ";
+	echo 
+	echo "O---------------------------------------------O"
+
+	#for a in `seq 0 $(( 40 - ${#rk_name} ))`; do echo -n " "; done; echo "|"
+	#for a in `seq 0 $(( 40 - ${#rk_fullname} ))`; do echo -n " "; done; echo "|"
+
 }
 
@@ -62,19 +64,19 @@
 #work out the classpath
 CLASSPATH=$JAVA_HOME/lib/tools.jar
-for file in $RK_HOME/lib/*.jar; do
+for file in $RK_HOME/core/lib/*.jar; do
 	CLASSPATH=$CLASSPATH:$file
 done
-for file in $RK_HOME/packages/ant/lib/*.jar; do
+for file in $RK_HOME/core/ant/lib/*.jar; do
 	CLASSPATH=$CLASSPATH:$file
 done
-for file in $RK_HOME/packages/ant-installer/lib/*.jar; do
+for file in $RK_HOME/core/ant-installer/lib/*.jar; do
 	CLASSPATH=$CLASSPATH:$file
 done
-CLASSPATH=$CLASSPATH:$RK_HOME/packages/ant-installer/classes
+CLASSPATH=$CLASSPATH:$RK_HOME/core/ant-installer/classes
 
 export CLASSPATH
 
 #set ANT_HOME
-export ANT_HOME=$RK_HOME/packages/ant
+export ANT_HOME=$RK_HOME/core/ant
 export ANT_OPTS=-Xmx800M
 
Index: /release-kits/sork2/ant-scripts/build.xml
===================================================================
--- /release-kits/sork2/ant-scripts/build.xml	(revision 19005)
+++ /release-kits/sork2/ant-scripts/build.xml	(revision 19006)
@@ -12,5 +12,5 @@
 	<!-- CONSTANTS -->
 
-	<!-- for the benefit of the shared scripts, set release-kit home -->
+.	<!-- for the benefit of the shared scripts, set release-kit home -->
 	<property name="rk.name" value="sork2"/>
 	<property name="rk.home" value="${sork2.home}" />
@@ -19,6 +19,6 @@
 	
 	<!-- IMPORT OTHER ANT SCRIPTS -->
-	<import file="shared-ant-scripts/init.xml"/>
-	<import file="shared-ant-scripts/operations-on-gli.xml"/>
+	<import file="../core/ant-scripts/init.xml"/>
+	<import file="../core/ant-scripts/operations-on-gli.xml"/>
 	<import file="../greenstone2/ant-scripts/rk2-targets.xml"/>
 
Index: lease-kits/sork2/build.xml
===================================================================
--- /release-kits/sork2/build.xml	(revision 19005)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link lib/build.xml
Index: /release-kits/wirk2/ant-scripts/build.xml
===================================================================
--- /release-kits/wirk2/ant-scripts/build.xml	(revision 19005)
+++ /release-kits/wirk2/ant-scripts/build.xml	(revision 19006)
@@ -23,6 +23,6 @@
 	
 	<!-- IMPORT OTHER ANT SCRIPTS -->
-	<import file="shared-ant-scripts/init.xml"/>
-	<import file="shared-ant-scripts/operations-on-gli.xml"/>
+	<import file="../core/ant-scripts/init.xml"/>
+	<import file="../core/ant-scripts/operations-on-gli.xml"/>
 	<import file="../greenstone2/ant-scripts/rk2-targets.xml"/>
 	<import file="compile.xml"/>
Index: /release-kits/wirk2/ant-scripts/create-installer.xml
===================================================================
--- /release-kits/wirk2/ant-scripts/create-installer.xml	(revision 19005)
+++ /release-kits/wirk2/ant-scripts/create-installer.xml	(revision 19006)
@@ -12,12 +12,12 @@
 
 		<copy todir="${basedir}/installer/classes" overwrite="true">
-			<fileset dir="${wirk2.home}/packages/7za" includes="7za.exe"/>
+			<fileset dir="${wirk2.home}/windows/7za" includes="7za.exe"/>
 			<fileset file="${basedir}/distributions/web/LICENSE.txt"/>
 		</copy>
 		
-		<unjar src="${wirk2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${wirk2.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 		
-		<unjar src="${wirk2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${wirk2.home}/core/lib/crypt.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 		
Index: lease-kits/wirk2/build.xml
===================================================================
--- /release-kits/wirk2/build.xml	(revision 19005)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link lib/build.xml
Index: /release-kits/wirk2/src/wirk2.cpp
===================================================================
--- /release-kits/wirk2/src/wirk2.cpp	(revision 19005)
+++ /release-kits/wirk2/src/wirk2.cpp	(revision 19006)
@@ -77,6 +77,6 @@
 		
 	//set the classpath
-	classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK2_HOME + "\\lib\\serializer.jar;" + WIRK2_HOME + "\\lib\\xalan.jar;" + WIRK2_HOME + "\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-antlr.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-bcel.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-bsf.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-log4j.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-oro.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-regexp.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-resolver.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-commons-logging.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-commons-net.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-icontract.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jai.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-javamail.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jdepend.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jmf.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jsch.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-junit.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-launcher.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-netrexx.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-nodeps.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-starteam.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-stylebook.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-swing.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-trax.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-vaj.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-weblogic.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-xalan1.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-xslp.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ant-installer.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\classes";
-	putenv( ("CLASSPATH=" + classpath).c_str() );
+	//classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\core\\lib\\tools.jar;" + WIRK2_HOME + "\\core\\lib\\serializer.jar;" + WIRK2_HOME + "\\core\\lib\\xalan.jar;" + WIRK2_HOME + "\\core\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\core\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-antlr.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-bcel.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-bsf.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-log4j.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-oro.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-regexp.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-apache-resolver.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-commons-logging.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-commons-net.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-icontract.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-jai.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-javamail.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-jdepend.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-jmf.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-jsch.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-junit.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-launcher.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-netrexx.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-nodeps.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-starteam.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-stylebook.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-swing.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-trax.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-vaj.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-weblogic.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-xalan1.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\ant-xslp.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\core\\ant\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\ant-installer.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\core\\ant-installer\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\core\\ant-installer\\classes";
+	//putenv( ("CLASSPATH=" + classpath).c_str() );
 
 	//check that it worked
@@ -85,5 +85,5 @@
 	
 	//create the command
-	command = WIRK2_HOME + "\\packages\\ant\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -addressing -Dwirk2.home=" + WIRK2_HOME;
+	command = WIRK2_HOME + "\\core\\ant\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -addressing -Dwirk2.home=" + WIRK2_HOME;
 	//pass on the arguments
 	string a;
Index: /release-kits/wirk3/ant-scripts/build.xml
===================================================================
--- /release-kits/wirk3/ant-scripts/build.xml	(revision 19005)
+++ /release-kits/wirk3/ant-scripts/build.xml	(revision 19006)
@@ -22,6 +22,6 @@
 
 	<!-- IMPORT OTHER ANT SCRIPTS -->
-	<import file="shared-ant-scripts/init.xml"/>
-	<import file="shared-ant-scripts/operations-on-gli.xml"/>
+	<import file="../core/ant-scripts/init.xml"/>
+	<import file="../core/ant-scripts/operations-on-gli.xml"/>
 	<import file="../greenstone3/ant-scripts/rk3-targets.xml"/>
 
Index: /release-kits/wirk3/ant-scripts/create-installer.xml
===================================================================
--- /release-kits/wirk3/ant-scripts/create-installer.xml	(revision 19005)
+++ /release-kits/wirk3/ant-scripts/create-installer.xml	(revision 19006)
@@ -13,10 +13,10 @@
 		<!-- some canned resources for the installer -->
 		<copy todir="${basedir}/installer/classes" overwrite="true">
-			<fileset dir="${wirk3.home}/packages/7za" includes="7za.exe"/>
+			<fileset dir="${wirk3.home}/windows/7za" includes="7za.exe"/>
 			<fileset file="${basedir}/distributions/web/LICENSE.txt"/>
 		</copy>
 
 		<!-- some classes from jars, unpacked to be repacked into installer -->
-		<unjar src="${wirk3.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
+		<unjar src="${wirk3.home}/core/ant-tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
 		<delete dir="${basedir}/installer/classes/META-INF"/>
 		
Index: lease-kits/wirk3/build.xml
===================================================================
--- /release-kits/wirk3/build.xml	(revision 19005)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link lib/build.xml
Index: /release-kits/wirk3/src/wirk3.cpp
===================================================================
--- /release-kits/wirk3/src/wirk3.cpp	(revision 19005)
+++ /release-kits/wirk3/src/wirk3.cpp	(revision 19006)
@@ -76,10 +76,10 @@
 	
 	//set the classpath
-	classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK3_HOME + "\\lib\\serializer.jar;" + WIRK3_HOME + "\\lib\\xalan.jar;" + WIRK3_HOME + "\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-antlr.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bcel.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bsf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-log4j.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-oro.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-regexp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-resolver.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-logging.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-net.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-icontract.jar;" + WIRK3_HOME + "\\packages\\ant-1.6.5\\lib\\ant-jai.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-javamail.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jdepend.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jmf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jsch.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-junit.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-launcher.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-netrexx.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-nodeps.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-starteam.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-stylebook.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-swing.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-trax.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-vaj.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-weblogic.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xalan1.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xslp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\classes;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnjavahl.jar;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnant.jar;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnClientAdapter.jar";
-	putenv( ("CLASSPATH=" + classpath).c_str() );
-	putenv( "SystemDrive=C:" );
+	//classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK3_HOME + "\\lib\\serializer.jar;" + WIRK3_HOME + "\\lib\\xalan.jar;" + WIRK3_HOME + "\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-antlr.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bcel.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-bsf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-log4j.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-oro.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-regexp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-apache-resolver.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-logging.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-commons-net.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-icontract.jar;" + WIRK3_HOME + "\\packages\\ant-1.6.5\\lib\\ant-jai.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-javamail.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jdepend.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jmf.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-jsch.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-junit.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-launcher.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-netrexx.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-nodeps.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-starteam.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-stylebook.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-swing.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-trax.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-vaj.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-weblogic.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xalan1.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\ant-xslp.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\ant-installer.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xercesImpl.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\lib\\xml-apis.jar;" + WIRK3_HOME + "\\packages\\ant-installer\\classes;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnjavahl.jar;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnant.jar;" + WIRK3_HOME + "\\ant-scripts\\tasks\\svnant\\lib\\svnClientAdapter.jar";
+	//putenv( ("CLASSPATH=" + classpath).c_str() );
+	//putenv( "SystemDrive=C:" );
 
 	//create the command
-	command = "\"\"" + WIRK3_HOME + "\\packages\\ant\\bin\\ant.bat\" -f \"" + WIRK3_HOME + "\\ant-scripts\\build.xml\" -addressing \"-Dwirk3.home=" + WIRK3_HOME + "\"";
+	command = "\"\"" + WIRK3_HOME + "\\core\\ant\\bin\\ant.bat\" -f \"" + WIRK3_HOME + "\\ant-scripts\\build.xml\" -addressing \"-Dwirk3.home=" + WIRK3_HOME + "\"";
 	//pass on the arguments
 	string a;
