fine tuning
diff --git a/plugins/org.eclipse.wtp.releng.utilities/assignGroups.sh b/plugins/org.eclipse.wtp.releng.utilities/assignGroups.sh
new file mode 100644
index 0000000..d503341
--- /dev/null
+++ b/plugins/org.eclipse.wtp.releng.utilities/assignGroups.sh
@@ -0,0 +1,19 @@
+#!/vin/sh
+
+# this file needs to be executed at top of /cvsroot/webtools directory
+# and ... as root? 
+
+chgrp -R webtools 				common
+chgrp -R cvs 					CVSROOT
+chgrp -R webtools 				datatools
+chgrp -R webtools 				ejbtools
+chgrp -R webtools 				jeetools
+chgrp -R atf-dev 				org.eclipse.atf
+chgrp -R jpa-dev 				org.eclipse.jpa
+chgrp -R jsf-dev 				org.eclipse.jsf
+chgrp -R webtools.incubator-dev org.eclipse.wtp.incubator 
+chgrp -R webtools 				servertools
+chgrp -R webtools 				sourceediting
+chgrp -R webtools 				webservices
+chgrp -R webtools 				webtools.maps
+chgrp -R webtools 				webtools.releng
diff --git a/plugins/org.eclipse.wtp.releng.utilities/backupcvsrepro.sh b/plugins/org.eclipse.wtp.releng.utilities/backupcvsrepro.sh
index 32090ba..6a26602 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/backupcvsrepro.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/backupcvsrepro.sh
@@ -4,8 +4,8 @@
 
 . copyAndRemove.sh
 
-savedirectory=~/savecvsrepro
+savedirectory=~/savecvsrepo
 mkdir -p ${savedirectory}
-tar -czf ${savedir}/premovewebtools.tgz ${oldcvsdir}/
+tar -czf ${savedirectory}/premovewebtools.tgz ${oldcvsdir}/
 
-ll ${savedirectory}
+ls -l ${savedirectory}
diff --git a/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh b/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
index b770b9b..90f148e 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/cleanupAndInit.sh
@@ -11,7 +11,7 @@
 echo "when using snapshots.";
 echo;
 
-snapshot=/home/davidw/files/snapshots/webtools-cvs-5.tgz
+snapshot=/home/davidw/files/snapshots/webtools-cvs-6.tgz
 
 mkdir -p ${topdir}/${reponame}
 rm -fr ${topdir}/${reponame}
diff --git a/plugins/org.eclipse.wtp.releng.utilities/backupAndInit.sh b/plugins/org.eclipse.wtp.releng.utilities/initNew.sh
similarity index 76%
rename from plugins/org.eclipse.wtp.releng.utilities/backupAndInit.sh
rename to plugins/org.eclipse.wtp.releng.utilities/initNew.sh
index f883ca7..92b0edb 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/backupAndInit.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/initNew.sh
@@ -4,8 +4,12 @@
 
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
 
-if [ ! -d ${newcvsdir} ] then; 
+if [ ! -d ${newcvsdir} ] 
+then
         mkdir -p "${newcvsdir}"
 fi
 
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh b/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh
index b3e06f3..e16bb39 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh
@@ -11,6 +11,10 @@
 
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
+
 # remove misc files
 find ${oldcvsdir}/wst -name .keepme -exec rm '{}' \; 
 find ${oldcvsdir}/jst -name .keepme -exec rm '{}' \; 
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveNewToOld.sh b/plugins/org.eclipse.wtp.releng.utilities/moveNewToOld.sh
index a041713..66094ba 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveNewToOld.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveNewToOld.sh
@@ -7,7 +7,14 @@
 
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
+
+
 # don't need cvsroot
 
 rm -fr ${newcvsdir}/CVSROOT
 mv ${newcvsdir}/* ${oldcvsdir}
+ 
+find ${oldcvsdir}/ -type d -exec chmod g+s '{}' \;
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveall.sh b/plugins/org.eclipse.wtp.releng.utilities/moveall.sh
index e45c612..ec5ec32 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveall.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveall.sh
@@ -4,6 +4,11 @@
 # since some copy and remove whole sub-trees, where as others copy and remove 
 # individual pieces of those subtrees
 
+echo;
+echo "   performing $0";
+echo;
+
+./initNew.sh
 ./movejsf.sh
 ./moverdb.sh
 ./movecommon.sh
@@ -15,3 +20,4 @@
 ./moveejb.sh
 ./movejee.sh
 ./moveCleanup.sh
+./moveNewToOld.sh
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh b/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
index 351cc31..fd7f97d 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
@@ -4,6 +4,10 @@
 
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
+
 oldDir=${oldcvsdir}/wst/components/internet/plugins/org.eclipse.wst.internet.proxy
 newDir=${newcvsdir}/common/archive
 copyAndRemove $oldDir $newDir
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh b/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh
index 21d5a0a..4e89a9c 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh
@@ -3,6 +3,9 @@
 . mainparams.shsource
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
 
 oldDir=${oldcvsdir}/jst/components/ejb/plugins/org.eclipse.jst.ejb.ui
 newDir=${newcvsdir}/ejbtools/plugins
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
index 1676b03..69d3281 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
@@ -4,6 +4,10 @@
 
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
+
 
 oldBaseDir=${oldcvsdir}/jst/components/common/plugins
 newBaseDir=${newcvsdir}/jeetools/plugins
@@ -193,6 +197,10 @@
 
 oldBaseDir=${oldcvsdir}/wst/components/web/features
 newBaseDir=${newcvsdir}/jeetools/features
+wtpmodule=org.eclipse.wst.web_core.feature.patch
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
 
 wtpmodule=org.eclipse.wst.web_core.feature
 oldDir=${oldBaseDir}/${wtpmodule}
@@ -268,6 +276,6 @@
 newDir=${newcvsdir}/jeetools/features
 copyAndRemove $oldDir $newDir
 
-oldDir=${oldcvsdir}/jst/components/web/features/*
+oldDir=${oldcvsdir}/wst/components/web/features/*
 newDir=${newcvsdir}/jeetools/features
 copyAndRemove $oldDir $newDir
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movejsf.sh b/plugins/org.eclipse.wtp.releng.utilities/movejsf.sh
index 91ae0d0..2b89bc7 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movejsf.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movejsf.sh
@@ -3,6 +3,10 @@
 . mainparams.shsource
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
+
 # 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
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movemaps.sh b/plugins/org.eclipse.wtp.releng.utilities/movemaps.sh
index d3cc192..6e1b92c 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movemaps.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movemaps.sh
@@ -3,6 +3,10 @@
 . mainparams.shsource
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
+
 newDir=${newcvsdir}/webtools.maps
 
 oldDir=${oldcvsdir}/releng
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh b/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh
index db663a4..d377b6b 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh
@@ -3,6 +3,10 @@
 . mainparams.shsource
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
+
 newDir=${newcvsdir}/datatools
 
 #remember, trailing slash needed here
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh b/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh
index 7a0fcdf..9519c87 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh
@@ -3,6 +3,10 @@
 . mainparams.shsource
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
+
 newDir=${newcvsdir}/webtools.releng
 oldDir=${oldcvsdir}/wst/components/assembly
 copyAndRemove $oldDir $newDir
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh b/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
index e16d5c5..4500215 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
@@ -3,6 +3,10 @@
 . mainparams.shsource
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
+
 newDir=${newcvsdir}/servertools
 
 # need trailing slash to flatten
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh b/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
index a963555..eb01df8 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
@@ -3,6 +3,10 @@
 . mainparams.shsource
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
+
 oldDir=${oldcvsdir}/wst/components/xml/thirdparty
 newDir=${newcvsdir}/sourceediting/archive
 copyAndRemove $oldDir $newDir
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh b/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
index 5a9d451..13e21ae 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
@@ -3,6 +3,9 @@
 . mainparams.shsource
 . copyAndRemove.sh
 
+echo;
+echo "   performing $0";
+echo;
 
 newDir=${newcvsdir}/webservices/archive
 oldDir=${oldcvsdir}/wst/components/ws/thirdparty