cleanup and fixes
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
+
+
+
+