Refactor to abide by Eclipse naming standards.

26 files changed, 135 insertions, 135 deletions

diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/.project b/proctools/org.eclipse.sequoyah.device.linuxtools/.project
index 20cac40bbf..76d668bc9d 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/.project
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.sequoyah.device.linuxtools</name>
+	<name>org.eclipse.linuxtools.sequoyah.device</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/META-INF/MANIFEST.MF b/proctools/org.eclipse.sequoyah.device.linuxtools/META-INF/MANIFEST.MF
index 006ce30ef5..02961b59da 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/META-INF/MANIFEST.MF
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.sequoyah.device.linuxtools;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.sequoyah.device.linuxtools.LinuxToolsPlugin
+Bundle-Activator: org.eclipse.linuxtools.sequoyah.device.LinuxToolsPlugin
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.sequoyah.device.linuxtools.base,
+Require-Bundle: org.eclipse.linuxtools.sequoyah.device.base,
  org.eclipse.sequoyah.device.common.utilities,
  org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -17,5 +17,5 @@ Require-Bundle: org.eclipse.sequoyah.device.linuxtools.base,
  org.eclipse.rse.core,
  org.eclipse.rse.subsystems.files.core,
  org.eclipse.rse.services
-Export-Package: org.eclipse.sequoyah.device.linuxtools.network.tcf,
- org.eclipse.sequoyah.device.linuxtools.network.telnet
+Export-Package: org.eclipse.linuxtools.sequoyah.device.network.tcf,
+ org.eclipse.linuxtools.sequoyah.device.network.telnet
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/plugin.xml b/proctools/org.eclipse.sequoyah.device.linuxtools/plugin.xml
index abb8f68448..b87dd6fd90 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/plugin.xml
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/plugin.xml
@@ -6,27 +6,27 @@
          point="org.eclipse.ui.views">
       <category
             name="%category.name"
-            id="org.eclipse.sequoyah.device.linuxtools.Category">
+            id="org.eclipse.linuxtools.sequoyah.device.Category">
       </category>
       <view
             name="%view.memorymap.name"
             icon="icons/eclipse.gif"
-            category="org.eclipse.sequoyah.device.linuxtools.Category"
-            class="org.eclipse.sequoyah.device.linuxtools.tools.memorymap.MemoryMapView"
-            id="org.eclipse.sequoyah.device.linuxtools.tools.memorymap.View">
+            category="org.eclipse.linuxtools.sequoyah.device.Category"
+            class="org.eclipse.linuxtools.sequoyah.device.tools.memorymap.MemoryMapView"
+            id="org.eclipse.linuxtools.sequoyah.device.tools.memorymap.View">
       </view>
       <view
-            category="org.eclipse.sequoyah.device.linuxtools.Category"
-            class="org.eclipse.sequoyah.device.linuxtools.tools.cpuload.CpuLoadView"
+            category="org.eclipse.linuxtools.sequoyah.device.Category"
+            class="org.eclipse.linuxtools.sequoyah.device.tools.cpuload.CpuLoadView"
             icon="icons/eclipse.gif"
-            id="org.eclipse.sequoyah.device.linuxtools.tools.cpuload.View"
+            id="org.eclipse.linuxtools.sequoyah.device.tools.cpuload.View"
             name="%view.cpuload.name">
       </view>
    </extension>
    <extension
-         point="org.eclipse.sequoyah.device.linuxtools.base.protocols">
+         point="org.eclipse.linuxtools.sequoyah.device.base.protocols">
       <protocol
-            class="org.eclipse.sequoyah.device.linuxtools.network.telnet.TelnetProvider"
+            class="org.eclipse.linuxtools.sequoyah.device.network.telnet.TelnetProvider"
             default_port="23"
             id="TELNET"
             name="Telnet">
@@ -35,7 +35,7 @@
          </capability>
       </protocol>
       <protocol
-            class="org.eclipse.sequoyah.device.linuxtools.network.tcf.TCFProvider"
+            class="org.eclipse.linuxtools.sequoyah.device.network.tcf.TCFProvider"
             default_port="1534"
             id="TM_TCF_AGENT"
             name="TM TCF Agent">
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/LinuxToolsPlugin.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/LinuxToolsPlugin.java
index 9e600c684b..ab431365ad 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/LinuxToolsPlugin.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/LinuxToolsPlugin.java
@@ -11,7 +11,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools;
+package org.eclipse.linuxtools.sequoyah.device;
 
 import org.eclipse.sequoyah.device.common.utilities.BasePlugin;
 import org.osgi.framework.BundleContext;
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
 public class LinuxToolsPlugin extends BasePlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.sequoyah.device.linuxtools"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.linuxtools.sequoyah.device"; //$NON-NLS-1$
 
 	// Common icons
 	public static final String ICON_RUN = "run.gif"; //$NON-NLS-1$
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/Messages.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/Messages.java
index 1f7ab94606..bcc84418bd 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/Messages.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/Messages.java
@@ -11,7 +11,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools;
+package org.eclipse.linuxtools.sequoyah.device;
 
 import org.eclipse.osgi.util.NLS;
 
@@ -21,7 +21,7 @@ import org.eclipse.osgi.util.NLS;
  */
 public class Messages extends NLS {
 
-	private static String BUNDLE_NAME = "org.eclipse.sequoyah.device.linuxtools.messages"; //$NON-NLS-1$
+	private static String BUNDLE_NAME = "org.eclipse.linuxtools.sequoyah.device.messages"; //$NON-NLS-1$
 	public static String TML_Plugin_Name;
 	public static String TML_Error;
 	public static String TML_Resource_Not_Available;
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/messages.properties b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/messages.properties
index a657aabb37..a657aabb37 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/messages.properties
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/messages.properties
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/network/tcf/TCFProvider.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/network/tcf/TCFProvider.java
index 6717cf0bbf..75aee71bee 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/network/tcf/TCFProvider.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/network/tcf/TCFProvider.java
@@ -11,17 +11,17 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.network.tcf;
+package org.eclipse.linuxtools.sequoyah.device.network.tcf;
 
 import java.io.IOException;
 
+import org.eclipse.linuxtools.sequoyah.device.LinuxToolsPlugin;
+import org.eclipse.linuxtools.sequoyah.device.network.IConnectionProvider;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.CommandCode;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.OperationCode;
+import org.eclipse.linuxtools.sequoyah.device.tools.AbstractNotifier;
 import org.eclipse.sequoyah.device.common.utilities.logger.ILogger;
-import org.eclipse.sequoyah.device.linuxtools.LinuxToolsPlugin;
-import org.eclipse.sequoyah.device.linuxtools.network.IConnectionProvider;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.CommandCode;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.OperationCode;
-import org.eclipse.sequoyah.device.linuxtools.tools.AbstractNotifier;
 
 public class TCFProvider extends AbstractNotifier implements
 		IConnectionProvider {
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/network/tcf/TCFWrapper.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/network/tcf/TCFWrapper.java
index dab2d5d776..42073a9a2b 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/network/tcf/TCFWrapper.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/network/tcf/TCFWrapper.java
@@ -11,12 +11,13 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.network.tcf;
+package org.eclipse.linuxtools.sequoyah.device.network.tcf;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.OperationCode;
 import org.eclipse.rse.core.IRSECoreRegistry;
 import org.eclipse.rse.core.IRSESystemType;
 import org.eclipse.rse.core.RSECorePlugin;
@@ -25,7 +26,6 @@ import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.OperationCode;
 
 public class TCFWrapper {
 
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/network/telnet/TelnetProvider.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/network/telnet/TelnetProvider.java
index 4a34606e02..5bb41dc476 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/network/telnet/TelnetProvider.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/network/telnet/TelnetProvider.java
@@ -11,17 +11,17 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.network.telnet;
+package org.eclipse.linuxtools.sequoyah.device.network.telnet;
 
 import java.io.IOException;
 
+import org.eclipse.linuxtools.sequoyah.device.LinuxToolsPlugin;
+import org.eclipse.linuxtools.sequoyah.device.network.IConnectionProvider;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.CommandCode;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.OperationCode;
+import org.eclipse.linuxtools.sequoyah.device.tools.AbstractNotifier;
 import org.eclipse.sequoyah.device.common.utilities.logger.ILogger;
-import org.eclipse.sequoyah.device.linuxtools.LinuxToolsPlugin;
-import org.eclipse.sequoyah.device.linuxtools.network.IConnectionProvider;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.CommandCode;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.OperationCode;
-import org.eclipse.sequoyah.device.linuxtools.tools.AbstractNotifier;
 
 /**
  * @author Ot�vio Ferranti
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/network/telnet/TelnetWrapper.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/network/telnet/TelnetWrapper.java
index fbb3f2ff3d..62a84efd91 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/network/telnet/TelnetWrapper.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/network/telnet/TelnetWrapper.java
@@ -11,7 +11,7 @@
  * Otavio Ferranti - Eldorado Research Institute - Bug 255255 [tml][proctools] Add extension points 
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.network.telnet;
+package org.eclipse.linuxtools.sequoyah.device.network.telnet;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,7 +23,7 @@ import org.apache.commons.net.telnet.InvalidTelnetOptionException;
 import org.apache.commons.net.telnet.SuppressGAOptionHandler;
 import org.apache.commons.net.telnet.TelnetClient;
 import org.apache.commons.net.telnet.TerminalTypeOptionHandler;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.OperationCode;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.OperationCode;
 
 /**
  * @author Ot�vio Ferranti
@@ -70,7 +70,7 @@ public class TelnetWrapper {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.network.IConnectionWrapper#connect(java.lang.String, int)
+	 * @see org.eclipse.linuxtools.sequoyah.device.network.IConnectionWrapper#connect(java.lang.String, int)
 	 */
 	public OperationCode connect(String host, int port) throws IOException {
 		OperationCode retVal;
@@ -90,7 +90,7 @@ public class TelnetWrapper {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.network.IConnectionWrapper#disconnect()
+	 * @see org.eclipse.linuxtools.sequoyah.device.network.IConnectionWrapper#disconnect()
 	 */
 	public void disconnect() throws IOException {
 		if (null != client) {
@@ -100,7 +100,7 @@ public class TelnetWrapper {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.network.IConnectionWrapper#login(java.lang.String, java.lang.String)
+	 * @see org.eclipse.linuxtools.sequoyah.device.network.IConnectionWrapper#login(java.lang.String, java.lang.String)
 	 */
 	public OperationCode login(String user, String password) throws IOException {
 		OperationCode retVal = OperationCode.UNEXPECTED_RESULT;
@@ -138,14 +138,14 @@ public class TelnetWrapper {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.network.IConnectionWrapper#getLastResponde()
+	 * @see org.eclipse.linuxtools.sequoyah.device.network.IConnectionWrapper#getLastResponde()
 	 */
 	public StringBuffer getLastResponde() {
 		return lastResponse;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.network.IConnectionWrapper#sendCommand(java.lang.String)
+	 * @see org.eclipse.linuxtools.sequoyah.device.network.IConnectionWrapper#sendCommand(java.lang.String)
 	 */
 	public String sendCommand(String command) throws IOException {
 		sendData (command);
@@ -153,7 +153,7 @@ public class TelnetWrapper {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.network.IConnectionWrapper#sendData(java.lang.String)
+	 * @see org.eclipse.linuxtools.sequoyah.device.network.IConnectionWrapper#sendData(java.lang.String)
 	 */
 	public void sendData(String out) {
 		if (null != outStream) {
@@ -163,7 +163,7 @@ public class TelnetWrapper {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.network.IConnectionWrapper#setResponseLength(int)
+	 * @see org.eclipse.linuxtools.sequoyah.device.network.IConnectionWrapper#setResponseLength(int)
 	 */
 	public void setResponseLength(int maxLength) {
 		maxResponseDataLength = maxLength;
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/CpuLoadProcessor.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/CpuLoadProcessor.java
index e6edcbee95..ce14720817 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/CpuLoadProcessor.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/CpuLoadProcessor.java
@@ -11,21 +11,21 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.cpuload;
+package org.eclipse.linuxtools.sequoyah.device.tools.cpuload;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Scanner;
 import java.util.regex.MatchResult;
 
+import org.eclipse.linuxtools.sequoyah.device.LinuxToolsPlugin;
+import org.eclipse.linuxtools.sequoyah.device.network.IConnectionProvider;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.CommandCode;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode;
+import org.eclipse.linuxtools.sequoyah.device.tools.AbstractNotifier;
+import org.eclipse.linuxtools.sequoyah.device.tools.IListener;
+import org.eclipse.linuxtools.sequoyah.device.tools.INotifier;
 import org.eclipse.sequoyah.device.common.utilities.logger.ILogger;
-import org.eclipse.sequoyah.device.linuxtools.LinuxToolsPlugin;
-import org.eclipse.sequoyah.device.linuxtools.network.IConnectionProvider;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.CommandCode;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode;
-import org.eclipse.sequoyah.device.linuxtools.tools.AbstractNotifier;
-import org.eclipse.sequoyah.device.linuxtools.tools.IListener;
-import org.eclipse.sequoyah.device.linuxtools.tools.INotifier;
 
 /**
  * @author Otavio Ferranti
@@ -70,7 +70,7 @@ public class CpuLoadProcessor extends AbstractNotifier implements IListener {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.network.IListener#notify(org.eclipse.sequoyah.device.linuxtools.network.INotifier, org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode, java.lang.Object)
+	 * @see org.eclipse.linuxtools.sequoyah.device.network.IListener#notify(org.eclipse.linuxtools.sequoyah.device.network.INotifier, org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode, java.lang.Object)
 	 */
 	public void notify(INotifier notifier,
 						EventCode event,
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/CpuLoadTool.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/CpuLoadTool.java
index 0c8bb37687..54375bf9d0 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/CpuLoadTool.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/CpuLoadTool.java
@@ -11,20 +11,20 @@
  * Otavio Ferranti - Eldorado Research Institute - Bug 255255 [tml][proctools] Add extension points 
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.cpuload;
+package org.eclipse.linuxtools.sequoyah.device.tools.cpuload;
 
 import java.io.IOException;
 import java.util.List;
 
-import org.eclipse.sequoyah.device.linuxtools.network.IConnectionProvider;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.OperationCode;
-import org.eclipse.sequoyah.device.linuxtools.tools.AbstractNotifier;
-import org.eclipse.sequoyah.device.linuxtools.tools.IListener;
-import org.eclipse.sequoyah.device.linuxtools.tools.INotifier;
-import org.eclipse.sequoyah.device.linuxtools.tools.ITool;
-import org.eclipse.sequoyah.device.linuxtools.utilities.Extensions;
-import org.eclipse.sequoyah.device.linuxtools.utilities.ProtocolDescriptor;
+import org.eclipse.linuxtools.sequoyah.device.network.IConnectionProvider;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.OperationCode;
+import org.eclipse.linuxtools.sequoyah.device.tools.AbstractNotifier;
+import org.eclipse.linuxtools.sequoyah.device.tools.IListener;
+import org.eclipse.linuxtools.sequoyah.device.tools.INotifier;
+import org.eclipse.linuxtools.sequoyah.device.tools.ITool;
+import org.eclipse.linuxtools.sequoyah.device.utilities.Extensions;
+import org.eclipse.linuxtools.sequoyah.device.utilities.ProtocolDescriptor;
 
 /**
  * @author Otavio Ferranti
@@ -42,7 +42,7 @@ public class CpuLoadTool extends AbstractNotifier implements IListener, ITool {
 	private String[] requiredCapabilities = {"GET_FILE"}; //$NON-NLS-1$
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.tools.ITool#createConnection(java.lang.String, int, java.lang.String)
+	 * @see org.eclipse.linuxtools.sequoyah.device.tools.ITool#createConnection(java.lang.String, int, java.lang.String)
 	 */
 	public void connect (String host,
 								int port,
@@ -70,7 +70,7 @@ public class CpuLoadTool extends AbstractNotifier implements IListener, ITool {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.tools.ITool#closeConnection()
+	 * @see org.eclipse.linuxtools.sequoyah.device.tools.ITool#closeConnection()
 	 */
 	public void disconnect() {
 		if (null != connectionProvider) {
@@ -84,7 +84,7 @@ public class CpuLoadTool extends AbstractNotifier implements IListener, ITool {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.tools.ITool#login(java.lang.String, java.lang.String)
+	 * @see org.eclipse.linuxtools.sequoyah.device.tools.ITool#login(java.lang.String, java.lang.String)
 	 */
 	public void login (String user, String password) {
 		try {
@@ -100,7 +100,7 @@ public class CpuLoadTool extends AbstractNotifier implements IListener, ITool {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.tools.IListener#notify(org.eclipse.sequoyah.device.linuxtools.tools.INotifier, org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode, java.lang.Object)
+	 * @see org.eclipse.linuxtools.sequoyah.device.tools.IListener#notify(org.eclipse.linuxtools.sequoyah.device.tools.INotifier, org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode, java.lang.Object)
 	 */
 	public void notify(INotifier notifier, EventCode event, Object result) {
 		try {
@@ -164,14 +164,14 @@ public class CpuLoadTool extends AbstractNotifier implements IListener, ITool {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.tools.ITool#getRefreshDelay()
+	 * @see org.eclipse.linuxtools.sequoyah.device.tools.ITool#getRefreshDelay()
 	 */
 	public int getRefreshDelay() {
 		return this.delay;
 	}
 		
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.tools.ITool#setRefreshDelay(int)
+	 * @see org.eclipse.linuxtools.sequoyah.device.tools.ITool#setRefreshDelay(int)
 	 */
 	public void setRefreshDelay(int delay) {
 		this.delay = delay;
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/CpuLoadView.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/CpuLoadView.java
index 9942c6da40..d6d4b71b1b 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/CpuLoadView.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/CpuLoadView.java
@@ -11,25 +11,25 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.cpuload;
+package org.eclipse.linuxtools.sequoyah.device.tools.cpuload;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.sequoyah.device.linuxtools.LinuxToolsPlugin;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.OperationCode;
-import org.eclipse.sequoyah.device.linuxtools.tools.IListener;
-import org.eclipse.sequoyah.device.linuxtools.tools.INotifier;
-import org.eclipse.sequoyah.device.linuxtools.tools.ITool;
-import org.eclipse.sequoyah.device.linuxtools.ui.DialogLogin;
-import org.eclipse.sequoyah.device.linuxtools.ui.IToolViewPart;
-import org.eclipse.sequoyah.device.linuxtools.ui.ViewActionConnect;
-import org.eclipse.sequoyah.device.linuxtools.ui.ViewActionDisconnect;
-import org.eclipse.sequoyah.device.linuxtools.ui.ViewActionPause;
-import org.eclipse.sequoyah.device.linuxtools.ui.ViewActionRun;
+import org.eclipse.linuxtools.sequoyah.device.LinuxToolsPlugin;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.OperationCode;
+import org.eclipse.linuxtools.sequoyah.device.tools.IListener;
+import org.eclipse.linuxtools.sequoyah.device.tools.INotifier;
+import org.eclipse.linuxtools.sequoyah.device.tools.ITool;
+import org.eclipse.linuxtools.sequoyah.device.ui.DialogLogin;
+import org.eclipse.linuxtools.sequoyah.device.ui.IToolViewPart;
+import org.eclipse.linuxtools.sequoyah.device.ui.ViewActionConnect;
+import org.eclipse.linuxtools.sequoyah.device.ui.ViewActionDisconnect;
+import org.eclipse.linuxtools.sequoyah.device.ui.ViewActionPause;
+import org.eclipse.linuxtools.sequoyah.device.ui.ViewActionRun;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
@@ -235,7 +235,7 @@ public class CpuLoadView extends ViewPart implements IToolViewPart, IListener {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.ui.IToolView#getTool()
+	 * @see org.eclipse.linuxtools.sequoyah.device.ui.IToolView#getTool()
 	 */
 	public ITool getTool() {
 		if(null == tool) {
@@ -246,7 +246,7 @@ public class CpuLoadView extends ViewPart implements IToolViewPart, IListener {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.network.IListener#notify(org.eclipse.sequoyah.device.linuxtools.network.INotifier, org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode, java.lang.Object)
+	 * @see org.eclipse.linuxtools.sequoyah.device.network.IListener#notify(org.eclipse.linuxtools.sequoyah.device.network.INotifier, org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode, java.lang.Object)
 	 */
 	public void notify(INotifier notifier, EventCode event, Object result) {
 		if (notifier == this.tool) {
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/CpuLoadViewContentProvider.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/CpuLoadViewContentProvider.java
index 00a8f37e75..6aed1e4c86 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/CpuLoadViewContentProvider.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/CpuLoadViewContentProvider.java
@@ -11,7 +11,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.cpuload;
+package org.eclipse.linuxtools.sequoyah.device.tools.cpuload;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/CpuLoadViewLabelProvider.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/CpuLoadViewLabelProvider.java
index 085d569d55..3acfca3214 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/CpuLoadViewLabelProvider.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/CpuLoadViewLabelProvider.java
@@ -11,7 +11,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.cpuload;
+package org.eclipse.linuxtools.sequoyah.device.tools.cpuload;
 
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/DialogOptions.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/DialogOptions.java
index 846e7b96f5..f8b06c5cbf 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/DialogOptions.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/DialogOptions.java
@@ -11,10 +11,10 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.cpuload;
+package org.eclipse.linuxtools.sequoyah.device.tools.cpuload;
 
 import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.sequoyah.device.linuxtools.tools.ITool;
+import org.eclipse.linuxtools.sequoyah.device.tools.ITool;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/Messages.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/Messages.java
index 736460acb4..cb853297dc 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/Messages.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/Messages.java
@@ -11,7 +11,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.cpuload;
+package org.eclipse.linuxtools.sequoyah.device.tools.cpuload;
 
 import org.eclipse.osgi.util.NLS;
 
@@ -20,7 +20,7 @@ import org.eclipse.osgi.util.NLS;
  */
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME =
-			"org.eclipse.sequoyah.device.linuxtools.tools.cpuload.messages"; //$NON-NLS-1$
+			"org.eclipse.linuxtools.sequoyah.device.tools.cpuload.messages"; //$NON-NLS-1$
 	public static String CpuLoadProcessor_Msg_Executing_the_command;
 	public static String CpuLoadProcessor_Msg_Got_The_Result;
 	public static String CpuLoadView_Action_Connect;
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/ViewActionOptions.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/ViewActionOptions.java
index d50864f861..5986507130 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/ViewActionOptions.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/ViewActionOptions.java
@@ -11,11 +11,11 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.cpuload;
+package org.eclipse.linuxtools.sequoyah.device.tools.cpuload;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.sequoyah.device.linuxtools.ui.IToolViewPart;
+import org.eclipse.linuxtools.sequoyah.device.ui.IToolViewPart;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.PlatformUI;
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/messages.properties b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/messages.properties
index da06c3d3c9..da06c3d3c9 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/cpuload/messages.properties
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/cpuload/messages.properties
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/MemoryMapProcessor.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/MemoryMapProcessor.java
index 5244f3e06b..083cde3c79 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/MemoryMapProcessor.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/MemoryMapProcessor.java
@@ -11,21 +11,21 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.memorymap;
+package org.eclipse.linuxtools.sequoyah.device.tools.memorymap;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Scanner;
 import java.util.regex.MatchResult;
 
+import org.eclipse.linuxtools.sequoyah.device.LinuxToolsPlugin;
+import org.eclipse.linuxtools.sequoyah.device.network.IConnectionProvider;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.CommandCode;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode;
+import org.eclipse.linuxtools.sequoyah.device.tools.AbstractNotifier;
+import org.eclipse.linuxtools.sequoyah.device.tools.IListener;
+import org.eclipse.linuxtools.sequoyah.device.tools.INotifier;
 import org.eclipse.sequoyah.device.common.utilities.logger.ILogger;
-import org.eclipse.sequoyah.device.linuxtools.LinuxToolsPlugin;
-import org.eclipse.sequoyah.device.linuxtools.network.IConnectionProvider;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.CommandCode;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode;
-import org.eclipse.sequoyah.device.linuxtools.tools.AbstractNotifier;
-import org.eclipse.sequoyah.device.linuxtools.tools.IListener;
-import org.eclipse.sequoyah.device.linuxtools.tools.INotifier;
 
 /**
  * @author Otavio Ferranti
@@ -65,7 +65,7 @@ public class MemoryMapProcessor extends AbstractNotifier implements IListener {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.network.IListener#notify(org.eclipse.sequoyah.device.linuxtools.network.INotifier, org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode, java.lang.Object)
+	 * @see org.eclipse.linuxtools.sequoyah.device.network.IListener#notify(org.eclipse.linuxtools.sequoyah.device.network.INotifier, org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode, java.lang.Object)
 	 */
 	public void notify(INotifier notifier,
 						EventCode event,
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/MemoryMapTool.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/MemoryMapTool.java
index 23d58e1a58..d2a1386321 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/MemoryMapTool.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/MemoryMapTool.java
@@ -11,20 +11,20 @@
  * Otavio Ferranti - Eldorado Research Institute - Bug 255255 [tml][proctools] Add extension points 
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.memorymap;
+package org.eclipse.linuxtools.sequoyah.device.tools.memorymap;
 
 import java.io.IOException;
 import java.util.List;
 
-import org.eclipse.sequoyah.device.linuxtools.network.IConnectionProvider;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.OperationCode;
-import org.eclipse.sequoyah.device.linuxtools.tools.AbstractNotifier;
-import org.eclipse.sequoyah.device.linuxtools.tools.IListener;
-import org.eclipse.sequoyah.device.linuxtools.tools.INotifier;
-import org.eclipse.sequoyah.device.linuxtools.tools.ITool;
-import org.eclipse.sequoyah.device.linuxtools.utilities.Extensions;
-import org.eclipse.sequoyah.device.linuxtools.utilities.ProtocolDescriptor;
+import org.eclipse.linuxtools.sequoyah.device.network.IConnectionProvider;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.OperationCode;
+import org.eclipse.linuxtools.sequoyah.device.tools.AbstractNotifier;
+import org.eclipse.linuxtools.sequoyah.device.tools.IListener;
+import org.eclipse.linuxtools.sequoyah.device.tools.INotifier;
+import org.eclipse.linuxtools.sequoyah.device.tools.ITool;
+import org.eclipse.linuxtools.sequoyah.device.utilities.Extensions;
+import org.eclipse.linuxtools.sequoyah.device.utilities.ProtocolDescriptor;
 
 /**
  * @author Otavio Ferranti
@@ -37,7 +37,7 @@ public class MemoryMapTool extends AbstractNotifier implements IListener, ITool
 	private String[] requiredCapabilities = {"GET_FILE"}; //$NON-NLS-1$
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.tools.memorymap.iTool#createInstance(java.lang.String, int, java.lang.String)
+	 * @see org.eclipse.linuxtools.sequoyah.device.tools.memorymap.iTool#createInstance(java.lang.String, int, java.lang.String)
 	 */
 	public void connect (String host,
 								int port,
@@ -64,7 +64,7 @@ public class MemoryMapTool extends AbstractNotifier implements IListener, ITool
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.tools.ITool#closeConnection()
+	 * @see org.eclipse.linuxtools.sequoyah.device.tools.ITool#closeConnection()
 	 */
 	public void disconnect() {
 		if (null != connectionProvider) {
@@ -77,7 +77,7 @@ public class MemoryMapTool extends AbstractNotifier implements IListener, ITool
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.tools.memorymap.iTool#login(java.lang.String, java.lang.String)
+	 * @see org.eclipse.linuxtools.sequoyah.device.tools.memorymap.iTool#login(java.lang.String, java.lang.String)
 	 */
 	public void login (String user, String password) {
 		try {
@@ -93,7 +93,7 @@ public class MemoryMapTool extends AbstractNotifier implements IListener, ITool
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.tools.IListener#notify(org.eclipse.sequoyah.device.linuxtools.tools.INotifier, org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode, java.lang.Object)
+	 * @see org.eclipse.linuxtools.sequoyah.device.tools.IListener#notify(org.eclipse.linuxtools.sequoyah.device.tools.INotifier, org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode, java.lang.Object)
 	 */
 	public void notify(INotifier notifier, EventCode event, Object result) {
 		try {
@@ -160,7 +160,7 @@ public class MemoryMapTool extends AbstractNotifier implements IListener, ITool
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.tools.ITool#getRefreshDelay()
+	 * @see org.eclipse.linuxtools.sequoyah.device.tools.ITool#getRefreshDelay()
 	 */
 	public int getRefreshDelay() {
 		// TODO Auto-generated method stub
@@ -168,7 +168,7 @@ public class MemoryMapTool extends AbstractNotifier implements IListener, ITool
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.tools.ITool#setRefreshDelay(int)
+	 * @see org.eclipse.linuxtools.sequoyah.device.tools.ITool#setRefreshDelay(int)
 	 */
 	public void setRefreshDelay(int delay) {
 		// TODO Auto-generated method stub
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/MemoryMapVViewLabelProvider.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/MemoryMapVViewLabelProvider.java
index 66c0a17496..55abd9853c 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/MemoryMapVViewLabelProvider.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/MemoryMapVViewLabelProvider.java
@@ -11,7 +11,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.memorymap;
+package org.eclipse.linuxtools.sequoyah.device.tools.memorymap;
 
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/MemoryMapView.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/MemoryMapView.java
index 6d234cef9d..a6f58b0852 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/MemoryMapView.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/MemoryMapView.java
@@ -11,24 +11,24 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.memorymap;
+package org.eclipse.linuxtools.sequoyah.device.tools.memorymap;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.sequoyah.device.linuxtools.LinuxToolsPlugin;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode;
-import org.eclipse.sequoyah.device.linuxtools.network.IConstants.OperationCode;
-import org.eclipse.sequoyah.device.linuxtools.tools.IListener;
-import org.eclipse.sequoyah.device.linuxtools.tools.INotifier;
-import org.eclipse.sequoyah.device.linuxtools.tools.ITool;
-import org.eclipse.sequoyah.device.linuxtools.ui.DialogLogin;
-import org.eclipse.sequoyah.device.linuxtools.ui.IToolViewPart;
-import org.eclipse.sequoyah.device.linuxtools.ui.ViewActionConnect;
-import org.eclipse.sequoyah.device.linuxtools.ui.ViewActionDisconnect;
-import org.eclipse.sequoyah.device.linuxtools.ui.ViewActionRefresh;
+import org.eclipse.linuxtools.sequoyah.device.LinuxToolsPlugin;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode;
+import org.eclipse.linuxtools.sequoyah.device.network.IConstants.OperationCode;
+import org.eclipse.linuxtools.sequoyah.device.tools.IListener;
+import org.eclipse.linuxtools.sequoyah.device.tools.INotifier;
+import org.eclipse.linuxtools.sequoyah.device.tools.ITool;
+import org.eclipse.linuxtools.sequoyah.device.ui.DialogLogin;
+import org.eclipse.linuxtools.sequoyah.device.ui.IToolViewPart;
+import org.eclipse.linuxtools.sequoyah.device.ui.ViewActionConnect;
+import org.eclipse.linuxtools.sequoyah.device.ui.ViewActionDisconnect;
+import org.eclipse.linuxtools.sequoyah.device.ui.ViewActionRefresh;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
@@ -195,7 +195,7 @@ public class MemoryMapView extends ViewPart implements IToolViewPart, IListener
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.ui.IToolView#getTool()
+	 * @see org.eclipse.linuxtools.sequoyah.device.ui.IToolView#getTool()
 	 */
 	public ITool getTool() {
 		if(null == tool) {
@@ -206,7 +206,7 @@ public class MemoryMapView extends ViewPart implements IToolViewPart, IListener
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.sequoyah.device.linuxtools.network.IListener#notify(org.eclipse.sequoyah.device.linuxtools.network.INotifier, org.eclipse.sequoyah.device.linuxtools.network.IConstants.EventCode, java.lang.Object)
+	 * @see org.eclipse.linuxtools.sequoyah.device.network.IListener#notify(org.eclipse.linuxtools.sequoyah.device.network.INotifier, org.eclipse.linuxtools.sequoyah.device.network.IConstants.EventCode, java.lang.Object)
 	 */
 	public void notify(INotifier notifier, EventCode event, Object result) {
 		if (notifier == tool) {
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/MemoryMapViewContentProvider.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/MemoryMapViewContentProvider.java
index 3e396fc40d..c251eabe92 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/MemoryMapViewContentProvider.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/MemoryMapViewContentProvider.java
@@ -11,7 +11,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.memorymap;
+package org.eclipse.linuxtools.sequoyah.device.tools.memorymap;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/Messages.java b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/Messages.java
index c7155dd838..0f6fdcbede 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/Messages.java
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/Messages.java
@@ -11,7 +11,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.sequoyah.device.linuxtools.tools.memorymap;
+package org.eclipse.linuxtools.sequoyah.device.tools.memorymap;
 
 import org.eclipse.osgi.util.NLS;
 
@@ -20,7 +20,7 @@ import org.eclipse.osgi.util.NLS;
  */
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME =
-			"org.eclipse.sequoyah.device.linuxtools.tools.memorymap.messages"; //$NON-NLS-1$
+			"org.eclipse.linuxtools.sequoyah.device.tools.memorymap.messages"; //$NON-NLS-1$
 
 	public static String MemoryMapProcessor_Msg_Executing_The_Command;
 	public static String MemoryMapProcessor_Msg_Got_The_Result;
diff --git a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/messages.properties b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/messages.properties
index b242a0463e..b242a0463e 100644
--- a/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/sequoyah/device/linuxtools/tools/memorymap/messages.properties
+++ b/proctools/org.eclipse.sequoyah.device.linuxtools/src/org/eclipse/linuxtools/sequoyah/device/tools/memorymap/messages.properties