diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java
index 65084ba87ce..31f589c8597 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java
@@ -46,7 +46,7 @@ import org.eclipse.dstore.core.util.ExternalLoader;
 import org.eclipse.dstore.core.util.Sender;
 import org.eclipse.dstore.core.util.ssl.DStoreSSLContext;
 import org.eclipse.dstore.core.util.ssl.DataStoreTrustManager;
-import org.eclipse.dstore.extra.internal.DomainNotifier;
+import org.eclipse.dstore.internal.extra.DomainNotifier;
 
 
 /**
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java
index fd402e5538c..e302aba1cef 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java
@@ -22,9 +22,9 @@ import java.util.List;
 import org.eclipse.dstore.core.util.DataElementRemover;
 import org.eclipse.dstore.core.util.StringCompare;
 import org.eclipse.dstore.extra.IDataElement;
-import org.eclipse.dstore.extra.internal.DataElementActionFilter;
-import org.eclipse.dstore.extra.internal.DesktopElement;
-import org.eclipse.dstore.extra.internal.PropertySource;
+import org.eclipse.dstore.internal.extra.DataElementActionFilter;
+import org.eclipse.dstore.internal.extra.DesktopElement;
+import org.eclipse.dstore.internal.extra.PropertySource;
 
 /**
  * <code>DataElement</code> is the unit of information for the <code>DataStore</code>.  All objects including
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
index 843a587af00..f7e89899e30 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
@@ -48,7 +48,7 @@ import org.eclipse.dstore.core.util.ExternalLoader;
 import org.eclipse.dstore.core.util.StringCompare;
 import org.eclipse.dstore.core.util.XMLgenerator;
 import org.eclipse.dstore.core.util.XMLparser;
-import org.eclipse.dstore.extra.internal.DomainNotifier;
+import org.eclipse.dstore.internal.extra.DomainNotifier;
 
 /**
  * <code>DataStore</code> is the heart of the <code>DataStore</code> Distributed Tooling Framework.
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java
index 072ca6744ae..b3e419e10ee 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDataElement.java
@@ -18,7 +18,7 @@ package org.eclipse.dstore.extra;
 
 import java.util.List;
 
-import org.eclipse.dstore.extra.internal.IElement;
+import org.eclipse.dstore.internal.extra.IElement;
 
 public interface IDataElement extends IElement
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DataElementActionFilter.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DataElementActionFilter.java
similarity index 97%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DataElementActionFilter.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DataElementActionFilter.java
index f38b44f9128..fa138564deb 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DataElementActionFilter.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DataElementActionFilter.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 import org.eclipse.dstore.extra.IDataElement;
 
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DesktopElement.java
similarity index 96%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DesktopElement.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DesktopElement.java
index 2a85bc5aca6..a03533b8154 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DesktopElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DesktopElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 public class DesktopElement
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DomainNotifier.java
similarity index 97%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DomainNotifier.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DomainNotifier.java
index cf4c36bce80..970e822406e 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DomainNotifier.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/DomainNotifier.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 import org.eclipse.dstore.extra.DomainEvent;
 import org.eclipse.dstore.extra.IDomainListener;
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IDesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IDesktopElement.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IDesktopElement.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IDesktopElement.java
index c5de0478555..2644fcea960 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IDesktopElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IDesktopElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 public interface IDesktopElement
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IElement.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IElement.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IElement.java
index 27f19e52ce3..b3c241da74f 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
  
 public interface IElement
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IPropertySource.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IPropertySource.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IPropertySource.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IPropertySource.java
index 3c185022f99..c26d0c0c581 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IPropertySource.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/IPropertySource.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 public interface IPropertySource 
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/PropertySource.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/PropertySource.java
similarity index 96%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/PropertySource.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/PropertySource.java
index d9e5fcb476a..0d57f0ef0f3 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/PropertySource.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/internal/extra/PropertySource.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 import org.eclipse.dstore.extra.IDataElement;
  
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java
index 2423e97dab9..836fbaeeb4f 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDataElement.java
@@ -18,7 +18,7 @@ package org.eclipse.dstore.extra;
 
 import java.util.List;
 
-import org.eclipse.dstore.extra.internal.IElement;
+import org.eclipse.dstore.internal.extra.IElement;
 
 public interface IDataElement extends IElement
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DataElementActionFilter.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DataElementActionFilter.java
similarity index 98%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DataElementActionFilter.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DataElementActionFilter.java
index b46af5bfca6..5314d8e3799 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DataElementActionFilter.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DataElementActionFilter.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 import org.eclipse.dstore.extra.IDataElement;
 
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DesktopElement.java
similarity index 98%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DesktopElement.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DesktopElement.java
index 57c2e6d6e6d..428c1021c20 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DesktopElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DesktopElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 import java.util.List;
 
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DomainNotifier.java
similarity index 98%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DomainNotifier.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DomainNotifier.java
index 723fc58d6fc..19be8585549 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DomainNotifier.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/DomainNotifier.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 import java.util.ArrayList;
 
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IDataElementActionFilter.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDataElementActionFilter.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IDataElementActionFilter.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDataElementActionFilter.java
index 7235ff5460c..b81fefa018a 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IDataElementActionFilter.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDataElementActionFilter.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 public interface IDataElementActionFilter extends org.eclipse.ui.IActionFilter 
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IDesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDesktopElement.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IDesktopElement.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDesktopElement.java
index 1eae7ae2fa1..547011af372 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IDesktopElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IDesktopElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
  
 public interface IDesktopElement extends org.eclipse.ui.model.IWorkbenchAdapter
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IElement.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IElement.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IElement.java
index c3e1f5e00e3..06c458e664c 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 import org.eclipse.core.runtime.IAdaptable;
 
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IPropertySource.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IPropertySource.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IPropertySource.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IPropertySource.java
index 44e018e643a..3e6f79042b6 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IPropertySource.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/IPropertySource.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 public interface IPropertySource extends org.eclipse.ui.views.properties.IPropertySource
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/PropertySource.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/PropertySource.java
similarity index 98%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/PropertySource.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/PropertySource.java
index 45796ee2932..83fe874dfe6 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/PropertySource.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/internal/extra/PropertySource.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal;
+package org.eclipse.dstore.internal.extra;
 
 import java.util.HashMap;
 import java.util.List;