diff --git a/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java b/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
rename to src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
index 4e0eb9d..008b6b3 100644
--- a/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
+++ b/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugins/war/Overlay.java b/src/main/java/org/apache/maven/plugin/war/Overlay.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugins/war/Overlay.java
rename to src/main/java/org/apache/maven/plugin/war/Overlay.java
index 82f8f7f..63f5ab1 100644
--- a/src/main/java/org/apache/maven/plugins/war/Overlay.java
+++ b/src/main/java/org/apache/maven/plugin/war/Overlay.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java b/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
similarity index 97%
rename from src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java
rename to src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
index d1d6e0d..df11a39 100644
--- a/src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java
+++ b/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java b/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
similarity index 97%
rename from src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java
rename to src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
index fb2a5e6..9987896 100644
--- a/src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java
+++ b/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java b/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java
rename to src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
index 23112d6..c0639ec 100644
--- a/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java
+++ b/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugins/war/WarMojo.java b/src/main/java/org/apache/maven/plugin/war/WarMojo.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugins/war/WarMojo.java
rename to src/main/java/org/apache/maven/plugin/war/WarMojo.java
index c1603dd..c59f3df 100644
--- a/src/main/java/org/apache/maven/plugins/war/WarMojo.java
+++ b/src/main/java/org/apache/maven/plugin/war/WarMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java b/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java
index d51f576..4c86e94 100644
--- a/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java
+++ b/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java
@@ -20,7 +20,7 @@
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugin.war.Overlay;
 
 /**
  * A default overlay implementation based on an {@link Artifact}.
diff --git a/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java b/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
index 559cb21..c81d25e 100644
--- a/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
+++ b/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
@@ -27,7 +27,7 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugin.war.Overlay;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.StringUtils;
 
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java b/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
index b4e7d97..9752a1a 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
@@ -27,7 +27,7 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugin.war.Overlay;
 import org.codehaus.plexus.interpolation.InterpolationException;
 
 /**
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java b/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
index f342cd0..094a3d4 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
@@ -22,9 +22,9 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.war.Overlay;
 import org.apache.maven.plugin.war.util.ClassesPackager;
 import org.apache.maven.plugin.war.util.PathSet;
-import org.apache.maven.plugins.war.Overlay;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.interpolation.InterpolationException;
 
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java b/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
index 8b1e007..18b433a 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
@@ -20,8 +20,8 @@
  */
 
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.war.Overlay;
 import org.apache.maven.plugin.war.util.PathSet;
-import org.apache.maven.plugins.war.Overlay;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java b/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
index 25a68fb..7d13e5d 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
@@ -25,8 +25,8 @@
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.war.Overlay;
 import org.apache.maven.plugin.war.util.PathSet;
-import org.apache.maven.plugins.war.Overlay;
 import org.apache.maven.shared.filtering.MavenFilteringException;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.StringUtils;
diff --git a/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java b/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
rename to src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
index c6972f9..d7902a7 100644
--- a/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
+++ b/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,6 @@
 
 import org.apache.maven.plugin.testing.stubs.ArtifactStub;
 import org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub;
-import org.apache.maven.plugins.war.WarExplodedMojo;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
diff --git a/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java b/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
rename to src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
index 309db5d..d379147 100644
--- a/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
+++ b/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -30,7 +30,6 @@
 import org.apache.maven.plugin.testing.stubs.ArtifactStub;
 import org.apache.maven.plugin.war.stub.MavenProjectBasicStub;
 import org.apache.maven.plugin.war.stub.WarOverlayStub;
-import org.apache.maven.plugins.war.AbstractWarMojo;
 import org.apache.maven.shared.filtering.MavenFileFilter;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.archiver.Archiver;
diff --git a/src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java b/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java
rename to src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java
index fd53d72..e7cce82 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java
+++ b/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java b/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java
rename to src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java
index 5cd2e5d..02cb9aa 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java
+++ b/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java b/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
rename to src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
index e88644f..90a0835 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
+++ b/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java b/src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java
rename to src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java
index 4232882..b9eb7bb 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java
+++ b/src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,6 @@
 
 import org.apache.maven.plugin.war.stub.MavenProjectBasicStub;
 import org.apache.maven.plugin.war.stub.ResourceStub;
-import org.apache.maven.plugins.war.WarInPlaceMojo;
 
 import java.io.File;
 import java.util.LinkedList;
diff --git a/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java b/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
rename to src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java
index c7faf7f..20a206a 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
+++ b/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,6 @@
 
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugins.war.WarManifestMojo;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
diff --git a/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java b/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
rename to src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
index 3dfa380..df4c69a 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
+++ b/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -33,7 +33,6 @@
 import org.apache.maven.plugin.war.stub.MavenProject4CopyConstructor;
 import org.apache.maven.plugin.war.stub.ProjectHelperStub;
 import org.apache.maven.plugin.war.stub.WarArtifact4CCStub;
-import org.apache.maven.plugins.war.WarMojo;
 import org.codehaus.plexus.util.IOUtil;
 
 /**
diff --git a/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java b/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
rename to src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java
index de7040c..8a2e8ac 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
+++ b/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,6 @@
 
 import org.apache.maven.plugin.testing.stubs.ArtifactStub;
 import org.apache.maven.plugin.war.overlay.DefaultOverlay;
-import org.apache.maven.plugins.war.Overlay;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
diff --git a/src/test/java/org/apache/maven/plugins/war/WarZipTest.java b/src/test/java/org/apache/maven/plugin/war/WarZipTest.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugins/war/WarZipTest.java
rename to src/test/java/org/apache/maven/plugin/war/WarZipTest.java
index 9abc54e..4407635 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarZipTest.java
+++ b/src/test/java/org/apache/maven/plugin/war/WarZipTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugins.war;
+package org.apache.maven.plugin.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,8 +25,6 @@
 import org.apache.maven.plugin.war.stub.MavenZipProject;
 import org.apache.maven.plugin.war.stub.WarArtifactStub;
 import org.apache.maven.plugin.war.stub.ZipArtifactStub;
-import org.apache.maven.plugins.war.Overlay;
-import org.apache.maven.plugins.war.WarMojo;
 import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
diff --git a/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java b/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java
index 98e5856..87a39f5 100644
--- a/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java
+++ b/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java
@@ -20,9 +20,9 @@
  */
 
 import org.apache.maven.plugin.testing.stubs.ArtifactStub;
+import org.apache.maven.plugin.war.Overlay;
 import org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub;
 import org.apache.maven.plugin.war.stub.WarArtifactStub;
-import org.apache.maven.plugins.war.Overlay;
 import org.codehaus.plexus.PlexusTestCase;
 
 import java.util.ArrayList;