cleanup and fixes
diff --git a/plugins/org.eclipse.wtp.releng.utilities/copyAndRemove.sh b/plugins/org.eclipse.wtp.releng.utilities/copyAndRemove.sh
index d0d17d4..0414801 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/copyAndRemove.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/copyAndRemove.sh
@@ -20,3 +20,16 @@
     fi
     return;
 }
+
+copyAndRemoveModule () {
+
+
+oldBaseDir=$[1}
+newBaseDir=$[2}
+wtpmodule=${3}
+
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
+return;
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
index 4f50375..ecc1beb 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
@@ -244,3 +244,40 @@
 newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir
 
+oldBaseDir=${oldcvsdir}/jst/components/j2ee
+newBaseDir=${newcvsdir}/jeetools
+
+wtpmodule=development
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
+
+oldBaseDir=${oldcvsdir}/jst/components/j2ee/plugins
+newBaseDir=${newcvsdir}/jeetools/plugins
+
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee 
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee.core
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee.jca
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee.jca.ui
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee.navigator.ui
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee.ui
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee.web
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee.webservice
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee.webservice.ui
+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
+newBaseDir=${newcvsdir}/jeetools/tests
+
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee.core.tests
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee.core.tests.performance
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.j2ee.tests
+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
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.validation.test.fwk
+
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh b/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
index 3183c1c..46bda9d 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
@@ -24,6 +24,25 @@
 newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir
 
+
+oldBaseDir=${oldcvsdir}/wst/components/internet/tests
+newBaseDir=${newcvsdir}/servertools/tests
+
+wtpmodule=org.eclipse.wst.internet.monitor.core.tests
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
+
+wtpmodule=org.eclipse.wst.internet.monitor.ui.tests
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
+
+
+
+
+
+
 oldBaseDir=${oldcvsdir}/wst/components/doc/plugins
 newBaseDir=${newcvsdir}/servertools/docs
 
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh b/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
index f90a93e..c27a605 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
@@ -60,4 +60,38 @@
 wtpmodule=org.eclipse.jst.ws.infopop
 oldDir=${oldBaseDir}/${wtpmodule}
 newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
\ No newline at end of file
+copyAndRemove $oldDir $newDir
+
+oldBaseDir=${oldcvsdir}/jst/components/ws/plugins
+newBaseDir=${newcvsdir}/webservices/plugins
+
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.axis
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.axis2.consumption.core
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.axis2.consumption.ui
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.axis2.core
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.axis2.creation.core
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.axis2.creation.ui
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.axis2.ui
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.axis.ant
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.axis.consumption.core
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.axis.consumption.ui
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.axis.creation.ui
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.consumption
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.consumption.ui
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.creation.ejb.ui
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.creation.ui
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.uddiregistry
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.ui
+
+
+oldBaseDir=${oldcvsdir}/jst/components/ws/tests
+newBaseDir=${newcvsdir}/webservices/tests
+
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.axis.consumption.core.tests
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.tests
+copyAndRemoveModule $oldBaseDir $newBaseDir org.eclipse.jst.ws.tests.performance
+
+
+
+