latest updates
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}