diff --git a/org.eclipse.remote.core/.classpath b/bundles/org.eclipse.remote.core/.classpath
similarity index 100%
rename from org.eclipse.remote.core/.classpath
rename to bundles/org.eclipse.remote.core/.classpath
diff --git a/org.eclipse.remote.core/.options b/bundles/org.eclipse.remote.core/.options
similarity index 100%
rename from org.eclipse.remote.core/.options
rename to bundles/org.eclipse.remote.core/.options
diff --git a/org.eclipse.remote.core/.project b/bundles/org.eclipse.remote.core/.project
similarity index 100%
rename from org.eclipse.remote.core/.project
rename to bundles/org.eclipse.remote.core/.project
diff --git a/org.eclipse.remote.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.remote.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.remote.core/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.remote.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.remote.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.remote.core/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.remote.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.remote.core/about.html b/bundles/org.eclipse.remote.core/about.html
similarity index 100%
rename from org.eclipse.remote.core/about.html
rename to bundles/org.eclipse.remote.core/about.html
diff --git a/org.eclipse.remote.core/about.ini b/bundles/org.eclipse.remote.core/about.ini
similarity index 100%
rename from org.eclipse.remote.core/about.ini
rename to bundles/org.eclipse.remote.core/about.ini
diff --git a/org.eclipse.remote.core/about.mappings b/bundles/org.eclipse.remote.core/about.mappings
similarity index 100%
rename from org.eclipse.remote.core/about.mappings
rename to bundles/org.eclipse.remote.core/about.mappings
diff --git a/org.eclipse.remote.core/about.properties b/bundles/org.eclipse.remote.core/about.properties
similarity index 100%
rename from org.eclipse.remote.core/about.properties
rename to bundles/org.eclipse.remote.core/about.properties
diff --git a/org.eclipse.remote.core/build.properties b/bundles/org.eclipse.remote.core/build.properties
similarity index 100%
rename from org.eclipse.remote.core/build.properties
rename to bundles/org.eclipse.remote.core/build.properties
diff --git a/org.eclipse.remote.core/plugin.properties b/bundles/org.eclipse.remote.core/plugin.properties
similarity index 100%
rename from org.eclipse.remote.core/plugin.properties
rename to bundles/org.eclipse.remote.core/plugin.properties
diff --git a/org.eclipse.remote.core/plugin.xml b/bundles/org.eclipse.remote.core/plugin.xml
similarity index 100%
rename from org.eclipse.remote.core/plugin.xml
rename to bundles/org.eclipse.remote.core/plugin.xml
diff --git a/org.eclipse.remote.core/pom.xml b/bundles/org.eclipse.remote.core/pom.xml
similarity index 100%
rename from org.eclipse.remote.core/pom.xml
rename to bundles/org.eclipse.remote.core/pom.xml
diff --git a/org.eclipse.remote.core/ptp_logo_icon32.png b/bundles/org.eclipse.remote.core/ptp_logo_icon32.png
similarity index 100%
rename from org.eclipse.remote.core/ptp_logo_icon32.png
rename to bundles/org.eclipse.remote.core/ptp_logo_icon32.png
diff --git a/org.eclipse.remote.core/schema/processFactory.exsd b/bundles/org.eclipse.remote.core/schema/processFactory.exsd
similarity index 100%
rename from org.eclipse.remote.core/schema/processFactory.exsd
rename to bundles/org.eclipse.remote.core/schema/processFactory.exsd
diff --git a/org.eclipse.remote.core/schema/remoteResources.exsd b/bundles/org.eclipse.remote.core/schema/remoteResources.exsd
similarity index 100%
rename from org.eclipse.remote.core/schema/remoteResources.exsd
rename to bundles/org.eclipse.remote.core/schema/remoteResources.exsd
diff --git a/org.eclipse.remote.core/schema/remoteServices.exsd b/bundles/org.eclipse.remote.core/schema/remoteServices.exsd
similarity index 100%
rename from org.eclipse.remote.core/schema/remoteServices.exsd
rename to bundles/org.eclipse.remote.core/schema/remoteServices.exsd
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteCorePlugin.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteCorePlugin.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteCorePlugin.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteCorePlugin.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceAdapterFactory.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceAdapterFactory.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceAdapterFactory.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceAdapterFactory.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceFactory.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceFactory.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceFactory.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteResourceFactory.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesDescriptor.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesDescriptor.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesDescriptor.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesDescriptor.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesImpl.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesImpl.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesImpl.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/RemoteServicesImpl.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/Messages.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/Messages.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/Messages.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/Messages.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/messages.properties b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/messages.properties
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/messages.properties
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/messages/messages.properties
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/PreferenceInitializer.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/PreferenceInitializer.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/PreferenceInitializer.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/PreferenceInitializer.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/Preferences.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/Preferences.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/Preferences.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/preferences/Preferences.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnection.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnection.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnection.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnection.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionManager.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionManager.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionManager.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionManager.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionWorkingCopy.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionWorkingCopy.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionWorkingCopy.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalConnectionWorkingCopy.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalFileManager.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalFileManager.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalFileManager.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalFileManager.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcess.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcess.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcess.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcess.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcessBuilder.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcessBuilder.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcessBuilder.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalProcessBuilder.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalResource.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalResource.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalResource.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalResource.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServices.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServices.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServices.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServices.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServicesFactory.java b/bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServicesFactory.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServicesFactory.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServicesFactory.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteProcess.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteProcess.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteProcess.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteProcess.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteProcessBuilder.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteProcessBuilder.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteProcessBuilder.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteProcessBuilder.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteServices.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteServices.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteServices.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/AbstractRemoteServices.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IProcessFactory.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IProcessFactory.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IProcessFactory.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IProcessFactory.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnection.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnection.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnection.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnection.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionChangeEvent.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionChangeEvent.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionChangeEvent.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionChangeEvent.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionChangeListener.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionChangeListener.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionChangeListener.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionChangeListener.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionManager.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionManager.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionManager.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionManager.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionWorkingCopy.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionWorkingCopy.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionWorkingCopy.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteConnectionWorkingCopy.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteFileManager.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteFileManager.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteFileManager.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteFileManager.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemotePreferenceConstants.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemotePreferenceConstants.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemotePreferenceConstants.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemotePreferenceConstants.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteProcess.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteProcess.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteProcess.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteProcess.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteProcessBuilder.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteProcessBuilder.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteProcessBuilder.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteProcessBuilder.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteResource.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteResource.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteResource.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteResource.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteServices.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteServices.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteServices.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteServices.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteServicesDescriptor.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteServicesDescriptor.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteServicesDescriptor.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteServicesDescriptor.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteServicesFactory.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteServicesFactory.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteServicesFactory.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IRemoteServicesFactory.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/IUserAuthenticator.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IUserAuthenticator.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/IUserAuthenticator.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/IUserAuthenticator.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteProcessAdapter.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteProcessAdapter.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteProcessAdapter.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteProcessAdapter.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServices.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServices.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServices.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServices.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServicesUtils.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServicesUtils.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServicesUtils.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/RemoteServicesUtils.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/AddressInUseException.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/AddressInUseException.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/exception/AddressInUseException.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/AddressInUseException.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/PrivilegedPortException.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/PrivilegedPortException.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/exception/PrivilegedPortException.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/PrivilegedPortException.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/RemoteConnectionException.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/RemoteConnectionException.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/exception/RemoteConnectionException.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/RemoteConnectionException.java
diff --git a/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/UnableToForwardPortException.java b/bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/UnableToForwardPortException.java
similarity index 100%
rename from org.eclipse.remote.core/src/org/eclipse/remote/core/exception/UnableToForwardPortException.java
rename to bundles/org.eclipse.remote.core/src/org/eclipse/remote/core/exception/UnableToForwardPortException.java
diff --git a/org.eclipse.remote.core.tests/.classpath b/bundles/org.eclipse.remote.jsch.core/.classpath
similarity index 100%
rename from org.eclipse.remote.core.tests/.classpath
rename to bundles/org.eclipse.remote.jsch.core/.classpath
diff --git a/org.eclipse.remote.jsch.core/.project b/bundles/org.eclipse.remote.jsch.core/.project
similarity index 100%
rename from org.eclipse.remote.jsch.core/.project
rename to bundles/org.eclipse.remote.jsch.core/.project
diff --git a/org.eclipse.remote.jsch.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.remote.jsch.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.remote.jsch.core/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.remote.jsch.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.remote.jsch.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.remote.jsch.core/about.html b/bundles/org.eclipse.remote.jsch.core/about.html
similarity index 100%
rename from org.eclipse.remote.jsch.core/about.html
rename to bundles/org.eclipse.remote.jsch.core/about.html
diff --git a/org.eclipse.remote.jsch.core/build.properties b/bundles/org.eclipse.remote.jsch.core/build.properties
similarity index 100%
rename from org.eclipse.remote.jsch.core/build.properties
rename to bundles/org.eclipse.remote.jsch.core/build.properties
diff --git a/org.eclipse.remote.jsch.core/plugin.properties b/bundles/org.eclipse.remote.jsch.core/plugin.properties
similarity index 100%
rename from org.eclipse.remote.jsch.core/plugin.properties
rename to bundles/org.eclipse.remote.jsch.core/plugin.properties
diff --git a/org.eclipse.remote.jsch.core/plugin.xml b/bundles/org.eclipse.remote.jsch.core/plugin.xml
similarity index 100%
rename from org.eclipse.remote.jsch.core/plugin.xml
rename to bundles/org.eclipse.remote.jsch.core/plugin.xml
diff --git a/org.eclipse.remote.jsch.core/pom.xml b/bundles/org.eclipse.remote.jsch.core/pom.xml
similarity index 100%
rename from org.eclipse.remote.jsch.core/pom.xml
rename to bundles/org.eclipse.remote.jsch.core/pom.xml
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/Activator.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/Activator.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/Activator.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/Activator.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnection.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnection.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnection.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnection.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionAttributes.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionAttributes.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionAttributes.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionAttributes.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionManager.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionManager.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionManager.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionManager.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionWorkingCopy.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionWorkingCopy.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionWorkingCopy.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchConnectionWorkingCopy.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileManager.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileManager.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileManager.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileManager.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileSystem.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileSystem.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileSystem.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchFileSystem.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcess.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcess.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcess.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcess.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcessBuilder.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcessBuilder.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcessBuilder.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchProcessBuilder.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServices.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServices.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServices.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServices.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServicesFactory.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServicesFactory.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServicesFactory.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JSchServicesFactory.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JschFileStore.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JschFileStore.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JschFileStore.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/JschFileStore.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/AbstractRemoteCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/AbstractRemoteCommand.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/AbstractRemoteCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/AbstractRemoteCommand.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ChildInfosCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ChildInfosCommand.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ChildInfosCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ChildInfosCommand.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/DeleteCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/DeleteCommand.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/DeleteCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/DeleteCommand.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ExecCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ExecCommand.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ExecCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/ExecCommand.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/FetchInfoCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/FetchInfoCommand.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/FetchInfoCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/FetchInfoCommand.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetInputStreamCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetInputStreamCommand.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetInputStreamCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetInputStreamCommand.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetOutputStreamCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetOutputStreamCommand.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetOutputStreamCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/GetOutputStreamCommand.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/MkdirCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/MkdirCommand.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/MkdirCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/MkdirCommand.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/PutInfoCommand.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/PutInfoCommand.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/PutInfoCommand.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/commands/PutInfoCommand.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/Messages.java b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/Messages.java
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/Messages.java
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/Messages.java
diff --git a/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/messages.properties b/bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/messages.properties
similarity index 100%
rename from org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/messages.properties
rename to bundles/org.eclipse.remote.jsch.core/src/org/eclipse/internal/remote/jsch/core/messages/messages.properties
diff --git a/org.eclipse.remote.jsch.core/.classpath b/bundles/org.eclipse.remote.jsch.ui/.classpath
similarity index 100%
rename from org.eclipse.remote.jsch.core/.classpath
rename to bundles/org.eclipse.remote.jsch.ui/.classpath
diff --git a/org.eclipse.remote.jsch.ui/.project b/bundles/org.eclipse.remote.jsch.ui/.project
similarity index 100%
rename from org.eclipse.remote.jsch.ui/.project
rename to bundles/org.eclipse.remote.jsch.ui/.project
diff --git a/org.eclipse.remote.jsch.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.remote.jsch.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.remote.jsch.ui/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.remote.jsch.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.remote.jsch.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.remote.jsch.ui/about.html b/bundles/org.eclipse.remote.jsch.ui/about.html
similarity index 100%
rename from org.eclipse.remote.jsch.ui/about.html
rename to bundles/org.eclipse.remote.jsch.ui/about.html
diff --git a/org.eclipse.remote.jsch.ui/build.properties b/bundles/org.eclipse.remote.jsch.ui/build.properties
similarity index 100%
rename from org.eclipse.remote.jsch.ui/build.properties
rename to bundles/org.eclipse.remote.jsch.ui/build.properties
diff --git a/org.eclipse.remote.jsch.ui/icons/full/obj16/connection.gif b/bundles/org.eclipse.remote.jsch.ui/icons/full/obj16/connection.gif
similarity index 100%
rename from org.eclipse.remote.jsch.ui/icons/full/obj16/connection.gif
rename to bundles/org.eclipse.remote.jsch.ui/icons/full/obj16/connection.gif
diff --git a/org.eclipse.remote.jsch.ui/plugin.properties b/bundles/org.eclipse.remote.jsch.ui/plugin.properties
similarity index 100%
rename from org.eclipse.remote.jsch.ui/plugin.properties
rename to bundles/org.eclipse.remote.jsch.ui/plugin.properties
diff --git a/org.eclipse.remote.jsch.ui/plugin.xml b/bundles/org.eclipse.remote.jsch.ui/plugin.xml
similarity index 100%
rename from org.eclipse.remote.jsch.ui/plugin.xml
rename to bundles/org.eclipse.remote.jsch.ui/plugin.xml
diff --git a/org.eclipse.remote.jsch.ui/pom.xml b/bundles/org.eclipse.remote.jsch.ui/pom.xml
similarity index 100%
rename from org.eclipse.remote.jsch.ui/pom.xml
rename to bundles/org.eclipse.remote.jsch.ui/pom.xml
diff --git a/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/Activator.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/Activator.java
similarity index 100%
rename from org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/Activator.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/Activator.java
diff --git a/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchFileSystemContributor.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchFileSystemContributor.java
similarity index 100%
rename from org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchFileSystemContributor.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchFileSystemContributor.java
diff --git a/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIConnectionManager.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIConnectionManager.java
similarity index 100%
rename from org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIConnectionManager.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIConnectionManager.java
diff --git a/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIFileManager.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIFileManager.java
similarity index 100%
rename from org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIFileManager.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIFileManager.java
diff --git a/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServices.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServices.java
similarity index 100%
rename from org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServices.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServices.java
diff --git a/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServicesFactory.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServicesFactory.java
similarity index 100%
rename from org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServicesFactory.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/JSchUIServicesFactory.java
diff --git a/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/Messages.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/Messages.java
similarity index 100%
rename from org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/Messages.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/Messages.java
diff --git a/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/messages.properties b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/messages.properties
similarity index 100%
rename from org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/messages.properties
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/messages/messages.properties
diff --git a/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionPage.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionPage.java
similarity index 100%
rename from org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionPage.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionPage.java
diff --git a/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionWizard.java b/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionWizard.java
similarity index 100%
rename from org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionWizard.java
rename to bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/internal/remote/jsch/ui/wizards/JSchConnectionWizard.java
diff --git a/org.eclipse.remote.jsch.ui/.classpath b/bundles/org.eclipse.remote.ui/.classpath
similarity index 100%
rename from org.eclipse.remote.jsch.ui/.classpath
rename to bundles/org.eclipse.remote.ui/.classpath
diff --git a/org.eclipse.remote.ui/.project b/bundles/org.eclipse.remote.ui/.project
similarity index 100%
rename from org.eclipse.remote.ui/.project
rename to bundles/org.eclipse.remote.ui/.project
diff --git a/org.eclipse.remote.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.remote.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.remote.ui/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.remote.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.remote.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.remote.ui/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.remote.ui/about.html b/bundles/org.eclipse.remote.ui/about.html
similarity index 100%
rename from org.eclipse.remote.ui/about.html
rename to bundles/org.eclipse.remote.ui/about.html
diff --git a/org.eclipse.remote.ui/build.properties b/bundles/org.eclipse.remote.ui/build.properties
similarity index 100%
rename from org.eclipse.remote.ui/build.properties
rename to bundles/org.eclipse.remote.ui/build.properties
diff --git a/org.eclipse.remote.ui/icons/dlcl16/new_folder.gif b/bundles/org.eclipse.remote.ui/icons/dlcl16/new_folder.gif
similarity index 100%
rename from org.eclipse.remote.ui/icons/dlcl16/new_folder.gif
rename to bundles/org.eclipse.remote.ui/icons/dlcl16/new_folder.gif
diff --git a/org.eclipse.remote.ui/icons/dlcl16/up_nav.gif b/bundles/org.eclipse.remote.ui/icons/dlcl16/up_nav.gif
similarity index 100%
rename from org.eclipse.remote.ui/icons/dlcl16/up_nav.gif
rename to bundles/org.eclipse.remote.ui/icons/dlcl16/up_nav.gif
diff --git a/org.eclipse.remote.ui/icons/elcl16/new_folder.gif b/bundles/org.eclipse.remote.ui/icons/elcl16/new_folder.gif
similarity index 100%
rename from org.eclipse.remote.ui/icons/elcl16/new_folder.gif
rename to bundles/org.eclipse.remote.ui/icons/elcl16/new_folder.gif
diff --git a/org.eclipse.remote.ui/icons/elcl16/up_nav.gif b/bundles/org.eclipse.remote.ui/icons/elcl16/up_nav.gif
similarity index 100%
rename from org.eclipse.remote.ui/icons/elcl16/up_nav.gif
rename to bundles/org.eclipse.remote.ui/icons/elcl16/up_nav.gif
diff --git a/org.eclipse.remote.ui/icons/ovr16/symlink_ovr.gif b/bundles/org.eclipse.remote.ui/icons/ovr16/symlink_ovr.gif
similarity index 100%
rename from org.eclipse.remote.ui/icons/ovr16/symlink_ovr.gif
rename to bundles/org.eclipse.remote.ui/icons/ovr16/symlink_ovr.gif
diff --git a/org.eclipse.remote.ui/plugin.properties b/bundles/org.eclipse.remote.ui/plugin.properties
similarity index 100%
rename from org.eclipse.remote.ui/plugin.properties
rename to bundles/org.eclipse.remote.ui/plugin.properties
diff --git a/org.eclipse.remote.ui/plugin.xml b/bundles/org.eclipse.remote.ui/plugin.xml
similarity index 100%
rename from org.eclipse.remote.ui/plugin.xml
rename to bundles/org.eclipse.remote.ui/plugin.xml
diff --git a/org.eclipse.remote.ui/pom.xml b/bundles/org.eclipse.remote.ui/pom.xml
similarity index 100%
rename from org.eclipse.remote.ui/pom.xml
rename to bundles/org.eclipse.remote.ui/pom.xml
diff --git a/org.eclipse.remote.ui/schema/remoteUIServices.exsd b/bundles/org.eclipse.remote.ui/schema/remoteUIServices.exsd
similarity index 100%
rename from org.eclipse.remote.ui/schema/remoteUIServices.exsd
rename to bundles/org.eclipse.remote.ui/schema/remoteUIServices.exsd
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/DeferredFileStore.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/DeferredFileStore.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/DeferredFileStore.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/DeferredFileStore.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/OverlayImageDescriptor.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/OverlayImageDescriptor.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/OverlayImageDescriptor.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/OverlayImageDescriptor.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteContentProvider.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteContentProvider.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteContentProvider.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteContentProvider.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteResourceComparator.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteResourceComparator.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteResourceComparator.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteResourceComparator.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIImages.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIImages.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIImages.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIImages.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIPlugin.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIPlugin.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIPlugin.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIPlugin.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIServicesDescriptor.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIServicesDescriptor.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIServicesDescriptor.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/RemoteUIServicesDescriptor.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/Messages.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/Messages.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/Messages.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/Messages.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/messages.properties b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/messages.properties
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/messages.properties
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/messages/messages.properties
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/ConnectionsPreferencePage.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/ConnectionsPreferencePage.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/ConnectionsPreferencePage.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/ConnectionsPreferencePage.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/PreferencesAdapter.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/PreferencesAdapter.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/PreferencesAdapter.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/PreferencesAdapter.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/RemoteDevelopmentPreferencePage.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/RemoteDevelopmentPreferencePage.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/RemoteDevelopmentPreferencePage.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/preferences/RemoteDevelopmentPreferencePage.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIFileManager.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIFileManager.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIFileManager.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIFileManager.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServices.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServices.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServices.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServices.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServicesFactory.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServicesFactory.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServicesFactory.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/internal/remote/ui/services/local/LocalUIServicesFactory.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/AbstractRemoteUIConnectionManager.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/AbstractRemoteUIConnectionManager.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/AbstractRemoteUIConnectionManager.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/AbstractRemoteUIConnectionManager.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIConnectionManager.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIConnectionManager.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIConnectionManager.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIConnectionManager.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIConnectionWizard.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIConnectionWizard.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIConnectionWizard.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIConnectionWizard.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIConstants.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIConstants.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIConstants.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIConstants.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIFileManager.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIFileManager.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIFileManager.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIFileManager.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIServices.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIServices.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIServices.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIServices.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIServicesDescriptor.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIServicesDescriptor.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIServicesDescriptor.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIServicesDescriptor.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIServicesFactory.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIServicesFactory.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIServicesFactory.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/IRemoteUIServicesFactory.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIServices.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIServices.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIServices.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIServices.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/dialogs/RemoteResourceBrowser.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteConnectionWidget.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteDirectoryWidget.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteDirectoryWidget.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteDirectoryWidget.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteDirectoryWidget.java
diff --git a/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteFileWidget.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteFileWidget.java
similarity index 100%
rename from org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteFileWidget.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/widgets/RemoteFileWidget.java
diff --git a/org.eclipse.remote-feature/.project b/features/org.eclipse.remote-feature/.project
similarity index 100%
rename from org.eclipse.remote-feature/.project
rename to features/org.eclipse.remote-feature/.project
diff --git a/org.eclipse.remote-feature/build.properties b/features/org.eclipse.remote-feature/build.properties
similarity index 100%
rename from org.eclipse.remote-feature/build.properties
rename to features/org.eclipse.remote-feature/build.properties
diff --git a/org.eclipse.remote-feature/eclipse_update_120.jpg b/features/org.eclipse.remote-feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.remote-feature/eclipse_update_120.jpg
rename to features/org.eclipse.remote-feature/eclipse_update_120.jpg
diff --git a/org.eclipse.remote-feature/epl-v10.html b/features/org.eclipse.remote-feature/epl-v10.html
similarity index 100%
rename from org.eclipse.remote-feature/epl-v10.html
rename to features/org.eclipse.remote-feature/epl-v10.html
diff --git a/org.eclipse.remote-feature/feature.properties b/features/org.eclipse.remote-feature/feature.properties
similarity index 100%
rename from org.eclipse.remote-feature/feature.properties
rename to features/org.eclipse.remote-feature/feature.properties
diff --git a/org.eclipse.remote-feature/feature.xml b/features/org.eclipse.remote-feature/feature.xml
similarity index 100%
rename from org.eclipse.remote-feature/feature.xml
rename to features/org.eclipse.remote-feature/feature.xml
diff --git a/org.eclipse.remote-feature/license.html b/features/org.eclipse.remote-feature/license.html
similarity index 100%
rename from org.eclipse.remote-feature/license.html
rename to features/org.eclipse.remote-feature/license.html
diff --git a/org.eclipse.remote-feature/pom.xml b/features/org.eclipse.remote-feature/pom.xml
similarity index 100%
rename from org.eclipse.remote-feature/pom.xml
rename to features/org.eclipse.remote-feature/pom.xml
diff --git a/org.eclipse.remote.ui/.classpath b/tests/org.eclipse.remote.core.tests/.classpath
similarity index 100%
rename from org.eclipse.remote.ui/.classpath
rename to tests/org.eclipse.remote.core.tests/.classpath
diff --git a/org.eclipse.remote.core.tests/.project b/tests/org.eclipse.remote.core.tests/.project
similarity index 100%
rename from org.eclipse.remote.core.tests/.project
rename to tests/org.eclipse.remote.core.tests/.project
diff --git a/org.eclipse.remote.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.remote.core.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.remote.core.tests/.settings/org.eclipse.jdt.core.prefs
rename to tests/org.eclipse.remote.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.remote.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.remote.core.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.remote.core.tests/META-INF/MANIFEST.MF
rename to tests/org.eclipse.remote.core.tests/META-INF/MANIFEST.MF
diff --git a/org.eclipse.remote.core.tests/build.properties b/tests/org.eclipse.remote.core.tests/build.properties
similarity index 100%
rename from org.eclipse.remote.core.tests/build.properties
rename to tests/org.eclipse.remote.core.tests/build.properties
diff --git a/org.eclipse.remote.core.tests/plugin.properties b/tests/org.eclipse.remote.core.tests/plugin.properties
similarity index 100%
rename from org.eclipse.remote.core.tests/plugin.properties
rename to tests/org.eclipse.remote.core.tests/plugin.properties
diff --git a/org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/ConnectionTests.java b/tests/org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/ConnectionTests.java
similarity index 100%
rename from org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/ConnectionTests.java
rename to tests/org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/ConnectionTests.java
diff --git a/org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/FileStoreTests.java b/tests/org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/FileStoreTests.java
similarity index 100%
rename from org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/FileStoreTests.java
rename to tests/org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/FileStoreTests.java
diff --git a/org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/ProcessTests.java b/tests/org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/ProcessTests.java
similarity index 100%
rename from org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/ProcessTests.java
rename to tests/org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/ProcessTests.java
diff --git a/org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/suite/RemoteCoreTestSuite.java b/tests/org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/suite/RemoteCoreTestSuite.java
similarity index 100%
rename from org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/suite/RemoteCoreTestSuite.java
rename to tests/org.eclipse.remote.core.tests/src/org/eclipse/remote/core/tests/suite/RemoteCoreTestSuite.java