From c4bbb3ef363c7c9d5a04eb2e554545929e515abb Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Mon, 18 Apr 2022 22:41:29 +0200
Subject: [PATCH] Rename plug-in o.e.m2e.pde to o.e.m2e.pde.target

---
 org.eclipse.m2e.pde.feature/feature.xml          |  4 ++--
 .../.classpath                                   |  0
 .../.project                                     |  2 +-
 .../.settings/org.eclipse.jdt.core.prefs         |  0
 .../META-INF/MANIFEST.MF                         |  8 ++++----
 .../build.properties                             |  0
 .../plugin.xml                                   |  2 +-
 .../org/eclipse/m2e/pde/target}/Activator.java   |  2 +-
 .../eclipse/m2e/pde/target}/BNDInstructions.java |  2 +-
 .../eclipse/m2e/pde/target}/CacheManager.java    |  2 +-
 .../eclipse/m2e/pde/target}/DependencyDepth.java |  2 +-
 .../m2e/pde/target}/DependencyNodeGenerator.java |  2 +-
 .../eclipse/m2e/pde/target}/DomXmlFeature.java   |  2 +-
 .../m2e/pde/target}/MavenFeaturePlugin.java      |  2 +-
 .../m2e/pde/target}/MavenPomFeatureModel.java    |  2 +-
 .../m2e/pde/target}/MavenSourceBundle.java       |  4 ++--
 .../m2e/pde/target}/MavenTargetBundle.java       |  2 +-
 .../m2e/pde/target}/MavenTargetDependency.java   |  2 +-
 .../pde/target}/MavenTargetDependencyFilter.java |  2 +-
 .../m2e/pde/target}/MavenTargetFeature.java      |  2 +-
 .../m2e/pde/target}/MavenTargetLocation.java     |  2 +-
 .../pde/target}/MavenTargetLocationFactory.java  |  2 +-
 .../m2e/pde/target}/MavenTargetRepository.java   |  2 +-
 .../m2e/pde/target}/MissingMetadataMode.java     |  2 +-
 .../eclipse/m2e/pde/target}/TargetBundles.java   |  2 +-
 .../m2e/pde/target}/TemplateFeatureModel.java    |  2 +-
 .../m2e/pde/target}/WorkspaceArtifact.java       |  2 +-
 .../m2e/pde/target}/bnd-default.properties       |  0
 org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF      |  2 +-
 org.eclipse.m2e.pde.ui/plugin.xml                | 16 ++++++++--------
 .../src/org/eclipse/m2e/pde/ui/Activator.java    |  8 ++++----
 .../adapter/DependencyNodeAdapterFactory.java    |  8 ++++----
 .../adapter/MavenTargetAdapterFactory.java       | 10 +++++-----
 .../adapter/MavenTargetBundleAdapterFactory.java |  6 +++---
 .../MavenTargetDependencyAdapterFactory.java     | 10 +++++-----
 .../editor/AbstractFeatureSpecPage.java          |  2 +-
 .../ui/{ => target}/editor/ClipboardParser.java  |  6 +++---
 .../ui/{ => target}/editor/FeatureSpecPage.java  |  4 ++--
 .../editor/MavenArtifactInstructionsWizard.java  |  4 ++--
 .../editor/MavenTargetDependencyEditor.java      |  4 ++--
 .../editor/MavenTargetLocationEditor.java        | 12 ++++++------
 .../editor/MavenTargetLocationWizard.java        | 16 ++++++++--------
 .../editor/MavenTargetRepositoryEditor.java      |  4 ++--
 .../m2e/pde/ui/{ => target}/editor/Messages.java |  5 ++---
 .../ui/{ => target}/editor/PluginListPage.java   |  4 ++--
 .../ui/{ => target}/editor/messages.properties   |  0
 .../provider/DependencyNodeLabelProvider.java    |  8 ++++----
 .../provider/MavenTargetBundleLabelProvider.java |  6 +++---
 .../MavenTargetDependencyLabelProvider.java      |  6 +++---
 .../MavenTargetLocationLabelProvider.java        | 10 +++++-----
 .../provider/MavenTargetTreeContentProvider.java |  6 +++---
 pom.xml                                          |  2 +-
 52 files changed, 108 insertions(+), 109 deletions(-)
 rename {org.eclipse.m2e.pde => org.eclipse.m2e.pde.target}/.classpath (100%)
 rename {org.eclipse.m2e.pde => org.eclipse.m2e.pde.target}/.project (93%)
 rename {org.eclipse.m2e.pde => org.eclipse.m2e.pde.target}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {org.eclipse.m2e.pde => org.eclipse.m2e.pde.target}/META-INF/MANIFEST.MF (73%)
 rename {org.eclipse.m2e.pde => org.eclipse.m2e.pde.target}/build.properties (100%)
 rename {org.eclipse.m2e.pde => org.eclipse.m2e.pde.target}/plugin.xml (76%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/Activator.java (97%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/BNDInstructions.java (98%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/CacheManager.java (99%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/DependencyDepth.java (94%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/DependencyNodeGenerator.java (99%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/DomXmlFeature.java (97%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/MavenFeaturePlugin.java (97%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/MavenPomFeatureModel.java (99%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/MavenSourceBundle.java (97%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/MavenTargetBundle.java (99%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/MavenTargetDependency.java (98%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/MavenTargetDependencyFilter.java (98%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/MavenTargetFeature.java (95%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/MavenTargetLocation.java (99%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/MavenTargetLocationFactory.java (99%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/MavenTargetRepository.java (95%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/MissingMetadataMode.java (94%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/TargetBundles.java (98%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/TemplateFeatureModel.java (98%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/WorkspaceArtifact.java (97%)
 rename {org.eclipse.m2e.pde/src/org/eclipse/m2e/pde => org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target}/bnd-default.properties (100%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/adapter/DependencyNodeAdapterFactory.java (87%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/adapter/MavenTargetAdapterFactory.java (84%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/adapter/MavenTargetBundleAdapterFactory.java (87%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/adapter/MavenTargetDependencyAdapterFactory.java (84%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/editor/AbstractFeatureSpecPage.java (99%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/editor/ClipboardParser.java (94%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/editor/FeatureSpecPage.java (98%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/editor/MavenArtifactInstructionsWizard.java (98%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/editor/MavenTargetDependencyEditor.java (98%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/editor/MavenTargetLocationEditor.java (96%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/editor/MavenTargetLocationWizard.java (97%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/editor/MavenTargetRepositoryEditor.java (98%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/editor/Messages.java (93%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/editor/PluginListPage.java (98%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/editor/messages.properties (100%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/provider/DependencyNodeLabelProvider.java (95%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/provider/MavenTargetBundleLabelProvider.java (88%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/provider/MavenTargetDependencyLabelProvider.java (90%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/provider/MavenTargetLocationLabelProvider.java (90%)
 rename org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/{ => target}/provider/MavenTargetTreeContentProvider.java (96%)

diff --git a/org.eclipse.m2e.pde.feature/feature.xml b/org.eclipse.m2e.pde.feature/feature.xml
index 809b94b465..7959b23449 100644
--- a/org.eclipse.m2e.pde.feature/feature.xml
+++ b/org.eclipse.m2e.pde.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.m2e.pde.feature"
       label="%featureName"
-      version="1.20.100.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.m2e.core"
       license-feature="org.eclipse.license"
@@ -40,7 +40,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.m2e.pde"
+         id="org.eclipse.m2e.pde.target"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.eclipse.m2e.pde/.classpath b/org.eclipse.m2e.pde.target/.classpath
similarity index 100%
rename from org.eclipse.m2e.pde/.classpath
rename to org.eclipse.m2e.pde.target/.classpath
diff --git a/org.eclipse.m2e.pde/.project b/org.eclipse.m2e.pde.target/.project
similarity index 93%
rename from org.eclipse.m2e.pde/.project
rename to org.eclipse.m2e.pde.target/.project
index 9a062bc531..55c16e6d95 100644
--- a/org.eclipse.m2e.pde/.project
+++ b/org.eclipse.m2e.pde.target/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.m2e.pde</name>
+	<name>org.eclipse.m2e.pde.target</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.m2e.pde/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.pde.target/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.m2e.pde/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.m2e.pde.target/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.m2e.pde/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF
similarity index 73%
rename from org.eclipse.m2e.pde/META-INF/MANIFEST.MF
rename to org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF
index 61111fd9d5..2b804e3910 100644
--- a/org.eclipse.m2e.pde/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.pde.target/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: M2E PDE Integration
-Bundle-SymbolicName: org.eclipse.m2e.pde;singleton:=true
+Bundle-SymbolicName: org.eclipse.m2e.pde.target;singleton:=true
 Bundle-Version: 2.0.0.qualifier
-Automatic-Module-Name: org.eclipse.m2e.pde
+Automatic-Module-Name: org.eclipse.m2e.pde.target
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0",
  org.eclipse.pde.ui;bundle-version="3.12.0",
@@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0",
  org.eclipse.m2e.maven.runtime,
  org.eclipse.m2e.core,
  org.eclipse.core.resources
-Export-Package: org.eclipse.m2e.pde;x-friends:="org.eclipse.m2e.pde.ui"
-Bundle-Activator: org.eclipse.m2e.pde.Activator
+Export-Package: org.eclipse.m2e.pde.target;x-friends:="org.eclipse.m2e.pde.ui"
+Bundle-Activator: org.eclipse.m2e.pde.target.Activator
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.commons.codec.digest;version="1.14.0",
  org.apache.commons.io;version="2.6.0",
diff --git a/org.eclipse.m2e.pde/build.properties b/org.eclipse.m2e.pde.target/build.properties
similarity index 100%
rename from org.eclipse.m2e.pde/build.properties
rename to org.eclipse.m2e.pde.target/build.properties
diff --git a/org.eclipse.m2e.pde/plugin.xml b/org.eclipse.m2e.pde.target/plugin.xml
similarity index 76%
rename from org.eclipse.m2e.pde/plugin.xml
rename to org.eclipse.m2e.pde.target/plugin.xml
index c664d3ec46..58c6992d94 100644
--- a/org.eclipse.m2e.pde/plugin.xml
+++ b/org.eclipse.m2e.pde.target/plugin.xml
@@ -5,7 +5,7 @@
           point="org.eclipse.pde.core.targetLocations">
        <targetLocation
              canUpdate="true"
-             locationFactory="org.eclipse.m2e.pde.MavenTargetLocationFactory"
+             locationFactory="org.eclipse.m2e.pde.target.MavenTargetLocationFactory"
              type="Maven">
        </targetLocation>
     </extension>
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/Activator.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/Activator.java
similarity index 97%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/Activator.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/Activator.java
index e5ff1d256f..968b5f7c3d 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/Activator.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/Activator.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/BNDInstructions.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/BNDInstructions.java
similarity index 98%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/BNDInstructions.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/BNDInstructions.java
index 6674f9ff53..0ed125d367 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/BNDInstructions.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/BNDInstructions.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/CacheManager.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/CacheManager.java
similarity index 99%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/CacheManager.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/CacheManager.java
index c43a27177c..08c76646f6 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/CacheManager.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/CacheManager.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/DependencyDepth.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/DependencyDepth.java
similarity index 94%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/DependencyDepth.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/DependencyDepth.java
index 328941af0d..07389f34be 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/DependencyDepth.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/DependencyDepth.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 public enum DependencyDepth {
 	NONE, DIRECT, INFINITE;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/DependencyNodeGenerator.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/DependencyNodeGenerator.java
similarity index 99%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/DependencyNodeGenerator.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/DependencyNodeGenerator.java
index 4484fab382..5582d78d2c 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/DependencyNodeGenerator.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/DependencyNodeGenerator.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/DomXmlFeature.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/DomXmlFeature.java
similarity index 97%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/DomXmlFeature.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/DomXmlFeature.java
index 4f4498b3c7..50781e61cc 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/DomXmlFeature.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/DomXmlFeature.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.pde.internal.core.NLResourceHelper;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenFeaturePlugin.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenFeaturePlugin.java
similarity index 97%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenFeaturePlugin.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenFeaturePlugin.java
index de4f26e3a0..dcc397c370 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenFeaturePlugin.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenFeaturePlugin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.equinox.frameworkadmin.BundleInfo;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenPomFeatureModel.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenPomFeatureModel.java
similarity index 99%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenPomFeatureModel.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenPomFeatureModel.java
index 340f93d374..d771e6d975 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenPomFeatureModel.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenPomFeatureModel.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenSourceBundle.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenSourceBundle.java
similarity index 97%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenSourceBundle.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenSourceBundle.java
index 4f5a32dd06..af198c5e3c 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenSourceBundle.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenSourceBundle.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -27,7 +27,7 @@
 
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.equinox.frameworkadmin.BundleInfo;
-import org.eclipse.m2e.pde.CacheManager.CacheConsumer;
+import org.eclipse.m2e.pde.target.CacheManager.CacheConsumer;
 import org.eclipse.pde.core.target.TargetBundle;
 import org.osgi.framework.Constants;
 
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetBundle.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetBundle.java
similarity index 99%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetBundle.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetBundle.java
index a2c67301c1..75a11625e5 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetBundle.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetBundle.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetDependency.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetDependency.java
similarity index 98%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetDependency.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetDependency.java
index 0981dbae7e..a670b68fb6 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetDependency.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetDependency.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetDependencyFilter.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetDependencyFilter.java
similarity index 98%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetDependencyFilter.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetDependencyFilter.java
index 309bbd78e0..0ac996ad5b 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetDependencyFilter.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetDependencyFilter.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import static org.apache.maven.artifact.Artifact.SCOPE_COMPILE;
 import static org.apache.maven.artifact.Artifact.SCOPE_PROVIDED;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetFeature.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetFeature.java
similarity index 95%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetFeature.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetFeature.java
index dcf9b5a8dc..db05c8a1f9 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetFeature.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetFeature.java
@@ -11,7 +11,7 @@
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import org.eclipse.pde.core.target.TargetFeature;
 import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetLocation.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocation.java
similarity index 99%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetLocation.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocation.java
index 46eccc7666..8d5761d699 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetLocation.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocation.java
@@ -11,7 +11,7 @@
  *      Christoph Läubrich - initial API and implementation
  *      Patrick Ziegler - Support contribution of Eclipse features via Maven repositories
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetLocationFactory.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocationFactory.java
similarity index 99%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetLocationFactory.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocationFactory.java
index d3d9df96eb..30a87685a2 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetLocationFactory.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetLocationFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetRepository.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetRepository.java
similarity index 95%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetRepository.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetRepository.java
index de11c313ac..48817c8113 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MavenTargetRepository.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MavenTargetRepository.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import org.apache.maven.model.Repository;
 
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MissingMetadataMode.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MissingMetadataMode.java
similarity index 94%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MissingMetadataMode.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MissingMetadataMode.java
index 1379723cfb..561a3323f3 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/MissingMetadataMode.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/MissingMetadataMode.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 public enum MissingMetadataMode {
 	IGNORE, ERROR, GENERATE;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/TargetBundles.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/TargetBundles.java
similarity index 98%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/TargetBundles.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/TargetBundles.java
index 21a73d040b..c6ab3e443b 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/TargetBundles.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/TargetBundles.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/TemplateFeatureModel.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/TemplateFeatureModel.java
similarity index 98%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/TemplateFeatureModel.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/TemplateFeatureModel.java
index e43f345a0b..c02cb30460 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/TemplateFeatureModel.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/TemplateFeatureModel.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.io.ByteArrayInputStream;
 import java.io.PrintWriter;
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/WorkspaceArtifact.java b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/WorkspaceArtifact.java
similarity index 97%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/WorkspaceArtifact.java
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/WorkspaceArtifact.java
index 36ab31e99d..b7298fc063 100644
--- a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/WorkspaceArtifact.java
+++ b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/WorkspaceArtifact.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde;
+package org.eclipse.m2e.pde.target;
 
 import java.io.File;
 
diff --git a/org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/bnd-default.properties b/org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/bnd-default.properties
similarity index 100%
rename from org.eclipse.m2e.pde/src/org/eclipse/m2e/pde/bnd-default.properties
rename to org.eclipse.m2e.pde.target/src/org/eclipse/m2e/pde/target/bnd-default.properties
diff --git a/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF
index 93ccf2894e..0071083a58 100644
--- a/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0",
  biz.aQute.bndlib;bundle-version="5.1.2",
  org.eclipse.m2e.maven.runtime,
  org.eclipse.m2e.core,
- org.eclipse.m2e.pde,
+ org.eclipse.m2e.pde.target,
  org.eclipse.pde;bundle-version="3.13.300",
  org.eclipse.core.databinding;bundle-version="1.10.100",
  org.eclipse.core.databinding.observable;bundle-version="1.10.0",
diff --git a/org.eclipse.m2e.pde.ui/plugin.xml b/org.eclipse.m2e.pde.ui/plugin.xml
index a55e2011f0..e71be8524b 100644
--- a/org.eclipse.m2e.pde.ui/plugin.xml
+++ b/org.eclipse.m2e.pde.ui/plugin.xml
@@ -5,7 +5,7 @@
     <extension
           point="org.eclipse.pde.ui.targetLocationProvisioners">
        <locationProvider
-             class="org.eclipse.m2e.pde.ui.editor.MavenTargetLocationWizard"
+             class="org.eclipse.m2e.pde.ui.target.editor.MavenTargetLocationWizard"
              icon="icons/m2.gif"
              id="org.eclipse.m2e.pde.ui.editor.MavenTargetLocationWizard"
              name="Maven">
@@ -18,8 +18,8 @@
     <extension
           point="org.eclipse.core.runtime.adapters">
        <factory
-             adaptableType="org.eclipse.m2e.pde.MavenTargetLocation"
-             class="org.eclipse.m2e.pde.ui.adapter.MavenTargetAdapterFactory">
+             adaptableType="org.eclipse.m2e.pde.target.MavenTargetLocation"
+             class="org.eclipse.m2e.pde.ui.target.adapter.MavenTargetAdapterFactory">
           <adapter
                 type="org.eclipse.jface.viewers.ILabelProvider">
           </adapter>
@@ -34,8 +34,8 @@
     <extension
           point="org.eclipse.core.runtime.adapters">
        <factory
-             adaptableType="org.eclipse.m2e.pde.MavenTargetBundle"
-             class="org.eclipse.m2e.pde.ui.adapter.MavenTargetBundleAdapterFactory">
+             adaptableType="org.eclipse.m2e.pde.target.MavenTargetBundle"
+             class="org.eclipse.m2e.pde.ui.target.adapter.MavenTargetBundleAdapterFactory">
           <adapter
                 type="org.eclipse.jface.viewers.ILabelProvider">
           </adapter>
@@ -45,7 +45,7 @@
           point="org.eclipse.core.runtime.adapters">
        <factory
              adaptableType="org.eclipse.aether.graph.DependencyNode"
-             class="org.eclipse.m2e.pde.ui.adapter.DependencyNodeAdapterFactory">
+             class="org.eclipse.m2e.pde.ui.target.adapter.DependencyNodeAdapterFactory">
           <adapter
                 type="org.eclipse.jface.viewers.ITreeContentProvider">
           </adapter>
@@ -60,8 +60,8 @@
     <extension
           point="org.eclipse.core.runtime.adapters">
        <factory
-             adaptableType="org.eclipse.m2e.pde.MavenTargetDependency"
-             class="org.eclipse.m2e.pde.ui.adapter.MavenTargetDependencyAdapterFactory">
+             adaptableType="org.eclipse.m2e.pde.target.MavenTargetDependency"
+             class="org.eclipse.m2e.pde.ui.target.adapter.MavenTargetDependencyAdapterFactory">
           <adapter
                 type="org.eclipse.jface.viewers.ILabelProvider">
           </adapter>
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/Activator.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/Activator.java
index 77eeabd193..3fe8a75e81 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/Activator.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/Activator.java
@@ -12,10 +12,10 @@
  *******************************************************************************/
 package org.eclipse.m2e.pde.ui;
 
-import org.eclipse.m2e.pde.ui.adapter.DependencyNodeAdapterFactory;
-import org.eclipse.m2e.pde.ui.adapter.MavenTargetAdapterFactory;
-import org.eclipse.m2e.pde.ui.adapter.MavenTargetBundleAdapterFactory;
-import org.eclipse.m2e.pde.ui.adapter.MavenTargetDependencyAdapterFactory;
+import org.eclipse.m2e.pde.ui.target.adapter.DependencyNodeAdapterFactory;
+import org.eclipse.m2e.pde.ui.target.adapter.MavenTargetAdapterFactory;
+import org.eclipse.m2e.pde.ui.target.adapter.MavenTargetBundleAdapterFactory;
+import org.eclipse.m2e.pde.ui.target.adapter.MavenTargetDependencyAdapterFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/adapter/DependencyNodeAdapterFactory.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/DependencyNodeAdapterFactory.java
similarity index 87%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/adapter/DependencyNodeAdapterFactory.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/DependencyNodeAdapterFactory.java
index 145903cde8..9a32e46fcb 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/adapter/DependencyNodeAdapterFactory.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/DependencyNodeAdapterFactory.java
@@ -10,15 +10,15 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.adapter;
+package org.eclipse.m2e.pde.ui.target.adapter;
 
 import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.m2e.pde.ui.editor.MavenTargetLocationEditor;
-import org.eclipse.m2e.pde.ui.provider.DependencyNodeLabelProvider;
-import org.eclipse.m2e.pde.ui.provider.MavenTargetTreeContentProvider;
+import org.eclipse.m2e.pde.ui.target.editor.MavenTargetLocationEditor;
+import org.eclipse.m2e.pde.ui.target.provider.DependencyNodeLabelProvider;
+import org.eclipse.m2e.pde.ui.target.provider.MavenTargetTreeContentProvider;
 import org.eclipse.pde.ui.target.ITargetLocationHandler;
 
 public class DependencyNodeAdapterFactory implements IAdapterFactory {
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/adapter/MavenTargetAdapterFactory.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetAdapterFactory.java
similarity index 84%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/adapter/MavenTargetAdapterFactory.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetAdapterFactory.java
index df785c79cd..8834221ed3 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/adapter/MavenTargetAdapterFactory.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetAdapterFactory.java
@@ -10,15 +10,15 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.adapter;
+package org.eclipse.m2e.pde.ui.target.adapter;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.m2e.pde.MavenTargetLocation;
-import org.eclipse.m2e.pde.ui.editor.MavenTargetLocationEditor;
-import org.eclipse.m2e.pde.ui.provider.MavenTargetLocationLabelProvider;
-import org.eclipse.m2e.pde.ui.provider.MavenTargetTreeContentProvider;
+import org.eclipse.m2e.pde.target.MavenTargetLocation;
+import org.eclipse.m2e.pde.ui.target.editor.MavenTargetLocationEditor;
+import org.eclipse.m2e.pde.ui.target.provider.MavenTargetLocationLabelProvider;
+import org.eclipse.m2e.pde.ui.target.provider.MavenTargetTreeContentProvider;
 import org.eclipse.pde.ui.target.ITargetLocationHandler;
 
 public class MavenTargetAdapterFactory implements IAdapterFactory {
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/adapter/MavenTargetBundleAdapterFactory.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetBundleAdapterFactory.java
similarity index 87%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/adapter/MavenTargetBundleAdapterFactory.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetBundleAdapterFactory.java
index 35e8ed5b87..2c8dc0c751 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/adapter/MavenTargetBundleAdapterFactory.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetBundleAdapterFactory.java
@@ -10,12 +10,12 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.adapter;
+package org.eclipse.m2e.pde.ui.target.adapter;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.m2e.pde.MavenTargetBundle;
-import org.eclipse.m2e.pde.ui.provider.MavenTargetBundleLabelProvider;
+import org.eclipse.m2e.pde.target.MavenTargetBundle;
+import org.eclipse.m2e.pde.ui.target.provider.MavenTargetBundleLabelProvider;
 
 public class MavenTargetBundleAdapterFactory implements IAdapterFactory {
 
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/adapter/MavenTargetDependencyAdapterFactory.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetDependencyAdapterFactory.java
similarity index 84%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/adapter/MavenTargetDependencyAdapterFactory.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetDependencyAdapterFactory.java
index 5410f52a3f..fcc44da5a0 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/adapter/MavenTargetDependencyAdapterFactory.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetDependencyAdapterFactory.java
@@ -10,15 +10,15 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.adapter;
+package org.eclipse.m2e.pde.ui.target.adapter;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.m2e.pde.MavenTargetDependency;
-import org.eclipse.m2e.pde.ui.editor.MavenTargetLocationEditor;
-import org.eclipse.m2e.pde.ui.provider.MavenTargetDependencyLabelProvider;
-import org.eclipse.m2e.pde.ui.provider.MavenTargetTreeContentProvider;
+import org.eclipse.m2e.pde.target.MavenTargetDependency;
+import org.eclipse.m2e.pde.ui.target.editor.MavenTargetLocationEditor;
+import org.eclipse.m2e.pde.ui.target.provider.MavenTargetDependencyLabelProvider;
+import org.eclipse.m2e.pde.ui.target.provider.MavenTargetTreeContentProvider;
 import org.eclipse.pde.ui.target.ITargetLocationHandler;
 
 public class MavenTargetDependencyAdapterFactory implements IAdapterFactory {
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/AbstractFeatureSpecPage.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/AbstractFeatureSpecPage.java
similarity index 99%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/AbstractFeatureSpecPage.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/AbstractFeatureSpecPage.java
index d3347b0679..08a69aa768 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/AbstractFeatureSpecPage.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/AbstractFeatureSpecPage.java
@@ -13,7 +13,7 @@
  *     Christoph Läubrich - adjust for m2e-pde usage
  *******************************************************************************/
 
-package org.eclipse.m2e.pde.ui.editor;
+package org.eclipse.m2e.pde.ui.target.editor;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.dialogs.Dialog;
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/ClipboardParser.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/ClipboardParser.java
similarity index 94%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/ClipboardParser.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/ClipboardParser.java
index fec40a41e1..bc91d37313 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/ClipboardParser.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/ClipboardParser.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.editor;
+package org.eclipse.m2e.pde.ui.target.editor;
 
 import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
@@ -20,8 +20,8 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.eclipse.m2e.pde.MavenTargetDependency;
-import org.eclipse.m2e.pde.MavenTargetLocation;
+import org.eclipse.m2e.pde.target.MavenTargetDependency;
+import org.eclipse.m2e.pde.target.MavenTargetLocation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/FeatureSpecPage.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/FeatureSpecPage.java
similarity index 98%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/FeatureSpecPage.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/FeatureSpecPage.java
index 9074866ba3..1e5fb83402 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/FeatureSpecPage.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/FeatureSpecPage.java
@@ -13,13 +13,13 @@
  *     Christoph Läubrich - adjust for m2e-pde usage
  *******************************************************************************/
 
-package org.eclipse.m2e.pde.ui.editor;
+package org.eclipse.m2e.pde.ui.target.editor;
 
 import java.util.Objects;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.m2e.pde.MavenTargetLocation;
+import org.eclipse.m2e.pde.target.MavenTargetLocation;
 import org.eclipse.pde.internal.core.ifeature.IFeature;
 import org.eclipse.pde.internal.core.ifeature.IFeatureInfo;
 import org.eclipse.pde.internal.core.ifeature.IFeatureInstallHandler;
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenArtifactInstructionsWizard.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenArtifactInstructionsWizard.java
similarity index 98%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenArtifactInstructionsWizard.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenArtifactInstructionsWizard.java
index 533ad76575..ba5fdf1d5d 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenArtifactInstructionsWizard.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenArtifactInstructionsWizard.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.editor;
+package org.eclipse.m2e.pde.ui.target.editor;
 
 import java.util.Objects;
 
@@ -23,7 +23,7 @@
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.m2e.pde.BNDInstructions;
+import org.eclipse.m2e.pde.target.BNDInstructions;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.browser.Browser;
 import org.eclipse.swt.events.ModifyEvent;
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenTargetDependencyEditor.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetDependencyEditor.java
similarity index 98%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenTargetDependencyEditor.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetDependencyEditor.java
index b35e5bee8d..9c19557d30 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenTargetDependencyEditor.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetDependencyEditor.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.editor;
+package org.eclipse.m2e.pde.ui.target.editor;
 
 import java.text.MessageFormat;
 import java.util.Arrays;
@@ -26,7 +26,7 @@
 import org.eclipse.jface.databinding.swt.WidgetSideEffects;
 import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.m2e.pde.MavenTargetDependency;
+import org.eclipse.m2e.pde.target.MavenTargetDependency;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.custom.CTabFolder;
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenTargetLocationEditor.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetLocationEditor.java
similarity index 96%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenTargetLocationEditor.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetLocationEditor.java
index df149907a6..b5dfa439be 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenTargetLocationEditor.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetLocationEditor.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.editor;
+package org.eclipse.m2e.pde.ui.target.editor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,11 +23,11 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.m2e.pde.BNDInstructions;
-import org.eclipse.m2e.pde.MavenTargetBundle;
-import org.eclipse.m2e.pde.MavenTargetDependency;
-import org.eclipse.m2e.pde.MavenTargetLocation;
-import org.eclipse.m2e.pde.MissingMetadataMode;
+import org.eclipse.m2e.pde.target.BNDInstructions;
+import org.eclipse.m2e.pde.target.MavenTargetBundle;
+import org.eclipse.m2e.pde.target.MavenTargetDependency;
+import org.eclipse.m2e.pde.target.MavenTargetLocation;
+import org.eclipse.m2e.pde.target.MissingMetadataMode;
 import org.eclipse.m2e.pde.ui.Activator;
 import org.eclipse.pde.core.target.ITargetDefinition;
 import org.eclipse.pde.core.target.ITargetLocation;
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenTargetLocationWizard.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetLocationWizard.java
similarity index 97%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenTargetLocationWizard.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetLocationWizard.java
index 9e34e25646..ffe358abc5 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenTargetLocationWizard.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetLocationWizard.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.editor;
+package org.eclipse.m2e.pde.ui.target.editor;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,13 +32,13 @@
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.m2e.pde.BNDInstructions;
-import org.eclipse.m2e.pde.DependencyDepth;
-import org.eclipse.m2e.pde.MavenTargetDependency;
-import org.eclipse.m2e.pde.MavenTargetLocation;
-import org.eclipse.m2e.pde.MavenTargetRepository;
-import org.eclipse.m2e.pde.MissingMetadataMode;
-import org.eclipse.m2e.pde.TemplateFeatureModel;
+import org.eclipse.m2e.pde.target.BNDInstructions;
+import org.eclipse.m2e.pde.target.DependencyDepth;
+import org.eclipse.m2e.pde.target.MavenTargetDependency;
+import org.eclipse.m2e.pde.target.MavenTargetLocation;
+import org.eclipse.m2e.pde.target.MavenTargetRepository;
+import org.eclipse.m2e.pde.target.MissingMetadataMode;
+import org.eclipse.m2e.pde.target.TemplateFeatureModel;
 import org.eclipse.m2e.pde.ui.Activator;
 import org.eclipse.pde.core.target.ITargetDefinition;
 import org.eclipse.pde.core.target.ITargetLocation;
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenTargetRepositoryEditor.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetRepositoryEditor.java
similarity index 98%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenTargetRepositoryEditor.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetRepositoryEditor.java
index c2921ead52..4f21258462 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/MavenTargetRepositoryEditor.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetRepositoryEditor.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.editor;
+package org.eclipse.m2e.pde.ui.target.editor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +32,7 @@
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.m2e.pde.MavenTargetRepository;
+import org.eclipse.m2e.pde.target.MavenTargetRepository;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/Messages.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/Messages.java
similarity index 93%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/Messages.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/Messages.java
index 04fdb4c8b1..c9bd792830 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/Messages.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/Messages.java
@@ -1,9 +1,9 @@
-package org.eclipse.m2e.pde.ui.editor;
+package org.eclipse.m2e.pde.ui.target.editor;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.m2e.pde.ui.editor.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.m2e.pde.ui.target.editor.messages"; //$NON-NLS-1$
 	public static String NewFeatureWizard_PlugPage_desc;
 	public static String NewFeatureWizard_PlugPage_title;
 	public static String MavenArtifactInstructionsWizard_0;
@@ -27,7 +27,6 @@ public class Messages extends NLS {
 	public static String MavenTargetLocationWizard_12;
 	public static String MavenTargetLocationWizard_13;
 	public static String MavenTargetLocationWizard_14;
-	public static String MavenTargetLocationWizard_15;
 	public static String MavenTargetLocationWizard_16;
 	public static String MavenTargetLocationWizard_17;
 	public static String MavenTargetRepositoryEditor_1;
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/PluginListPage.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/PluginListPage.java
similarity index 98%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/PluginListPage.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/PluginListPage.java
index c291f6b9bb..c0d264dc83 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/PluginListPage.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/PluginListPage.java
@@ -14,7 +14,7 @@
  *     Martin Karpisek <martin.karpisek@gmail.com> - Bug 247265
  *     Christoph Läubrich - adjust for m2e-pde usage
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.editor;
+package org.eclipse.m2e.pde.ui.target.editor;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
@@ -29,7 +29,7 @@
 import org.eclipse.jface.viewers.CheckboxTreeViewer;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.m2e.pde.MavenTargetLocation;
+import org.eclipse.m2e.pde.target.MavenTargetLocation;
 import org.eclipse.pde.core.plugin.IPluginBase;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
 import org.eclipse.pde.core.plugin.PluginRegistry;
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/messages.properties b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/messages.properties
similarity index 100%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/editor/messages.properties
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/messages.properties
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/DependencyNodeLabelProvider.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/DependencyNodeLabelProvider.java
similarity index 95%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/DependencyNodeLabelProvider.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/DependencyNodeLabelProvider.java
index 7869a7b5bd..b4605e8579 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/DependencyNodeLabelProvider.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/DependencyNodeLabelProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.provider;
+package org.eclipse.m2e.pde.ui.target.provider;
 
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.graph.DependencyNode;
@@ -20,9 +20,9 @@
 import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.m2e.pde.BNDInstructions;
-import org.eclipse.m2e.pde.MavenTargetBundle;
-import org.eclipse.m2e.pde.MavenTargetLocation;
+import org.eclipse.m2e.pde.target.BNDInstructions;
+import org.eclipse.m2e.pde.target.MavenTargetBundle;
+import org.eclipse.m2e.pde.target.MavenTargetLocation;
 import org.eclipse.swt.graphics.Image;
 
 public class DependencyNodeLabelProvider implements ILabelProvider {
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/MavenTargetBundleLabelProvider.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/MavenTargetBundleLabelProvider.java
similarity index 88%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/MavenTargetBundleLabelProvider.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/MavenTargetBundleLabelProvider.java
index bc8a6f655a..85ea43a211 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/MavenTargetBundleLabelProvider.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/MavenTargetBundleLabelProvider.java
@@ -10,11 +10,11 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.provider;
+package org.eclipse.m2e.pde.ui.target.provider;
 
 import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.m2e.pde.MavenTargetBundle;
-import org.eclipse.m2e.pde.ui.adapter.MavenTargetAdapterFactory;
+import org.eclipse.m2e.pde.target.MavenTargetBundle;
+import org.eclipse.m2e.pde.ui.target.adapter.MavenTargetAdapterFactory;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/MavenTargetDependencyLabelProvider.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/MavenTargetDependencyLabelProvider.java
similarity index 90%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/MavenTargetDependencyLabelProvider.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/MavenTargetDependencyLabelProvider.java
index 46a163e3f4..481fff1c7e 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/MavenTargetDependencyLabelProvider.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/MavenTargetDependencyLabelProvider.java
@@ -10,12 +10,12 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.provider;
+package org.eclipse.m2e.pde.ui.target.provider;
 
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.m2e.pde.MavenTargetDependency;
-import org.eclipse.m2e.pde.ui.adapter.MavenTargetAdapterFactory;
+import org.eclipse.m2e.pde.target.MavenTargetDependency;
+import org.eclipse.m2e.pde.ui.target.adapter.MavenTargetAdapterFactory;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/MavenTargetLocationLabelProvider.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/MavenTargetLocationLabelProvider.java
similarity index 90%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/MavenTargetLocationLabelProvider.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/MavenTargetLocationLabelProvider.java
index 43e6efecc4..7b6ba2b944 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/MavenTargetLocationLabelProvider.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/MavenTargetLocationLabelProvider.java
@@ -10,17 +10,17 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.provider;
+package org.eclipse.m2e.pde.ui.target.provider;
 
 import java.text.MessageFormat;
 import java.util.List;
 
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.m2e.pde.MavenTargetDependency;
-import org.eclipse.m2e.pde.MavenTargetLocation;
-import org.eclipse.m2e.pde.ui.adapter.MavenTargetAdapterFactory;
-import org.eclipse.m2e.pde.ui.editor.Messages;
+import org.eclipse.m2e.pde.target.MavenTargetDependency;
+import org.eclipse.m2e.pde.target.MavenTargetLocation;
+import org.eclipse.m2e.pde.ui.target.adapter.MavenTargetAdapterFactory;
+import org.eclipse.m2e.pde.ui.target.editor.Messages;
 import org.eclipse.pde.internal.core.ifeature.IFeature;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/MavenTargetTreeContentProvider.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/MavenTargetTreeContentProvider.java
similarity index 96%
rename from org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/MavenTargetTreeContentProvider.java
rename to org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/MavenTargetTreeContentProvider.java
index d89f0e57b5..c701a826a9 100644
--- a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/provider/MavenTargetTreeContentProvider.java
+++ b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/provider/MavenTargetTreeContentProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *      Christoph Läubrich - initial API and implementation
  *******************************************************************************/
-package org.eclipse.m2e.pde.ui.provider;
+package org.eclipse.m2e.pde.ui.target.provider;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -18,8 +18,8 @@
 
 import org.eclipse.aether.graph.DependencyNode;
 import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.m2e.pde.MavenTargetDependency;
-import org.eclipse.m2e.pde.MavenTargetLocation;
+import org.eclipse.m2e.pde.target.MavenTargetDependency;
+import org.eclipse.m2e.pde.target.MavenTargetLocation;
 import org.eclipse.pde.core.target.TargetFeature;
 
 public class MavenTargetTreeContentProvider implements ITreeContentProvider {
diff --git a/pom.xml b/pom.xml
index 1d84bc7af9..28bfbc1852 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
 		<module>org.eclipse.m2e.sourcelookup</module>
 		<module>org.eclipse.m2e.sourcelookup.ui</module>
 		<module>org.eclipse.m2e.editor.lemminx</module>
-		<module>org.eclipse.m2e.pde</module>
+		<module>org.eclipse.m2e.pde.target</module>
 		<module>org.eclipse.m2e.pde.ui</module>
 		<module>org.eclipse.m2e.pde.connector</module>
 		<module>org.eclipse.m2e.apt.core</module>