diff --git a/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh b/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
index 1a1802f..405d0b6 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
@@ -1,11 +1,20 @@
 #!/bin/sh
+echo;
+echo "Remember, this script should NOT be ran on the production ";
+echo "machine, during the real move. It is for testing only, ";
+echo "when using snapshots.";
+echo;
 
-rm -fr /cvsroot/webtools
+snapshot=/home/davidw/files/snapshots/webtools-cvs-3.tgz
+
+rm -fr /cvsroot/webtools/*
+rm -fr /cvsroot/wtp/*
 cvs --no-verify -d /cvsroot/webtools init
-rm -fr /cvsroot/wtp
 cvs --no-verify -d /cvsroot/wtp init
 
-tar zxf /home/davidw/files/snapshots/webtools-cvs-3.tgz -C /
+echo "   Current snapshot: $snapshot";
+echo;
+tar zxf $snapshot -C /
 
 
 
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh b/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh
index dc059bb..b3e06f3 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh
@@ -14,7 +14,16 @@
 # remove misc files
 find ${oldcvsdir}/wst -name .keepme -exec rm '{}' \; 
 find ${oldcvsdir}/jst -name .keepme -exec rm '{}' \; 
+find ${oldcvsdir}/wst -name .keepme,v -exec rm -f '{}' \; 
+find ${oldcvsdir}/jst -name .keepme,v -exec rm -f '{}' \; 
 
+find ${oldcvsdir}/wst -name .project -exec rm '{}' \; 
+find ${oldcvsdir}/jst -name .project -exec rm '{}' \; 
+find ${oldcvsdir}/wst -name .project,v -exec rm -f '{}' \; 
+find ${oldcvsdir}/jst -name .project,v -exec rm -f '{}' \; 
+
+find ${oldcvsdir}/wst -depth -type d -empty -exec rmdir {} \;
+find ${oldcvsdir}/jst -depth -type d -empty -exec rmdir {} \;
 
 newDir=${newcvsdir}/webtools.releng/tempmisc
 
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh b/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
index 72ec0a8..351cc31 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
@@ -122,7 +122,7 @@
 copyAndRemove $oldDir $newDir
 
 oldDir=${oldcvsdir}/wst/components/doc/plugins/org.eclipse.wst.validation.infopop
-newDir=${newcvsdir}/common/plugins
+newDir=${newcvsdir}/common/docs
 copyAndRemove $oldDir $newDir
 
 oldDir=${oldcvsdir}/wst/components/validation/plugins/org.eclipse.wst.validation.ui
@@ -130,15 +130,15 @@
 copyAndRemove $oldDir $newDir
 
 oldDir=${oldcvsdir}/wst/components/common/plugins/org.eclipse.wst.common.explorer
-newDir=${newcvsdir}/common/plugins
+newDir=${newcvsdir}/common/archive
 copyAndRemove $oldDir $newDir
 
 oldDir=${oldcvsdir}/wst/components/common/plugins/org.eclipse.wst.common.navigator.views
-newDir=${newcvsdir}/common/plugins
+newDir=${newcvsdir}/common/archive
 copyAndRemove $oldDir $newDir
 
 oldDir=${oldcvsdir}/wst/components/common/plugins/org.eclipse.wst.common.navigator.workbench
-newDir=${newcvsdir}/common/plugins
+newDir=${newcvsdir}/common/archive
 copyAndRemove $oldDir $newDir
 
 oldDir=${oldcvsdir}/wst/components/common/plugins/org.eclipse.wst.common.runtime.core
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
index ecc1beb..6049be5 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
@@ -28,25 +28,14 @@
 newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir
 
-wtpmodule=org.eclipse.jst.common.frameworks.ui
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
+newBaseDir=${newcvsdir}/jeetools/archive
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.sample.web.project 
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.common.navigator.java 
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.common.launcher.ant
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.common.frameworks.ui 
 
-wtpmodule=org.eclipse.jst.common.launcher.ant
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
 
-wtpmodule=org.eclipse.jst.common.navigator.java
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
 
-wtpmodule=org.eclipse.jst.sample.web.project
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
 
 oldBaseDir=${oldcvsdir}/wst/components/web/plugins
 newBaseDir=${newcvsdir}/jeetools/plugins
@@ -173,12 +162,6 @@
 newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir
 
-oldBaseDir=${oldcvsdir}/jst/components/web/features
-newBaseDir=${newcvsdir}/jeetools
-oldDir=${oldBaseDir}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
-
 oldBaseDir=${oldcvsdir}/jst/components/doc/features
 newBaseDir=${newcvsdir}/jeetools
 oldDir=${oldBaseDir}
@@ -279,5 +262,7 @@
 copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee.tests.performance
 copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.validation.sample
 copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.validation.test
+
+newBaseDir=${newcvsdir}/jeetools/archive
 copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.validation.test.fwk
 
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh b/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
index 4d27e99..62b7319 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
@@ -7,6 +7,24 @@
 newDir=${newcvsdir}/sourceediting/archive
 copyAndRemove $oldDir $newDir
 
+newDir=${newcvsdir}/sourceediting/docs
+oldDir=${oldcvsdir}/wst/components/jsdt/plugins/org.eclipse.wst.jsdt.doc
+copyAndRemove $oldDir $newDir
+
+newDir=${newcvsdir}/sourceediting/archive
+oldDir=${oldcvsdir}/wst/components/xsd/plugins/org.eclipse.wst.xsd.contentmodel
+copyAndRemove $oldDir $newDir
+
+
+# be sure these are done before jee
+newDir=${newcvsdir}/sourceediting/features
+oldDir=${oldcvsdir}/jst/components/web/features/org.eclipse.jst.webpageeditor.feature
+copyAndRemove $oldDir $newDir
+
+oldDir=${oldcvsdir}/jst/components/web/features/org.eclipse.jst.webpageeditor_sdk.feature
+copyAndRemove $oldDir $newDir
+
+
 newDir=${newcvsdir}/sourceediting
 
 # remember final slash needed here to include all, but correctly flatten