diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index f97d6222e68..97332b74912 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -65,12 +65,12 @@
 	<antcall target="dstore_extra_server.jar"/>
 	<property name="universalserverfilelist"
 		value="${buildDirectory}/plugins/org.eclipse.dstore.core/dstore_core.jar,
-	    	${buildDirectory}/plugins/org.eclipse.dstore.core/serverscripts/auth.pl,
-			${buildDirectory}/plugins/org.eclipse.dstore.core/serverscripts/ssl.properties,
 	    	${buildDirectory}/plugins/org.eclipse.dstore.extra/serverruntime/dstore_extra_server.jar,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/patterns.dat,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services/clientserver.jar,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/dstore_miners.jar,
+			${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/auth.pl,
+			${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/ssl.properties,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/minerFile.dat,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/rsecomm.properties,
 	    	${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime/server.linux,
@@ -86,12 +86,12 @@
 	
 	<copy todir="${packageDirectory}\rseserver">
 	    <fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.core" includes="dstore_core.jar"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.core/serverscripts" includes="auth.pl"/>
-	    <fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.core/serverscripts" includes="ssl.properties"/>
 	    <fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.extra/serverruntime" includes ="dstore_extra_server.jar"/>
 	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore" includes="dstore_miners.jar"/>
 	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore" includes="patterns.dat"/>
 	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services" includes="clientserver.jar"/>
+		<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="auth.pl"/>
+		<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="ssl.properties"/>
 	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="minerFile.dat"/>
 	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="rsecomm.properties"/>
 	    <fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="server.linux"/>
@@ -252,6 +252,19 @@
 	
 	<zip destfile="${packageDirectory}\rse-runtime-M1.zip" basedir="${packageRuntimeDirectory}"/>
 	
+	<property name="packageSDKDirectory" location="${packageDirectory}\sdk"/>
+	<property name="packageSDKRootDirectory" location="${packageSDKDirectory}\eclipse"/>
+	<mkdir dir="${packageSDKDirectory}"/>
+	<mkdir dir="${packageSDKRootDirectory}"/>
+	
+	<unzip src="${packageDirectory}\rse-runtime-M1.zip" dest="${packageSDKRootDirectory}"/>
+	<unzip src="${buildDirectory}\features\org.eclipse.rse.core\org.eclipse.rse.core_1.0.0.src.zip" dest="${packageSDKRootDirectory}"/>
+	<unzip src="${buildDirectory}\features\org.eclipse.rse.dstore\org.eclipse.rse.dstore_1.0.0.src.zip" dest="${packageSDKRootDirectory}"/>
+	<unzip src="${buildDirectory}\features\org.eclipse.rse.ftp\org.eclipse.rse.ftp_1.0.0.src.zip" dest="${packageSDKRootDirectory}"/>
+	<unzip src="${buildDirectory}\features\org.eclipse.rse.local\org.eclipse.rse.local_1.0.0.src.zip" dest="${packageSDKRootDirectory}"/>
+	
+	<zip destfile="${packageDirectory}\rse-SDK-M1.zip" basedir="${packageSDKDirectory}"/>
+	
 	<!--
 	<antcall target="serverruntime"/>
 	
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/auth.pl b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/auth.pl
index 77eb0955449..6b4f4da569e 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/auth.pl
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/auth.pl
@@ -45,7 +45,7 @@ else
 			$suOptions="-";
 		}
 
-		system("su $suOptions $userIN -c 'java -cp $classpath -DA_PLUGIN_PATH=$pathIN com.ibm.etools.systems.dstore.core.server.Server $portIN $timeoutIN $ticketIN'");
+		system("su $suOptions $userIN -c 'java -cp $classpath -DA_PLUGIN_PATH=$pathIN org.eclipse.dstore.core.server.Server $portIN $timeoutIN $ticketIN -Xshareclasses:name=RSE,verbose'");
 		1;
     }
     else
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.linux b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.linux
index 5f23205ad3b..23853b8a131 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.linux
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.linux
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
  
-$port = "4800";
+$port = "4035";
 $helpFlag = "-h"; 
  
 if (defined($ARGV[0]))
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.unix b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.unix
index cc3efd9c10d..6ac6927f355 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.unix
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.unix
@@ -32,11 +32,11 @@ else
     
     $oldClasspath = $ENV{CLASSPATH};
 
-	$ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/universalminers.jar:$plugins_dir/clientserver.jar:$oldClasspath";
+	$ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath";
 
 	
     
-    system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -DDSTORE_TRACING_ON=$trace com.ibm.etools.systems.dstore.core.server.ServerLauncher $port");
+    system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -DDSTORE_TRACING_ON=$trace org.eclipse.dstore.core.server.ServerLauncher $port");
     $ENV{CLASSPATH}=$oldClasspath;
     
 }
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.win.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.win.bat
index f2a3584097a..558ae55ecce 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.win.bat
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/daemon.win.bat
@@ -1,2 +1,2 @@
-java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% com.ibm.etools.systems.dstore.core.server.ServerLauncher
+java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% org.eclipse.dstore.core.server.ServerLauncher
 
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/run.win.bat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/run.win.bat
index 53eff1790ba..fe8c378b44f 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/run.win.bat
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/run.win.bat
@@ -12,12 +12,12 @@ if xxx%3 == xxx goto runNoTicket
 
 @echo on
 
-java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% com.ibm.etools.systems.dstore.core.server.Server %PORT% %TIMEOUT% %TICKET%
+java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT% %TICKET%
 goto done
 
 :runNoTicket
 @echo on
-java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% com.ibm.etools.systems.dstore.core.server.Server %PORT% %TIMEOUT%
+java -DA_PLUGIN_PATH=%A_PLUGIN_PATH% org.eclipse.dstore.core.server.Server %PORT% %TIMEOUT%
 goto done
 
 :usage
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.linux b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.linux
index 68dd0623951..93e6cb271ae 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.linux
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.linux
@@ -19,7 +19,7 @@ $oldClasspath = $ENV{CLASSPATH};
 
 if ($packaged_as == "jar")
 {
-    $ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/universalminers.jar:$plugins_dir/clientserver.jar:$oldClasspath";
+    $ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath";
 }
 if ($packaged_as == "src")
 {
@@ -27,22 +27,22 @@ if ($packaged_as == "src")
 }
 if (!defined($packaged_as))
 {
-    $ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/universalminers.jar:$plugins_dir/clientserver.jar:$oldClasspath";
+    $ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath";
 }
 
 if (!defined($timeout))
 {
-	system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH com.ibm.etools.systems.dstore.core.server.Server $port");
+	system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH org.eclipse.dstore.core.server.Server $port");
 }
 else
 {
 	if (!defined($clientUserID))
 	{
-		system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH com.ibm.etools.systems.dstore.core.server.Server $port $timeout");
+		system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH org.eclipse.dstore.core.server.Server $port $timeout");
 	}
 	else
 	{
-		system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -Dclient.username=$clientUserID com.ibm.etools.systems.dstore.core.server.Server $port $timeout");
+		system("java -DA_PLUGIN_PATH=\$A_PLUGIN_PATH -Dclient.username=$clientUserID org.eclipse.dstore.core.server.Server $port $timeout");
 	}
 }
 
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.unix b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.unix
index cc9eb2a6dd3..22f779ddcb9 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.unix
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/server.unix
@@ -1,8 +1,8 @@
 # Shell script to starat RSE communications server
 # This script will start the datastore listening on an available socket
 export serverpath=.;
-export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:universalminers.jar:clientserver.jar:$CLASSPATH;
+export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
 if [ $1 ]                     
-then java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$1 com.ibm.etools.systems.dstore.core.server.Server 0 60000 &
-else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false com.ibm.etools.systems.dstore.core.server.Server 0 60000 &
+then java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$1 org.eclipse.dstore.core.server.Server 0 60000 &
+else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false org.eclipse.dstore.core.server.Server 0 60000 &
 fi
diff --git a/rse/plugins/org.eclipse.rse.services.local/build.properties b/rse/plugins/org.eclipse.rse.services.local/build.properties
index 75c0226ba22..5f9a6edae26 100644
--- a/rse/plugins/org.eclipse.rse.services.local/build.properties
+++ b/rse/plugins/org.eclipse.rse.services.local/build.properties
@@ -2,7 +2,8 @@ bin.includes = META-INF/,\
                about.html,\
                about.properties,\
                plugin.properties,\
-               localfiles.jar
+               localfiles.jar,\
+               patterns.dat
 source.localfiles.jar = src/
 jars.compile.order = localfiles.jar
 output.localfiles.jar = bin/