diff --git a/org.eclipse.remote.telnet.core/.classpath b/bundles/org.eclipse.remote.telnet.core/.classpath
similarity index 100%
rename from org.eclipse.remote.telnet.core/.classpath
rename to bundles/org.eclipse.remote.telnet.core/.classpath
diff --git a/org.eclipse.remote.telnet.core/.gitignore b/bundles/org.eclipse.remote.telnet.core/.gitignore
similarity index 100%
rename from org.eclipse.remote.telnet.core/.gitignore
rename to bundles/org.eclipse.remote.telnet.core/.gitignore
diff --git a/org.eclipse.remote.telnet.core/.project b/bundles/org.eclipse.remote.telnet.core/.project
similarity index 100%
rename from org.eclipse.remote.telnet.core/.project
rename to bundles/org.eclipse.remote.telnet.core/.project
diff --git a/org.eclipse.remote.telnet.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.remote.telnet.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.remote.telnet.core/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.remote.telnet.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.remote.telnet.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.telnet.core/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.remote.telnet.core/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.remote.telnet.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.remote.telnet.core/about.html b/bundles/org.eclipse.remote.telnet.core/about.html
similarity index 100%
rename from org.eclipse.remote.telnet.core/about.html
rename to bundles/org.eclipse.remote.telnet.core/about.html
diff --git a/org.eclipse.remote.telnet.core/about.ini b/bundles/org.eclipse.remote.telnet.core/about.ini
similarity index 100%
rename from org.eclipse.remote.telnet.core/about.ini
rename to bundles/org.eclipse.remote.telnet.core/about.ini
diff --git a/org.eclipse.remote.telnet.core/about.mappings b/bundles/org.eclipse.remote.telnet.core/about.mappings
similarity index 100%
rename from org.eclipse.remote.telnet.core/about.mappings
rename to bundles/org.eclipse.remote.telnet.core/about.mappings
diff --git a/org.eclipse.remote.telnet.core/about.properties b/bundles/org.eclipse.remote.telnet.core/about.properties
similarity index 100%
rename from org.eclipse.remote.telnet.core/about.properties
rename to bundles/org.eclipse.remote.telnet.core/about.properties
diff --git a/org.eclipse.remote.telnet.core/build.properties b/bundles/org.eclipse.remote.telnet.core/build.properties
similarity index 100%
rename from org.eclipse.remote.telnet.core/build.properties
rename to bundles/org.eclipse.remote.telnet.core/build.properties
diff --git a/org.eclipse.remote.telnet.core/plugin.properties b/bundles/org.eclipse.remote.telnet.core/plugin.properties
similarity index 100%
rename from org.eclipse.remote.telnet.core/plugin.properties
rename to bundles/org.eclipse.remote.telnet.core/plugin.properties
diff --git a/org.eclipse.remote.telnet.core/plugin.xml b/bundles/org.eclipse.remote.telnet.core/plugin.xml
similarity index 100%
rename from org.eclipse.remote.telnet.core/plugin.xml
rename to bundles/org.eclipse.remote.telnet.core/plugin.xml
diff --git a/org.eclipse.remote.telnet.core/pom.xml b/bundles/org.eclipse.remote.telnet.core/pom.xml
similarity index 100%
rename from org.eclipse.remote.telnet.core/pom.xml
rename to bundles/org.eclipse.remote.telnet.core/pom.xml
diff --git a/org.eclipse.remote.telnet.core/ptp_logo_icon32.png b/bundles/org.eclipse.remote.telnet.core/ptp_logo_icon32.png
similarity index 100%
rename from org.eclipse.remote.telnet.core/ptp_logo_icon32.png
rename to bundles/org.eclipse.remote.telnet.core/ptp_logo_icon32.png
diff --git a/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetCodes.java b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetCodes.java
similarity index 100%
rename from org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetCodes.java
rename to bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetCodes.java
diff --git a/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetCommandShell.java b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetCommandShell.java
similarity index 100%
rename from org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetCommandShell.java
rename to bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetCommandShell.java
diff --git a/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetConnection.java b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetConnection.java
similarity index 100%
rename from org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetConnection.java
rename to bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetConnection.java
diff --git a/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetOption.java b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetOption.java
similarity index 100%
rename from org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetOption.java
rename to bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetOption.java
diff --git a/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetProtocol.java b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetProtocol.java
similarity index 100%
rename from org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetProtocol.java
rename to bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/core/TelnetProtocol.java
diff --git a/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/Activator.java b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/Activator.java
similarity index 100%
rename from org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/Activator.java
rename to bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/Activator.java
diff --git a/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/Logger.java b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/Logger.java
similarity index 100%
rename from org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/Logger.java
rename to bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/Logger.java
diff --git a/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/messages/Messages.java b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/messages/Messages.java
similarity index 100%
rename from org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/messages/Messages.java
rename to bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/messages/Messages.java
diff --git a/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/messages/messages.properties b/bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/messages/messages.properties
similarity index 100%
rename from org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/messages/messages.properties
rename to bundles/org.eclipse.remote.telnet.core/src/org/eclipse/remote/telnet/internal/core/messages/messages.properties
diff --git a/org.eclipse.remote.telnet.ui/.classpath b/bundles/org.eclipse.remote.telnet.ui/.classpath
similarity index 100%
rename from org.eclipse.remote.telnet.ui/.classpath
rename to bundles/org.eclipse.remote.telnet.ui/.classpath
diff --git a/org.eclipse.remote.telnet.ui/.gitignore b/bundles/org.eclipse.remote.telnet.ui/.gitignore
similarity index 100%
rename from org.eclipse.remote.telnet.ui/.gitignore
rename to bundles/org.eclipse.remote.telnet.ui/.gitignore
diff --git a/org.eclipse.remote.telnet.ui/.project b/bundles/org.eclipse.remote.telnet.ui/.project
similarity index 100%
rename from org.eclipse.remote.telnet.ui/.project
rename to bundles/org.eclipse.remote.telnet.ui/.project
diff --git a/org.eclipse.remote.telnet.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.remote.telnet.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.remote.telnet.ui/.settings/org.eclipse.jdt.core.prefs
rename to bundles/org.eclipse.remote.telnet.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.remote.telnet.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.telnet.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.remote.telnet.ui/META-INF/MANIFEST.MF
rename to bundles/org.eclipse.remote.telnet.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.remote.telnet.ui/about.html b/bundles/org.eclipse.remote.telnet.ui/about.html
similarity index 100%
rename from org.eclipse.remote.telnet.ui/about.html
rename to bundles/org.eclipse.remote.telnet.ui/about.html
diff --git a/org.eclipse.remote.telnet.ui/about.ini b/bundles/org.eclipse.remote.telnet.ui/about.ini
similarity index 100%
rename from org.eclipse.remote.telnet.ui/about.ini
rename to bundles/org.eclipse.remote.telnet.ui/about.ini
diff --git a/org.eclipse.remote.telnet.ui/about.mappings b/bundles/org.eclipse.remote.telnet.ui/about.mappings
similarity index 100%
rename from org.eclipse.remote.telnet.ui/about.mappings
rename to bundles/org.eclipse.remote.telnet.ui/about.mappings
diff --git a/org.eclipse.remote.telnet.ui/about.properties b/bundles/org.eclipse.remote.telnet.ui/about.properties
similarity index 100%
rename from org.eclipse.remote.telnet.ui/about.properties
rename to bundles/org.eclipse.remote.telnet.ui/about.properties
diff --git a/org.eclipse.remote.telnet.ui/build.properties b/bundles/org.eclipse.remote.telnet.ui/build.properties
similarity index 100%
rename from org.eclipse.remote.telnet.ui/build.properties
rename to bundles/org.eclipse.remote.telnet.ui/build.properties
diff --git a/org.eclipse.remote.telnet.ui/icons/telnet.png b/bundles/org.eclipse.remote.telnet.ui/icons/telnet.png
similarity index 100%
rename from org.eclipse.remote.telnet.ui/icons/telnet.png
rename to bundles/org.eclipse.remote.telnet.ui/icons/telnet.png
diff --git a/org.eclipse.remote.telnet.ui/plugin.properties b/bundles/org.eclipse.remote.telnet.ui/plugin.properties
similarity index 100%
rename from org.eclipse.remote.telnet.ui/plugin.properties
rename to bundles/org.eclipse.remote.telnet.ui/plugin.properties
diff --git a/org.eclipse.remote.telnet.ui/plugin.xml b/bundles/org.eclipse.remote.telnet.ui/plugin.xml
similarity index 100%
rename from org.eclipse.remote.telnet.ui/plugin.xml
rename to bundles/org.eclipse.remote.telnet.ui/plugin.xml
diff --git a/org.eclipse.remote.telnet.ui/pom.xml b/bundles/org.eclipse.remote.telnet.ui/pom.xml
similarity index 100%
rename from org.eclipse.remote.telnet.ui/pom.xml
rename to bundles/org.eclipse.remote.telnet.ui/pom.xml
diff --git a/org.eclipse.remote.telnet.ui/ptp_logo_icon32.png b/bundles/org.eclipse.remote.telnet.ui/ptp_logo_icon32.png
similarity index 100%
rename from org.eclipse.remote.telnet.ui/ptp_logo_icon32.png
rename to bundles/org.eclipse.remote.telnet.ui/ptp_logo_icon32.png
diff --git a/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/Activator.java b/bundles/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/Activator.java
similarity index 100%
rename from org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/Activator.java
rename to bundles/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/Activator.java
diff --git a/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/Messages.java b/bundles/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/Messages.java
similarity index 100%
rename from org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/Messages.java
rename to bundles/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/Messages.java
diff --git a/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/TelnetConnectionWizard.java b/bundles/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/TelnetConnectionWizard.java
similarity index 100%
rename from org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/TelnetConnectionWizard.java
rename to bundles/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/TelnetConnectionWizard.java
diff --git a/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/TelnetConnectionWizardPage.java b/bundles/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/TelnetConnectionWizardPage.java
similarity index 100%
rename from org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/TelnetConnectionWizardPage.java
rename to bundles/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/TelnetConnectionWizardPage.java
diff --git a/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/TelnetConnectionsUI.java b/bundles/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/TelnetConnectionsUI.java
similarity index 100%
rename from org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/TelnetConnectionsUI.java
rename to bundles/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/TelnetConnectionsUI.java
diff --git a/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/messages.properties b/bundles/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/messages.properties
similarity index 100%
rename from org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/messages.properties
rename to bundles/org.eclipse.remote.telnet.ui/src/org/eclipse/remote/telnet/internal/ui/messages.properties
diff --git a/org.eclipse.remote.telnet-feature/.project b/features/org.eclipse.remote.telnet-feature/.project
similarity index 100%
rename from org.eclipse.remote.telnet-feature/.project
rename to features/org.eclipse.remote.telnet-feature/.project
diff --git a/org.eclipse.remote.telnet-feature/build.properties b/features/org.eclipse.remote.telnet-feature/build.properties
similarity index 100%
rename from org.eclipse.remote.telnet-feature/build.properties
rename to features/org.eclipse.remote.telnet-feature/build.properties
diff --git a/org.eclipse.remote.telnet-feature/eclipse_update_120.jpg b/features/org.eclipse.remote.telnet-feature/eclipse_update_120.jpg
similarity index 100%
rename from org.eclipse.remote.telnet-feature/eclipse_update_120.jpg
rename to features/org.eclipse.remote.telnet-feature/eclipse_update_120.jpg
diff --git a/org.eclipse.remote.telnet-feature/epl-v10.html b/features/org.eclipse.remote.telnet-feature/epl-v10.html
similarity index 100%
rename from org.eclipse.remote.telnet-feature/epl-v10.html
rename to features/org.eclipse.remote.telnet-feature/epl-v10.html
diff --git a/org.eclipse.remote.telnet-feature/feature.properties b/features/org.eclipse.remote.telnet-feature/feature.properties
similarity index 100%
rename from org.eclipse.remote.telnet-feature/feature.properties
rename to features/org.eclipse.remote.telnet-feature/feature.properties
diff --git a/org.eclipse.remote.telnet-feature/feature.xml b/features/org.eclipse.remote.telnet-feature/feature.xml
similarity index 100%
rename from org.eclipse.remote.telnet-feature/feature.xml
rename to features/org.eclipse.remote.telnet-feature/feature.xml
diff --git a/org.eclipse.remote.telnet-feature/pom.xml b/features/org.eclipse.remote.telnet-feature/pom.xml
similarity index 100%
rename from org.eclipse.remote.telnet-feature/pom.xml
rename to features/org.eclipse.remote.telnet-feature/pom.xml