diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/DomainEvent.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/DomainEvent.java
similarity index 94%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/DomainEvent.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/DomainEvent.java
index ab0b36a619d..dc40b3b93b2 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/DomainEvent.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/DomainEvent.java
@@ -14,12 +14,10 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra;
 
 import java.util.List;
 
-import org.eclipse.dstore.extra.IDataElement;
-import org.eclipse.dstore.extra.IDomainNotifier;
 
 public class DomainEvent 
 {
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 9901c0ba60f..072ca6744ae 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
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and International Business Machines Corporation. All rights reserved.
+ * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines Corporation. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -18,7 +18,7 @@ package org.eclipse.dstore.extra;
 
 import java.util.List;
 
-import org.eclipse.dstore.extra.internal.extra.IElement;
+import org.eclipse.dstore.extra.internal.IElement;
 
 public interface IDataElement extends IElement
 {
@@ -30,8 +30,8 @@ public interface IDataElement extends IElement
     List getNestedData();
     int getNestedSize();
 
+
     Object getElementProperty(Object obj);
     List getAssociated(String key);
-
     boolean isOfType(String typeStr);
 }
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainListener.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainListener.java
index 36f7879c87c..ae3639d1629 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainListener.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainListener.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and International Business Machines Corporation. All rights reserved.
+ * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines Corporation. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -16,11 +16,11 @@
 
 package org.eclipse.dstore.extra;
 
-import org.eclipse.dstore.extra.internal.extra.DomainEvent;
 
 public interface IDomainListener
 {
 
+
     public boolean listeningTo(DomainEvent e);  
     public void domainChanged(DomainEvent e);
 }
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainNotifier.java
index 13c71c43e47..bfd5428c1e5 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainNotifier.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/IDomainNotifier.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and International Business Machines Corporation. All rights reserved.
+ * Copyright (c) 2001, 2006 IBM Corporation and International Business Machines Corporation. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -16,7 +16,6 @@
 
 package org.eclipse.dstore.extra;
 
-import org.eclipse.dstore.extra.internal.extra.DomainEvent;
 
 public interface IDomainNotifier
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/DataElementActionFilter.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DataElementActionFilter.java
similarity index 97%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/DataElementActionFilter.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DataElementActionFilter.java
index 05f846d8611..f38b44f9128 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/DataElementActionFilter.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DataElementActionFilter.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
 import org.eclipse.dstore.extra.IDataElement;
 
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/DesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DesktopElement.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/DesktopElement.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DesktopElement.java
index 46e160dff92..2a85bc5aca6 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/DesktopElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DesktopElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
 public class DesktopElement
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/DomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DomainNotifier.java
similarity index 94%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/DomainNotifier.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DomainNotifier.java
index 29b15dae958..cf4c36bce80 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/DomainNotifier.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/DomainNotifier.java
@@ -14,8 +14,9 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
+import org.eclipse.dstore.extra.DomainEvent;
 import org.eclipse.dstore.extra.IDomainListener;
 import org.eclipse.dstore.extra.IDomainNotifier;
 
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/IDesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IDesktopElement.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/IDesktopElement.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IDesktopElement.java
index f028b4b0665..c5de0478555 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/IDesktopElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IDesktopElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
 public interface IDesktopElement
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/IElement.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IElement.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/IElement.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IElement.java
index 1e186a3a5db..27f19e52ce3 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/IElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
  
 public interface IElement
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/IPropertySource.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IPropertySource.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/IPropertySource.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IPropertySource.java
index f26d96aa58c..3c185022f99 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/IPropertySource.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/IPropertySource.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
 public interface IPropertySource 
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/PropertySource.java b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/PropertySource.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/PropertySource.java
rename to rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/PropertySource.java
index afb6d39aafd..d9e5fcb476a 100644
--- a/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/extra/PropertySource.java
+++ b/rse/plugins/org.eclipse.dstore.extra/server/org/eclipse/dstore/extra/internal/PropertySource.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
 import org.eclipse.dstore.extra.IDataElement;
  
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/DomainEvent.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/DomainEvent.java
similarity index 94%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/DomainEvent.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/DomainEvent.java
index 38f463d9e63..503e8250501 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/DomainEvent.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/DomainEvent.java
@@ -14,12 +14,10 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra;
 
 import java.util.List;
 
-import org.eclipse.dstore.extra.IDataElement;
-import org.eclipse.dstore.extra.IDomainNotifier;
 
 public class DomainEvent 
 {
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 7c6678d5f8a..2423e97dab9 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
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation. All rights reserved.
+ * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -18,7 +18,7 @@ package org.eclipse.dstore.extra;
 
 import java.util.List;
 
-import org.eclipse.dstore.extra.internal.extra.IElement;
+import org.eclipse.dstore.extra.internal.IElement;
 
 public interface IDataElement extends IElement
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainListener.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainListener.java
index 0e780eda995..17f0b2f5cf1 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainListener.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainListener.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation. All rights reserved.
+ * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -16,7 +16,6 @@
 
 package org.eclipse.dstore.extra;
 
-import org.eclipse.dstore.extra.internal.extra.DomainEvent;
 
 public interface IDomainListener
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainNotifier.java
index e5990e373c8..f1e60daeeb1 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainNotifier.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/IDomainNotifier.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation. All rights reserved.
+ * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved.
  * This program and the accompanying materials are made available under the terms
  * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
  * available at http://www.eclipse.org/legal/epl-v10.html
@@ -16,7 +16,6 @@
 
 package org.eclipse.dstore.extra;
 
-import org.eclipse.dstore.extra.internal.extra.DomainEvent;
 
 public interface IDomainNotifier
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/DataElementActionFilter.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DataElementActionFilter.java
similarity index 98%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/DataElementActionFilter.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DataElementActionFilter.java
index 35369b8be63..b46af5bfca6 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/DataElementActionFilter.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DataElementActionFilter.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
 import org.eclipse.dstore.extra.IDataElement;
 
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/DesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DesktopElement.java
similarity index 97%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/DesktopElement.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DesktopElement.java
index c7380260d8a..57c2e6d6e6d 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/DesktopElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DesktopElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
 import java.util.List;
 
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/DomainNotifier.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DomainNotifier.java
similarity index 96%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/DomainNotifier.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DomainNotifier.java
index 48882c4d477..723fc58d6fc 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/DomainNotifier.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/DomainNotifier.java
@@ -14,10 +14,11 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
 import java.util.ArrayList;
 
+import org.eclipse.dstore.extra.DomainEvent;
 import org.eclipse.dstore.extra.IDomainListener;
 import org.eclipse.dstore.extra.IDomainNotifier;
 
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/IDataElementActionFilter.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IDataElementActionFilter.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/IDataElementActionFilter.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IDataElementActionFilter.java
index e1776929703..7235ff5460c 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/IDataElementActionFilter.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IDataElementActionFilter.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
 public interface IDataElementActionFilter extends org.eclipse.ui.IActionFilter 
 {
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/IDesktopElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IDesktopElement.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/IDesktopElement.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IDesktopElement.java
index b5cfa19a36c..1eae7ae2fa1 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/IDesktopElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IDesktopElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
  
 public interface IDesktopElement extends org.eclipse.ui.model.IWorkbenchAdapter
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/IElement.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IElement.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/IElement.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IElement.java
index 71daeecaa6d..c3e1f5e00e3 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/IElement.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IElement.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
 import org.eclipse.core.runtime.IAdaptable;
 
diff --git a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/IPropertySource.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IPropertySource.java
similarity index 95%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/IPropertySource.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IPropertySource.java
index 0720e8c9470..44e018e643a 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/IPropertySource.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/IPropertySource.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
 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/extra/PropertySource.java b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/PropertySource.java
similarity index 98%
rename from rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/PropertySource.java
rename to rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/PropertySource.java
index 671a0642991..45796ee2932 100644
--- a/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/extra/PropertySource.java
+++ b/rse/plugins/org.eclipse.dstore.extra/src/org/eclipse/dstore/extra/internal/PropertySource.java
@@ -14,7 +14,7 @@
  * {Name} (company) - description of contribution.
  ********************************************************************************/
 
-package org.eclipse.dstore.extra.internal.extra;
+package org.eclipse.dstore.extra.internal;
 
 import java.util.HashMap;
 import java.util.List;