latest updates
diff --git a/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh b/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
index 405d0b6..95e4506 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
@@ -5,7 +5,7 @@
 echo "when using snapshots.";
 echo;
 
-snapshot=/home/davidw/files/snapshots/webtools-cvs-3.tgz
+snapshot=/home/davidw/files/snapshots/webtools-cvs-5.tgz
 
 rm -fr /cvsroot/webtools/*
 rm -fr /cvsroot/wtp/*
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveNewToOId.sh b/plugins/org.eclipse.wtp.releng.utilities/moveNewToOId.sh
new file mode 100755
index 0000000..a041713
--- /dev/null
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveNewToOId.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# this file is to move the "new" temporary created directories, 
+# back to the main 'webtools' cvs location. 
+
+. mainparams.shsource
+
+. copyAndRemove.sh
+
+# don't need cvsroot
+
+rm -fr ${newcvsdir}/CVSROOT
+mv ${newcvsdir}/* ${oldcvsdir}
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveall.sh b/plugins/org.eclipse.wtp.releng.utilities/moveall.sh
index da9c4f7..e45c612 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveall.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveall.sh
@@ -4,6 +4,7 @@
 # since some copy and remove whole sub-trees, where as others copy and remove 
 # individual pieces of those subtrees
 
+./movejsf.sh
 ./moverdb.sh
 ./movecommon.sh
 ./moveservertools.sh
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
index 6049be5..f8f84e8 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
@@ -250,7 +250,6 @@
 copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.jee
 copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.jee.ui
 copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.jee.web
-copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.standard.schemas
 
 
 oldBaseDir=${oldcvsdir}/jst/components/j2ee/tests
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movejsf.sh b/plugins/org.eclipse.wtp.releng.utilities/movejsf.sh
new file mode 100755
index 0000000..91ae0d0
--- /dev/null
+++ b/plugins/org.eclipse.wtp.releng.utilities/movejsf.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+. mainparams.shsource
+. copyAndRemove.sh
+
+# be sure these are done before jee
+newDir=${oldcvsdir}/org.eclipse.jsf/components/jsf/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
\ No newline at end of file
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh b/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
index 62b7319..a963555 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
@@ -15,16 +15,6 @@
 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
@@ -48,9 +38,13 @@
 copyAndRemove $oldDir $newDir
 
 
-oldDir=${oldcvsdir}/wst/components/web/plugins/org.eclipse.wst.standard.schemas
-newDir=${newcvsdir}/sourceediting/plugins/org.eclipse.wst.standard.schemas
-copyAndRemove $oldDir $newDir
+oldBaseDir=${oldcvsdir}/wst/components/web/plugins
+newBaseDir=${newcvsdir}/sourceediting/plugins
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.wst.standard.schemas
+
+oldBaseDir=${oldcvsdir}/jst/components/j2ee/plugins
+newBaseDir=${newcvsdir}/sourceediting/plugins
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.standard.schemas
 
 
 oldBaseDir=${oldcvsdir}/wst/components/doc/plugins
diff --git a/plugins/org.eclipse.wtp.releng.utilities/treeout.sh b/plugins/org.eclipse.wtp.releng.utilities/treeout.sh
index 2e368ca..e0a0814 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/treeout.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/treeout.sh
@@ -6,30 +6,33 @@
 treeoutput=www/webtools/development/treeout
 mkdir -p ${treeoutput}
 wtpproject=common
-tree --noreport --nolinks -d -T ${wtpproject} ${newcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
+tree --noreport --nolinks -d -T ${wtpproject} ${oldcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
 wtpproject=datatools
-tree --noreport --nolinks -d -T ${wtpproject} ${newcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
+tree --noreport --nolinks -d -T ${wtpproject} ${oldcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
 wtpproject=servertools
-tree --noreport --nolinks -d -T ${wtpproject} ${newcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
+tree --noreport --nolinks -d -T ${wtpproject} ${oldcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
 wtpproject=webservices
-tree --noreport --nolinks -d -T ${wtpproject} ${newcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
+tree --noreport --nolinks -d -T ${wtpproject} ${oldcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
 wtpproject=sourceediting
-tree --noreport --nolinks -d -T ${wtpproject} ${newcvsdir}/sourceediting -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
+tree --noreport --nolinks -d -T ${wtpproject} ${oldcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
 wtpproject=ejbtools
-tree --noreport --nolinks -d -T ${wtpproject} ${newcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
+tree --noreport --nolinks -d -T ${wtpproject} ${oldcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
 wtpproject=jeetools
-tree --noreport --nolinks -d -T ${wtpproject} ${newcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
+tree --noreport --nolinks -d -T ${wtpproject} ${oldcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
 wtpproject=webtools.releng
-tree --noreport --nolinks -d -T ${wtpproject} ${newcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
+tree --noreport --nolinks -d -T ${wtpproject} ${oldcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
 wtpproject=webtools.maps
-tree --noreport --nolinks -d -T ${wtpproject} ${newcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
+tree --noreport --nolinks -d -T ${wtpproject} ${oldcvsdir}/${wtpproject} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
 
 
 wtpproject=org.eclipse.atf
-tree --noreport --nolinks -d -T ${wtpproject} ${oldcvsdir}/${wtpproject}/components -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
+topDirectory=${wtpproject}/components
+tree --noreport --nolinks -d -T ${topDirectory} ${oldcvsdir}/${topDirectory} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
 
 wtpproject=org.eclipse.jpa
-tree --noreport --nolinks -d -T ${wtpproject} ${oldcvsdir}/${wtpproject}/components/jpa -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
+topDirectory=${wtpproject}/components/jpa
+tree --noreport --nolinks -d -T ${topDirectory} ${oldcvsdir}/${topDirectory} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
 
 wtpproject=org.eclipse.jsf
-tree --noreport --nolinks -d -T ${wtpproject} ${oldcvsdir}/${wtpproject}/components/jsf -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html
+topDirectory=${wtpproject}/components/jsf
+tree --noreport --nolinks -d -T ${topDirectory} ${oldcvsdir}/${topDirectory} -H ./ -L 2 -o ${treeoutput}/${wtpproject}.html