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 4c86e94..d51f576 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.plugin.war.Overlay;
+import org.apache.maven.plugins.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 c81d25e..559cb21 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.plugin.war.Overlay;
+import org.apache.maven.plugins.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 9752a1a..b4e7d97 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.plugin.war.Overlay;
+import org.apache.maven.plugins.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 094a3d4..f342cd0 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 18b433a..8b1e007 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 7d13e5d..25a68fb 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/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
rename to src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
index 008b6b3..4e0eb9d 100644
--- a/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/Overlay.java b/src/main/java/org/apache/maven/plugins/war/Overlay.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/war/Overlay.java
rename to src/main/java/org/apache/maven/plugins/war/Overlay.java
index 63f5ab1..82f8f7f 100644
--- a/src/main/java/org/apache/maven/plugin/war/Overlay.java
+++ b/src/main/java/org/apache/maven/plugins/war/Overlay.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java b/src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java
similarity index 97%
rename from src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
rename to src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java
index df11a39..d1d6e0d 100644
--- a/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java b/src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java
similarity index 97%
rename from src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
rename to src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java
index 9987896..fb2a5e6 100644
--- a/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java b/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
rename to src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java
index c0639ec..23112d6 100644
--- a/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/WarMojo.java b/src/main/java/org/apache/maven/plugins/war/WarMojo.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/war/WarMojo.java
rename to src/main/java/org/apache/maven/plugins/war/WarMojo.java
index c59f3df..c1603dd 100644
--- a/src/main/java/org/apache/maven/plugin/war/WarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/WarMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
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 87a39f5..98e5856 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;
diff --git a/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java b/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
rename to src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
index d7902a7..c6972f9 100644
--- a/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@
 
 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/plugin/war/AbstractWarMojoTest.java b/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
rename to src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
index d379147..309db5d 100644
--- a/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -30,6 +30,7 @@
 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/plugin/war/WarDependenciesAnalysisTest.java b/src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java
index e7cce82..fd53d72 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java b/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java
index 02cb9aa..5cd2e5d 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
index 90a0835..e88644f 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java
index b9eb7bb..4232882 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@
 
 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/plugin/war/WarManifestMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
index 20a206a..c7faf7f 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@
 
 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/plugin/war/WarMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
index df4c69a..3dfa380 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -33,6 +33,7 @@
 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/plugin/war/WarOverlaysTest.java b/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
index 8a2e8ac..de7040c 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@
 
 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/plugin/war/WarZipTest.java b/src/test/java/org/apache/maven/plugins/war/WarZipTest.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/WarZipTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarZipTest.java
index 4407635..9abc54e 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarZipTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarZipTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,6 +25,8 @@
 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;