diff --git a/plugins/org.eclipse.wtp.releng.utilities/backupAndInit.sh b/plugins/org.eclipse.wtp.releng.utilities/backupAndInit.sh
new file mode 100755
index 0000000..f883ca7
--- /dev/null
+++ b/plugins/org.eclipse.wtp.releng.utilities/backupAndInit.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+. mainparams.shsource
+
+. copyAndRemove.sh
+
+
+if [ ! -d ${newcvsdir} ] then; 
+        mkdir -p "${newcvsdir}"
+fi
+
+# make sure it is clean
+# (technically only needed during development
+# and test, not production run.)
+rm -fr ${newcvsdir}
+	     
\ No newline at end of file
diff --git a/plugins/org.eclipse.wtp.releng.utilities/backupcvsrepro.sh b/plugins/org.eclipse.wtp.releng.utilities/backupcvsrepro.sh
new file mode 100755
index 0000000..32090ba
--- /dev/null
+++ b/plugins/org.eclipse.wtp.releng.utilities/backupcvsrepro.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+. mainparams.shsource
+
+. copyAndRemove.sh
+
+savedirectory=~/savecvsrepro
+mkdir -p ${savedirectory}
+tar -czf ${savedir}/premovewebtools.tgz ${oldcvsdir}/
+
+ll ${savedirectory}
diff --git a/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh b/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
index 95e4506..b770b9b 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
@@ -1,4 +1,10 @@
 #!/bin/sh
+
+
+. mainparams.shsource
+
+. copyAndRemove.sh
+
 echo;
 echo "Remember, this script should NOT be ran on the production ";
 echo "machine, during the real move. It is for testing only, ";
@@ -7,14 +13,13 @@
 
 snapshot=/home/davidw/files/snapshots/webtools-cvs-5.tgz
 
-rm -fr /cvsroot/webtools/*
-rm -fr /cvsroot/wtp/*
-cvs --no-verify -d /cvsroot/webtools init
-cvs --no-verify -d /cvsroot/wtp init
+mkdir -p ${topdir}/${reponame}
+rm -fr ${topdir}/${reponame}
+cvs --no-verify -d ${topdir}/${reponame} init
 
 echo "   Current snapshot: $snapshot";
 echo;
-tar zxf $snapshot -C /
+tar zxf $snapshot -C ${topdir}
 
 
 
diff --git a/plugins/org.eclipse.wtp.releng.utilities/mainparams.shsource b/plugins/org.eclipse.wtp.releng.utilities/mainparams.shsource
index 71e5746..c671543 100644
--- a/plugins/org.eclipse.wtp.releng.utilities/mainparams.shsource
+++ b/plugins/org.eclipse.wtp.releng.utilities/mainparams.shsource
@@ -1,3 +1,8 @@
-newcvsdir=/cvsroot/wtp
-oldcvsdir=/cvsroot/webtools
+
+topdir=/cvsroot/testdir/test
+reponame=cvsroot/webtools
+
+newcvsdir=~/cvsroot/wtp
+
+oldcvsdir=${topdir}/${reponame}
 
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveNewToOId.sh b/plugins/org.eclipse.wtp.releng.utilities/moveNewToOld.sh
similarity index 100%
rename from plugins/org.eclipse.wtp.releng.utilities/moveNewToOId.sh
rename to plugins/org.eclipse.wtp.releng.utilities/moveNewToOld.sh
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
index f8f84e8..1676b03 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
@@ -251,7 +251,6 @@
 copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.jee.ui
 copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.jee.web
 
-
 oldBaseDir=${oldcvsdir}/jst/components/j2ee/tests
 newBaseDir=${newcvsdir}/jeetools/tests
 
@@ -265,3 +264,10 @@
 newBaseDir=${newcvsdir}/jeetools/archive
 copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.validation.test.fwk
 
+oldDir=${oldcvsdir}/jst/components/ejb/features/*
+newDir=${newcvsdir}/jeetools/features
+copyAndRemove $oldDir $newDir
+
+oldDir=${oldcvsdir}/jst/components/web/features/*
+newDir=${newcvsdir}/jeetools/features
+copyAndRemove $oldDir $newDir