diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/AbstractFileMojo.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/AbstractFileMojo.java
similarity index 98%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/AbstractFileMojo.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/AbstractFileMojo.java
index ddd6c1d..4869796 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/AbstractFileMojo.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/AbstractFileMojo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.io.File;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/Capability.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/Capability.java
similarity index 98%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/Capability.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/Capability.java
index 4bf0f76..a5f9cbb 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/Capability.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/Capability.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.util.ArrayList;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/Category.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/Category.java
similarity index 97%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/Category.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/Category.java
index 75086da..7ed1b2e 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/Category.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/Category.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import org.w3c.dom.Document;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/Config.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/Config.java
similarity index 98%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/Config.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/Config.java
index c2d12c7..345d510 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/Config.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/Config.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.net.URI;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ExtractBindexInfo.java
similarity index 99%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/ExtractBindexInfo.java
index 86aee85..aadebcb 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ExtractBindexInfo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.io.File;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrCleanRepo.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrCleanRepo.java
similarity index 99%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrCleanRepo.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrCleanRepo.java
index f89d08d..884d873 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrCleanRepo.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrCleanRepo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.io.File;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrDeploy.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
similarity index 99%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrDeploy.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
index 7915082..1efb805 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrDeploy.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.io.File;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
similarity index 99%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
index ca673f0..de81e34 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrDeployFile.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.io.File;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrInstall.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java
similarity index 94%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrInstall.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java
index 8d0207f..3c0b003 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrInstall.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstall.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.felix.obr.plugin.Config;
-import org.apache.felix.obr.plugin.ObrUpdate;
-import org.apache.felix.obr.plugin.ObrUtils;
+import org.apache.felix.obrplugin.Config;
+import org.apache.felix.obrplugin.ObrUpdate;
+import org.apache.felix.obrplugin.ObrUtils;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.logging.Log;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrInstallFile.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstallFile.java
similarity index 98%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrInstallFile.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstallFile.java
index 2b22d57..5565b3c 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrInstallFile.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrInstallFile.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.net.URI;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrUpdate.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUpdate.java
similarity index 99%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrUpdate.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUpdate.java
index 27dfd7e..090735c 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrUpdate.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUpdate.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.io.File;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrUtils.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUtils.java
similarity index 98%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrUtils.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUtils.java
index 94728a0..857fc82 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ObrUtils.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.io.File;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/PElement.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/PElement.java
similarity index 98%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/PElement.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/PElement.java
index 63ae409..2748dfb 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/PElement.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/PElement.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import org.w3c.dom.Document;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/PomHelper.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/PomHelper.java
similarity index 98%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/PomHelper.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/PomHelper.java
index 7d81e09..d11c776 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/PomHelper.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/PomHelper.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.io.File;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/RemoteFileManager.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java
similarity index 99%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/RemoteFileManager.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java
index 4a01d21..f9be14e 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/RemoteFileManager.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/RemoteFileManager.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.io.BufferedWriter;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/Require.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/Require.java
similarity index 98%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/Require.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/Require.java
index 370eb38..9b44f9d 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/Require.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/Require.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import org.w3c.dom.Document;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ResourcesBundle.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ResourcesBundle.java
similarity index 99%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/ResourcesBundle.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/ResourcesBundle.java
index 1e5f01d..b214b73 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/ResourcesBundle.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ResourcesBundle.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import java.util.ArrayList;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/XmlHelper.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/XmlHelper.java
similarity index 98%
rename from bundleplugin/src/main/java/org/apache/felix/obr/plugin/XmlHelper.java
rename to bundleplugin/src/main/java/org/apache/felix/obrplugin/XmlHelper.java
index 5ad06fb..0017f19 100644
--- a/bundleplugin/src/main/java/org/apache/felix/obr/plugin/XmlHelper.java
+++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/XmlHelper.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.obr.plugin;
+package org.apache.felix.obrplugin;
 
 
 import org.w3c.dom.Node;