some cleanup and corrections
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