some cleanup and corrections
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh b/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
index 77b89b3..c27ce21 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
@@ -184,8 +184,8 @@
 copyAndRemove $oldDir $newDir
 
 
-oldBaseDir=${oldcvsdir}/wst/components/common/
-newBaseDir=${newcvsdir}/common/
+oldBaseDir=${oldcvsdir}/wst/components/common
+newBaseDir=${newcvsdir}/common
 
 wtpmodule=development
 oldDir=${oldBaseDir}/${wtpmodule}
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
index a5bbd17..c7f6c9f 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
@@ -208,69 +208,12 @@
 newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir
 
-newBaseDir=${newcvsdir}/sourceediting/docs
-wtpmodule=org.eclipse.jst.jsp.ui.infopop
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
-
 newBaseDir=${newcvsdir}/ejbtools/docs
 wtpmodule=org.eclipse.jst.ejb.doc.user
 oldDir=${oldBaseDir}/${wtpmodule}
 newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir
 
-newBaseDir=${newcvsdir}/servertools/docs
-wtpmodule=org.eclipse.jst.server.ui.doc.user
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
-
-newBaseDir=${newcvsdir}/servertools/docs
-wtpmodule=org.eclipse.jst.server.ui.infopop
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
-
-newBaseDir=${newcvsdir}/servertools/docs
-wtpmodule=org.eclipse.jst.server.ui.infopop
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
-
-
-newBaseDir=${newcvsdir}/webservices/docs
-wtpmodule=org.eclipse.jst.ws.axis.infopop
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
-
-wtpmodule=org.eclipse.jst.ws.axis.ui.doc.user
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
-
-wtpmodule=org.eclipse.jst.ws.consumption.infopop
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
-
-wtpmodule=org.eclipse.jst.ws.consumption.ui.doc.user
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
-
-wtpmodule=org.eclipse.jst.ws.doc.user
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
-
-wtpmodule=org.eclipse.jst.ws.infopop
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
-
-
 oldBaseDir=${oldcvsdir}/wst/components/web/features
 newBaseDir=${newcvsdir}/jeetools/features
 
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh b/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh
index 2ba3bdd..398e151 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh
@@ -4,7 +4,7 @@
 . copyAndRemove.sh
 
 newDir=${newcvsdir}/datatools
-oldDir=${oldcvsdir}/wst/components/rdb/
+oldDir=${oldcvsdir}/wst/components/rdb
 copyAndRemove $oldDir $newDir
 
 oldBaseDir=${oldcvsdir}/wst/components/doc/plugins
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh b/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh
index ba752dd..ac6acfc 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh
@@ -4,9 +4,9 @@
 . copyAndRemove.sh
 
 newDir=${newcvsdir}/webtools.releng
-oldDir=${oldcvsdir}/wst/components/assembly/
+oldDir=${oldcvsdir}/wst/components/assembly
 copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/jst/components/assembly/
+oldDir=${oldcvsdir}/jst/components/assembly
 copyAndRemove $oldDir $newDir
 oldDir=${oldcvsdir}/org.eclipse.wtp.releng
 copyAndRemove $oldDir $newDir
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh b/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
index 6ae96c7..4bff6fc 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
@@ -4,18 +4,15 @@
 . copyAndRemove.sh
 
 newDir=${newcvsdir}/servertools
-oldDir=${oldcvsdir}/wst/components/server/
+oldDir=${oldcvsdir}/wst/components/server
 
 copyAndRemove $oldDir $newDir
 
-oldDir=${oldcvsdir}/jst/components/server/
-copyAndRemove $oldDir $newDir
-
-oldDir=${oldcvsdir}/wst/components/internet/
+oldDir=${oldcvsdir}/jst/components/server
 copyAndRemove $oldDir $newDir
 
 oldBaseDir=${oldcvsdir}/wst/components/internet/plugins
-newDir=${newcvsdir}/servertools/plugins
+newBaseDir=${newcvsdir}/servertools/plugins
 
 wtpmodule=org.eclipse.wst.internet.monitor.core
 oldDir=${oldBaseDir}/${wtpmodule}
@@ -40,3 +37,21 @@
 newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir
 
+oldBaseDir=${oldcvsdir}/jst/components/doc/plugins
+newBaseDir=${newcvsdir}/servertools/docs
+wtpmodule=org.eclipse.jst.server.ui.doc.user
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
+
+newBaseDir=${newcvsdir}/servertools/docs
+wtpmodule=org.eclipse.jst.server.ui.infopop
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
+
+newBaseDir=${newcvsdir}/servertools/docs
+wtpmodule=org.eclipse.jst.server.ui.infopop
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh b/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
index 2ed17bf..8265346 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
@@ -9,23 +9,23 @@
 
 newDir=${newcvsdir}/sourceediting
 
-oldDir=${oldcvsdir}/wst/components/sse/
+oldDir=${oldcvsdir}/wst/components/sse
 copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/wst/components/xml/
+oldDir=${oldcvsdir}/wst/components/xml
 copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/wst/components/xsd/
+oldDir=${oldcvsdir}/wst/components/xsd
 copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/wst/components/dtd/
+oldDir=${oldcvsdir}/wst/components/dtd
 copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/wst/components/javascript/
+oldDir=${oldcvsdir}/wst/components/javascript
 copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/wst/components/jsdt/
+oldDir=${oldcvsdir}/wst/components/jsdt
 copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/wst/components/css/
+oldDir=${oldcvsdir}/wst/components/css
 copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/wst/components/html/
+oldDir=${oldcvsdir}/wst/components/html
 copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/jst/components/jsp/
+oldDir=${oldcvsdir}/jst/components/jsp
 copyAndRemove $oldDir $newDir
 
 oldDir=${oldcvsdir}/wst/components/web/plugins/org.eclipse.wst.standard.schemas
@@ -81,3 +81,9 @@
 newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir
 
+oldBaseDir=${oldcvsdir}/jst/components/doc/plugins
+newBaseDir=${newcvsdir}/sourceediting/docs
+wtpmodule=org.eclipse.jst.jsp.ui.infopop
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh b/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
index 3a18db1..f90a93e 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
@@ -5,11 +5,11 @@
 
 newDir=${newcvsdir}/webservices
 
-oldDir=${oldcvsdir}/wst/components/ws/
+oldDir=${oldcvsdir}/wst/components/ws
 copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/wst/components/wsdl/
+oldDir=${oldcvsdir}/wst/components/wsdl
 copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/wst/components/wsi/
+oldDir=${oldcvsdir}/wst/components/wsi
 copyAndRemove $oldDir $newDir
 
 oldBaseDir=${oldcvsdir}/wst/components/doc/plugins
@@ -29,3 +29,35 @@
 oldDir=${oldBaseDir}/${wtpmodule}
 newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir
+
+oldBaseDir=${oldcvsdir}/jst/components/doc/plugins
+newBaseDir=${newcvsdir}/webservices/docs
+wtpmodule=org.eclipse.jst.ws.axis.infopop
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
+
+wtpmodule=org.eclipse.jst.ws.axis.ui.doc.user
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
+
+wtpmodule=org.eclipse.jst.ws.consumption.infopop
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
+
+wtpmodule=org.eclipse.jst.ws.consumption.ui.doc.user
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
+
+wtpmodule=org.eclipse.jst.ws.doc.user
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
+
+wtpmodule=org.eclipse.jst.ws.infopop
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
+copyAndRemove $oldDir $newDir
\ No newline at end of file