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 3d72c0e..6ae96c7 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 
 . mainparams.shsource
 . copyAndRemove.sh
@@ -31,11 +32,11 @@
 
 wtpmodule=org.eclipse.wst.server.ui.doc.user
 oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir
 
 wtpmodule=org.eclipse.wst.server.ui.infopop
 oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir