diff --git a/rse/plugins/org.eclipse.rse.core/.classpath b/rse/plugins/org.eclipse.rse.core/.classpath
index 8d1938ee247..b7464f3ca24 100644
--- a/rse/plugins/org.eclipse.rse.core/.classpath
+++ b/rse/plugins/org.eclipse.rse.core/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="src" path="persistence"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs b/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs
index 40380a91ec9..3185d61e906 100644
--- a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs
+++ b/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Fri Dec 08 11:30:09 CST 2006
+#Fri Mar 30 13:59:16 CDT 2007
 eclipse.preferences.version=1
-encoding//persistence/org/eclipse/rse/internal/persistence/messages.properties=8859_1
+encoding//src/org/eclipse/rse/internal/persistence/messages.properties=8859_1
diff --git a/rse/plugins/org.eclipse.rse.core/build.properties b/rse/plugins/org.eclipse.rse.core/build.properties
index fabd11b67e3..cc0c7d20846 100644
--- a/rse/plugins/org.eclipse.rse.core/build.properties
+++ b/rse/plugins/org.eclipse.rse.core/build.properties
@@ -18,8 +18,7 @@ bin.includes = META-INF/,\
                about.ini,\
                about.mappings,\
                eclipse32.png
-source.. = src/,\
-	persistence/
+source.. = src/
 output.. = bin/
 
 javacSource=1.4
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/Messages.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/Messages.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/Messages.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/Messages.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/PropertyFileProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PropertyFileProvider.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/PropertyFileProvider.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/PropertyFileProvider.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/RSEPersistenceManager.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SaveRSEDOMJob.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/SaveRSEDOMJob.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SaveRSEDOMJob.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/SaveRSEDOMJob.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SerializingProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/SerializingProvider.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/SerializingProvider.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/SerializingProvider.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/dom/RSEDOMExporter.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/messages.properties b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/messages.properties
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/internal/persistence/messages.properties
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/messages.properties
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/IRSEPersistenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/IRSEPersistenceManager.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/IRSEPersistenceManager.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/IRSEPersistenceManager.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/IRSEPersistenceProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/IRSEPersistenceProvider.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/IRSEPersistenceProvider.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/IRSEPersistenceProvider.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMConstants.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/dom/IRSEDOMConstants.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMConstants.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/dom/IRSEDOMConstants.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/dom/IRSEDOMExporter.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMImporter.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/dom/IRSEDOMImporter.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/IRSEDOMImporter.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/dom/IRSEDOMImporter.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOM.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/dom/RSEDOM.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOM.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/dom/RSEDOM.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOMNode.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/dom/RSEDOMNode.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOMNode.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/dom/RSEDOMNode.java
diff --git a/rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOMNodeAttribute.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/dom/RSEDOMNodeAttribute.java
similarity index 100%
rename from rse/plugins/org.eclipse.rse.core/persistence/org/eclipse/rse/persistence/dom/RSEDOMNodeAttribute.java
rename to rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/persistence/dom/RSEDOMNodeAttribute.java