diff --git a/pom.xml b/pom.xml
index 59589e3d1..e807d70d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,9 +7,9 @@
     <version>70</version>
   </parent>
 
-  <artifactId>versions-maven-plugin</artifactId>
+  <artifactId>versions-parent</artifactId>
   <version>2.13.0-SNAPSHOT</version>
-  <packaging>maven-plugin</packaging>
+  <packaging>pom</packaging>
 
   <name>Versions Maven Plugin</name>
   <url>https://www.mojohaus.org/versions-maven-plugin/</url>
@@ -105,6 +105,12 @@
     <tag>HEAD</tag>
   </scm>
 
+  <modules>
+    <module>versions-maven-plugin</module>
+    <module>versions-api</module>
+    <module>versions-model</module>
+  </modules>
+
   <properties>
     <mojo.java.target>1.8</mojo.java.target>
     <maven.compiler.source>${mojo.java.target}</maven.compiler.source>
@@ -130,158 +136,6 @@
     </dependencies>
   </dependencyManagement>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-api</artifactId>
-      <version>3.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-impl</artifactId>
-      <version>3.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-common-artifact-filters</artifactId>
-      <version>3.3.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-      <version>${wagonVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-file</artifactId>
-      <version>${wagonVersion}</version>
-    </dependency>
-
-    <!-- Doxia -->
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-core</artifactId>
-      <version>${doxiaVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-sink-api</artifactId>
-      <version>${doxiaVersion}</version>
-    </dependency>
-
-    <!-- Doxia-sitetools -->
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-site-renderer</artifactId>
-      <version>${doxia-sitetoolsVersion}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>3.4.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-interactivity-api</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.woodstox</groupId>
-      <artifactId>woodstox-core</artifactId>
-      <version>6.3.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.12.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.maven.plugin-testing</groupId>
-      <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>3.3.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.hamcrest</groupId>
-          <artifactId>hamcrest-core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <version>2.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.7.36</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -308,193 +162,7 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-source</id>
-            <goals>
-              <!-- Generate the xpp3 reader code -->
-              <goal>xpp3-reader</goal>
-              <!-- Generate the xpp3 writer code -->
-              <goal>xpp3-writer</goal>
-              <!-- Generate the Java sources for the model itself -->
-              <goal>java</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>site-doc</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>xdoc</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/generated-site/xdoc/model</outputDirectory>
-            </configuration>
-          </execution>
-          <execution>
-            <id>site-xsd</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>xsd</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/generated-site/resources/xsd</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <models>
-            <model>src/main/mdo/rule.mdo</model>
-            <model>src/main/mdo/dependency-updates-report.mdo</model>
-            <model>src/main/mdo/plugin-updates-report.mdo</model>
-          </models>
-          <version>2.1.0</version>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-invoker-plugin</artifactId>
-        <configuration>
-          <projectsDirectory>src/it</projectsDirectory>
-          <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-          <settingsFile>src/it/settings.xml</settingsFile>
-          <showErrors>true</showErrors>
-          <streamLogs>true</streamLogs>
-          <!--
-            ! There seemed to be a problem with the indepance of the IT's
-            ! here. So we can't use more than one thread.
-            ! TODO: Dive more deeply into this problem.
-          -->
-          <parallelThreads>1</parallelThreads>
-          <pomIncludes>
-            <pomInclude>*/pom.xml</pomInclude>
-          </pomIncludes>
-          <pomExcludes>
-            <!--
-              ! This test is not really intended as part of regular integration test suite
-              ! as it highly depends on the minute conditions of the build cluster,
-              ! internet connection speed (since retrieval times are included in the timeout)
-              ! or individual machine where it's being tested.
-              ! Not deleting as it might be helpful with assessing performance measurements.
-            -->
-            <pomExclude>it-property-updates-report-002-slow/*</pomExclude>
-          </pomExcludes>
-          <postBuildHookScript>verify</postBuildHookScript>
-          <filterProperties>
-            <repository.proxy.url>${repository.proxy.url}</repository.proxy.url>
-          </filterProperties>
-          <mavenOpts>-Xmx256m</mavenOpts>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <!-- Exclude packages generated by Modello in JavaDocs -->
-          <excludePackageNames>
-            org.codehaus.mojo.versions.model,
-            org.codehaus.mojo.versions.model.io.xpp3
-            org.codehaus.mojo.versions.reporting.model,
-            org.codehaus.mojo.versions.reporting.model.io.xpp3,
-          </excludePackageNames>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <source>${mojo.java.target}</source>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-invoker-plugin</artifactId>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>report</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>${project.artifactId}</artifactId>
-        <version>${project.version}</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>dependency-updates-report</report>
-              <report>plugin-updates-report</report>
-              <report>property-updates-report</report>
-              <report>parent-updates-report</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <profiles>
-    <profile>
-      <!-- run integration tests
-          to use this profile:
-          or run integration tests: ./mvnw -Prun-its
-      -->
-      <id>run-its</id>
-      <build>
-        <defaultGoal>verify</defaultGoal>
-
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>mrm-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>start</goal>
-                  <goal>stop</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <propertyName>repository.proxy.url</propertyName>
-              <repositories>
-                <mockRepo>
-                  <source>src/it-repo</source>
-                </mockRepo>
-                <localRepo>
-                  <source>${project.build.directory}/local-repo</source>
-                </localRepo>
-                <proxyRepo />
-              </repositories>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>integration-test</id>
-                <goals>
-                  <goal>install</goal>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-                <configuration>
-                  <streamLogs>false</streamLogs>
-                  <debug>true</debug>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/src/main/java/org/codehaus/mojo/versions/LinkItem.java b/src/main/java/org/codehaus/mojo/versions/LinkItem.java
deleted file mode 100644
index 6f604dfc3..000000000
--- a/src/main/java/org/codehaus/mojo/versions/LinkItem.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.codehaus.mojo.versions;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * LinkItem represents information specified for a linked artifact version manged through a property.
- *
- * @author Stephen Connolly
- * @since 1.0-alpha-1
- */
-public class LinkItem
-{
-
-    // ------------------------------ FIELDS ------------------------------
-
-    /**
-     * Group Id of the Artifact.
-     *
-     * @parameter
-     * @required
-     * @since 1.0-alpha-1
-     */
-    private String groupId;
-
-    /**
-     * Artifact Id of the Artifact.
-     *
-     * @parameter
-     * @required
-     * @since 1.0-alpha-1
-     */
-    private String artifactId;
-
-    /**
-     * The property that defines the version of the artifact to use.
-     *
-     * @parameter
-     * @required
-     * @since 1.0-alpha-1
-     */
-    private String property;
-
-    /**
-     * Version specification to control artifact resolution.
-     *
-     * @parameter
-     * @since 1.0-alpha-1
-     */
-    private String version = null;
-
-    /**
-     * Override snapshot permisibility.
-     *
-     * @parameter
-     * @since 1.0-alpha-1
-     */
-    private Boolean allowSnapshots = null;
-
-    // --------------------------- CONSTRUCTORS ---------------------------
-
-    /**
-     * Constructs a new LinkItem.
-     *
-     * @since 1.0-alpha-1
-     */
-    public LinkItem()
-    {
-    }
-
-    // --------------------- GETTER / SETTER METHODS ---------------------
-
-    /**
-     * Getter for property 'allowSnapshots'.
-     *
-     * @return Value for property 'allowSnapshots'.
-     * @since 1.0-alpha-1
-     */
-    public Boolean getAllowSnapshots()
-    {
-        return allowSnapshots;
-    }
-
-    /**
-     * Setter for property 'allowSnapshots'.
-     *
-     * @param allowSnapshots Value to set for property 'allowSnapshots'.
-     * @since 1.0-alpha-1
-     */
-    public void setAllowSnapshots( Boolean allowSnapshots )
-    {
-        this.allowSnapshots = allowSnapshots;
-    }
-
-    /**
-     * Getter for property 'artifactId'.
-     *
-     * @return Value for property 'artifactId'.
-     * @since 1.0-alpha-1
-     */
-    public String getArtifactId()
-    {
-        return artifactId;
-    }
-
-    /**
-     * Setter for property 'artifactId'.
-     *
-     * @param artifactId Value to set for property 'artifactId'.
-     * @since 1.0-alpha-1
-     */
-    public void setArtifactId( String artifactId )
-    {
-        this.artifactId = artifactId;
-    }
-
-    /**
-     * Getter for property 'groupId'.
-     *
-     * @return Value for property 'groupId'.
-     * @since 1.0-alpha-1
-     */
-    public String getGroupId()
-    {
-        return groupId;
-    }
-
-    /**
-     * Setter for property 'groupId'.
-     *
-     * @param groupId Value to set for property 'groupId'.
-     * @since 1.0-alpha-1
-     */
-    public void setGroupId( String groupId )
-    {
-        this.groupId = groupId;
-    }
-
-    /**
-     * Getter for property 'property'.
-     *
-     * @return Value for property 'property'.
-     * @since 1.0-alpha-1
-     */
-    public String getProperty()
-    {
-        return property;
-    }
-
-    /**
-     * Setter for property 'property'.
-     *
-     * @param property Value to set for property 'property'.
-     * @since 1.0-alpha-1
-     */
-    public void setProperty( String property )
-    {
-        this.property = property;
-    }
-
-    /**
-     * Getter for property 'version'.
-     *
-     * @return Value for property 'version'.
-     * @since 1.0-alpha-1
-     */
-    public String getVersion()
-    {
-        return version;
-    }
-
-    /**
-     * Setter for property 'version'.
-     *
-     * @param version Value to set for property 'version'.
-     * @since 1.0-alpha-1
-     */
-    public void setVersion( String version )
-    {
-        this.version = version;
-    }
-
-    // ------------------------ CANONICAL METHODS ------------------------
-
-    /**
-     * {@inheritDoc}
-     *
-     * @since 1.0-alpha-1
-     */
-    public String toString()
-    {
-        StringBuilder buf = new StringBuilder( "${" );
-        buf.append( property );
-        buf.append( "} = " );
-        buf.append( groupId );
-        buf.append( ':' );
-        buf.append( artifactId );
-        if ( version != null )
-        {
-            buf.append( ':' );
-            buf.append( version );
-        }
-        return buf.toString();
-    }
-
-}
diff --git a/src/main/java/org/codehaus/mojo/versions/ordering/ReactorDepthComparator.java b/src/main/java/org/codehaus/mojo/versions/ordering/ReactorDepthComparator.java
deleted file mode 100644
index b9e0e7199..000000000
--- a/src/main/java/org/codehaus/mojo/versions/ordering/ReactorDepthComparator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.codehaus.mojo.versions.ordering;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.Comparator;
-import java.util.Map;
-
-import org.apache.maven.model.Model;
-import org.codehaus.mojo.versions.api.PomHelper;
-
-/**
- * Compares project paths relative to the base directory based on their depth in a reactor
- *
- * @author Stephen Connolly
- * @since 15-Sep-2010 14:54:42
- */
-public class ReactorDepthComparator
-    implements Comparator<String>
-{
-    private final Map<String, Model> reactor;
-
-    public ReactorDepthComparator( Map<String, Model> reactor )
-    {
-        this.reactor = reactor;
-    }
-
-    public int compare( String o1, String o2 )
-    {
-        final Model m1 = reactor.get( o1 );
-        final Model m2 = reactor.get( o2 );
-        final int d1 = PomHelper.getReactorParentCount( reactor, m1 );
-        final int d2 = PomHelper.getReactorParentCount( reactor, m2 );
-        if ( d1 < d2 )
-        {
-            return -1;
-        }
-        else if ( d1 > d2 )
-        {
-            return 1;
-        }
-        return PomHelper.getGAV( m1 ).compareTo( PomHelper.getGAV( m2 ) );
-    }
-}
diff --git a/versions-api/pom.xml b/versions-api/pom.xml
new file mode 100644
index 000000000..e260d0fb3
--- /dev/null
+++ b/versions-api/pom.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>versions-parent</artifactId>
+        <version>2.13.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>versions-api</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>versions-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>${mavenVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${mavenVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-compat</artifactId>
+            <version>${mavenVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <version>${mavenVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>${mavenVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-settings</artifactId>
+            <version>${mavenVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.reporting</groupId>
+            <artifactId>maven-reporting-api</artifactId>
+            <version>3.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.reporting</groupId>
+            <artifactId>maven-reporting-impl</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.shared</groupId>
+            <artifactId>maven-common-artifact-filters</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-provider-api</artifactId>
+            <version>${wagonVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.wagon</groupId>
+            <artifactId>wagon-file</artifactId>
+            <version>${wagonVersion}</version>
+        </dependency>
+
+        <!-- Doxia -->
+        <dependency>
+            <groupId>org.apache.maven.doxia</groupId>
+            <artifactId>doxia-core</artifactId>
+            <version>${doxiaVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.doxia</groupId>
+            <artifactId>doxia-sink-api</artifactId>
+            <version>${doxiaVersion}</version>
+        </dependency>
+
+        <!-- Doxia-sitetools -->
+        <dependency>
+            <groupId>org.apache.maven.doxia</groupId>
+            <artifactId>doxia-site-renderer</artifactId>
+            <version>${doxia-sitetoolsVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-interactivity-api</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.woodstox</groupId>
+            <artifactId>woodstox-core</artifactId>
+            <version>6.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven.plugin-testing</groupId>
+            <artifactId>maven-plugin-testing-harness</artifactId>
+            <version>3.3.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <version>4.8.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest</artifactId>
+            <version>2.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.36</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/src/main/java/org/codehaus/mojo/versions/api/AbstractVersionDetails.java b/versions-api/src/main/java/org/codehaus/mojo/versions/api/AbstractVersionDetails.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/api/AbstractVersionDetails.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/api/AbstractVersionDetails.java
diff --git a/src/main/java/org/codehaus/mojo/versions/api/ArtifactAssociation.java b/versions-api/src/main/java/org/codehaus/mojo/versions/api/ArtifactAssociation.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/api/ArtifactAssociation.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/api/ArtifactAssociation.java
diff --git a/src/main/java/org/codehaus/mojo/versions/api/ArtifactVersions.java b/versions-api/src/main/java/org/codehaus/mojo/versions/api/ArtifactVersions.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/api/ArtifactVersions.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/api/ArtifactVersions.java
diff --git a/src/main/java/org/codehaus/mojo/versions/PluginUpdatesDetails.java b/versions-api/src/main/java/org/codehaus/mojo/versions/api/PluginUpdatesDetails.java
similarity index 96%
rename from src/main/java/org/codehaus/mojo/versions/PluginUpdatesDetails.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/api/PluginUpdatesDetails.java
index 84842b57e..6376f5c2d 100644
--- a/src/main/java/org/codehaus/mojo/versions/PluginUpdatesDetails.java
+++ b/versions-api/src/main/java/org/codehaus/mojo/versions/api/PluginUpdatesDetails.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.versions;
+package org.codehaus.mojo.versions.api;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,6 @@
 
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.model.Dependency;
-import org.codehaus.mojo.versions.api.ArtifactVersions;
 
 import static java.util.Optional.empty;
 
diff --git a/src/main/java/org/codehaus/mojo/versions/Property.java b/versions-api/src/main/java/org/codehaus/mojo/versions/api/Property.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/Property.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/api/Property.java
index d270f38cc..09b5f5612 100644
--- a/src/main/java/org/codehaus/mojo/versions/Property.java
+++ b/versions-api/src/main/java/org/codehaus/mojo/versions/api/Property.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.versions;
+package org.codehaus.mojo.versions.api;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/codehaus/mojo/versions/api/PropertyVersions.java b/versions-api/src/main/java/org/codehaus/mojo/versions/api/PropertyVersions.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/api/PropertyVersions.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/api/PropertyVersions.java
index 9b25e6046..7bdcebf7b 100644
--- a/src/main/java/org/codehaus/mojo/versions/api/PropertyVersions.java
+++ b/versions-api/src/main/java/org/codehaus/mojo/versions/api/PropertyVersions.java
@@ -40,7 +40,6 @@
 import org.apache.maven.artifact.versioning.Restriction;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.mojo.versions.Property;
 import org.codehaus.mojo.versions.ordering.BoundArtifactVersion;
 import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
 import org.codehaus.mojo.versions.ordering.VersionComparator;
@@ -74,7 +73,8 @@ public class PropertyVersions
 
     private final PropertyVersions.PropertyVersionComparator comparator;
 
-    PropertyVersions( String profileId, String name, VersionsHelper helper, Set<ArtifactAssociation> associations )
+    public PropertyVersions( String profileId, String name, VersionsHelper helper,
+                             Set<ArtifactAssociation> associations )
         throws ArtifactMetadataRetrievalException
     {
         this.profileId = profileId;
diff --git a/src/main/java/org/codehaus/mojo/versions/api/ReportRenderer.java b/versions-api/src/main/java/org/codehaus/mojo/versions/api/ReportRenderer.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/api/ReportRenderer.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/api/ReportRenderer.java
diff --git a/src/main/java/org/codehaus/mojo/versions/api/Segment.java b/versions-api/src/main/java/org/codehaus/mojo/versions/api/Segment.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/api/Segment.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/api/Segment.java
diff --git a/src/main/java/org/codehaus/mojo/versions/api/VersionDetails.java b/versions-api/src/main/java/org/codehaus/mojo/versions/api/VersionDetails.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/api/VersionDetails.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/api/VersionDetails.java
diff --git a/src/main/java/org/codehaus/mojo/versions/api/VersionsHelper.java b/versions-api/src/main/java/org/codehaus/mojo/versions/api/VersionsHelper.java
similarity index 94%
rename from src/main/java/org/codehaus/mojo/versions/api/VersionsHelper.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/api/VersionsHelper.java
index 3d5777967..c100c20d0 100644
--- a/src/main/java/org/codehaus/mojo/versions/api/VersionsHelper.java
+++ b/versions-api/src/main/java/org/codehaus/mojo/versions/api/VersionsHelper.java
@@ -34,8 +34,6 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.mojo.versions.PluginUpdatesDetails;
-import org.codehaus.mojo.versions.Property;
 import org.codehaus.mojo.versions.ordering.VersionComparator;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
 
@@ -188,7 +186,7 @@ ArtifactVersions lookupDependencyUpdates( Dependency dependency, boolean usePlug
      *
      * @param plugins The set of {@link Plugin} instances to look up.
      * @param allowSnapshots Include snapshots in the list of updates.
-     * @return A map, keyed by plugin, with values of type {@link org.codehaus.mojo.versions.PluginUpdatesDetails}.
+     * @return A map, keyed by plugin, with values of type {@link PluginUpdatesDetails}.
      * @throws ArtifactMetadataRetrievalException When things go wrong.
      * @since 1.0-beta-1
      */
@@ -217,8 +215,8 @@ PluginUpdatesDetails lookupPluginUpdates( Plugin plugin, boolean allowSnapshots
     ExpressionEvaluator getExpressionEvaluator( MavenProject project );
 
     /**
-     * Returns a map of {@link org.codehaus.mojo.versions.api.PropertyVersions} values keyed by
-     * {@link org.codehaus.mojo.versions.Property} instances consisting of the properties defined in the project which
+     * Returns a map of {@link PropertyVersions} values keyed by
+     * {@link Property} instances consisting of the properties defined in the project which
      * are associated with version information.
      *
      * @param project The project.
@@ -226,8 +224,8 @@ PluginUpdatesDetails lookupPluginUpdates( Plugin plugin, boolean allowSnapshots
      * @param includeProperties A comma separated list of properties to include.
      * @param excludeProperties A comma separated list of properties to exclude.
      * @param autoLinkItems whether to automatically infer associations
-     * @return a map of {@link org.codehaus.mojo.versions.api.PropertyVersions} values keyed by
-     *         {@link org.codehaus.mojo.versions.Property} instances.
+     * @return a map of {@link PropertyVersions} values keyed by
+     *         {@link Property} instances.
      * @throws MojoExecutionException if something goes wrong.
      */
     Map<Property, PropertyVersions> getVersionPropertiesMap( MavenProject project, Property[] propertyDefinitions,
diff --git a/src/main/java/org/codehaus/mojo/versions/ordering/AbstractVersionComparator.java b/versions-api/src/main/java/org/codehaus/mojo/versions/ordering/AbstractVersionComparator.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/ordering/AbstractVersionComparator.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/ordering/AbstractVersionComparator.java
diff --git a/src/main/java/org/codehaus/mojo/versions/ordering/BoundArtifactVersion.java b/versions-api/src/main/java/org/codehaus/mojo/versions/ordering/BoundArtifactVersion.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/ordering/BoundArtifactVersion.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/ordering/BoundArtifactVersion.java
diff --git a/src/main/java/org/codehaus/mojo/versions/ordering/ComparableVersion.java b/versions-api/src/main/java/org/codehaus/mojo/versions/ordering/ComparableVersion.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/ordering/ComparableVersion.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/ordering/ComparableVersion.java
diff --git a/src/main/java/org/codehaus/mojo/versions/ordering/InvalidSegmentException.java b/versions-api/src/main/java/org/codehaus/mojo/versions/ordering/InvalidSegmentException.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/ordering/InvalidSegmentException.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/ordering/InvalidSegmentException.java
diff --git a/src/main/java/org/codehaus/mojo/versions/ordering/MavenVersionComparator.java b/versions-api/src/main/java/org/codehaus/mojo/versions/ordering/MavenVersionComparator.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/ordering/MavenVersionComparator.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/ordering/MavenVersionComparator.java
diff --git a/src/main/java/org/codehaus/mojo/versions/ordering/MercuryVersionComparator.java b/versions-api/src/main/java/org/codehaus/mojo/versions/ordering/MercuryVersionComparator.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/ordering/MercuryVersionComparator.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/ordering/MercuryVersionComparator.java
diff --git a/src/main/java/org/codehaus/mojo/versions/ordering/NumericVersionComparator.java b/versions-api/src/main/java/org/codehaus/mojo/versions/ordering/NumericVersionComparator.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/ordering/NumericVersionComparator.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/ordering/NumericVersionComparator.java
diff --git a/src/main/java/org/codehaus/mojo/versions/ordering/VersionComparator.java b/versions-api/src/main/java/org/codehaus/mojo/versions/ordering/VersionComparator.java
similarity index 94%
rename from src/main/java/org/codehaus/mojo/versions/ordering/VersionComparator.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/ordering/VersionComparator.java
index 50edfe7e8..0956b5c11 100644
--- a/src/main/java/org/codehaus/mojo/versions/ordering/VersionComparator.java
+++ b/versions-api/src/main/java/org/codehaus/mojo/versions/ordering/VersionComparator.java
@@ -26,9 +26,6 @@
 import org.apache.maven.artifact.versioning.Restriction;
 import org.codehaus.mojo.versions.api.Segment;
 
-import static org.codehaus.mojo.versions.api.Segment.MAJOR;
-import static org.codehaus.mojo.versions.api.Segment.SUBINCREMENTAL;
-
 /**
  * A rule for comparing and manipulating versions.
  */
@@ -73,10 +70,10 @@ public interface VersionComparator
     default Restriction restrictionFor( ArtifactVersion currentVersion, Optional<Segment> scope )
             throws InvalidSegmentException
     {
-        ArtifactVersion nextVersion = scope.isPresent() && scope.get().isMajorTo( SUBINCREMENTAL )
+        ArtifactVersion nextVersion = scope.isPresent() && scope.get().isMajorTo( Segment.SUBINCREMENTAL )
                 ? incrementSegment( currentVersion, scope.get() )
                 : currentVersion;
-        return new Restriction( nextVersion, nextVersion != currentVersion, scope.filter( MAJOR::isMajorTo )
+        return new Restriction( nextVersion, nextVersion != currentVersion, scope.filter( Segment.MAJOR::isMajorTo )
                 .map( s -> (ArtifactVersion) new BoundArtifactVersion( currentVersion, s ) ).orElse( null ),
                 false );
     }
diff --git a/src/main/java/org/codehaus/mojo/versions/ordering/VersionComparators.java b/versions-api/src/main/java/org/codehaus/mojo/versions/ordering/VersionComparators.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/ordering/VersionComparators.java
rename to versions-api/src/main/java/org/codehaus/mojo/versions/ordering/VersionComparators.java
diff --git a/src/test/java/org/codehaus/mojo/versions/api/ArtifactVersionsTest.java b/versions-api/src/test/java/org/codehaus/mojo/versions/api/ArtifactVersionsTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/api/ArtifactVersionsTest.java
rename to versions-api/src/test/java/org/codehaus/mojo/versions/api/ArtifactVersionsTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/ordering/MavenVersionComparatorTest.java b/versions-api/src/test/java/org/codehaus/mojo/versions/ordering/MavenVersionComparatorTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/ordering/MavenVersionComparatorTest.java
rename to versions-api/src/test/java/org/codehaus/mojo/versions/ordering/MavenVersionComparatorTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/ordering/MercuryVersionComparatorTest.java b/versions-api/src/test/java/org/codehaus/mojo/versions/ordering/MercuryVersionComparatorTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/ordering/MercuryVersionComparatorTest.java
rename to versions-api/src/test/java/org/codehaus/mojo/versions/ordering/MercuryVersionComparatorTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/ordering/NumericVersionComparatorTest.java b/versions-api/src/test/java/org/codehaus/mojo/versions/ordering/NumericVersionComparatorTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/ordering/NumericVersionComparatorTest.java
rename to versions-api/src/test/java/org/codehaus/mojo/versions/ordering/NumericVersionComparatorTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/ordering/VersionComparatorsTest.java b/versions-api/src/test/java/org/codehaus/mojo/versions/ordering/VersionComparatorsTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/ordering/VersionComparatorsTest.java
rename to versions-api/src/test/java/org/codehaus/mojo/versions/ordering/VersionComparatorsTest.java
diff --git a/versions-maven-plugin/pom.xml b/versions-maven-plugin/pom.xml
new file mode 100644
index 000000000..4171b5431
--- /dev/null
+++ b/versions-maven-plugin/pom.xml
@@ -0,0 +1,305 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.codehaus.mojo</groupId>
+    <artifactId>versions-parent</artifactId>
+    <version>2.13.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>versions-maven-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.mojo</groupId>
+      <artifactId>versions-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.mojo</groupId>
+      <artifactId>versions-model</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+      <version>3.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-impl</artifactId>
+      <version>3.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-common-artifact-filters</artifactId>
+      <version>3.3.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-provider-api</artifactId>
+      <version>${wagonVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-file</artifactId>
+      <version>${wagonVersion}</version>
+    </dependency>
+
+    <!-- Doxia -->
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-core</artifactId>
+      <version>${doxiaVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-sink-api</artifactId>
+      <version>${doxiaVersion}</version>
+    </dependency>
+
+    <!-- Doxia-sitetools -->
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-site-renderer</artifactId>
+      <version>${doxia-sitetoolsVersion}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-interactivity-api</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.woodstox</groupId>
+      <artifactId>woodstox-core</artifactId>
+      <version>6.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.12.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven.plugin-testing</groupId>
+      <artifactId>maven-plugin-testing-harness</artifactId>
+      <version>3.3.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-inline</artifactId>
+      <version>4.8.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.7.36</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <configuration>
+          <projectsDirectory>src/it</projectsDirectory>
+          <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+          <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+          <settingsFile>src/it/settings.xml</settingsFile>
+          <showErrors>true</showErrors>
+          <streamLogs>true</streamLogs>
+          <!--
+            ! There seemed to be a problem with the indepance of the IT's
+            ! here. So we can't use more than one thread.
+            ! TODO: Dive more deeply into this problem.
+          -->
+          <parallelThreads>1</parallelThreads>
+          <pomIncludes>
+            <pomInclude>*/pom.xml</pomInclude>
+          </pomIncludes>
+          <pomExcludes>
+            <!--
+              ! This test is not really intended as part of regular integration test suite
+              ! as it highly depends on the minute conditions of the build cluster,
+              ! internet connection speed (since retrieval times are included in the timeout)
+              ! or individual machine where it's being tested.
+              ! Not deleting as it might be helpful with assessing performance measurements.
+            -->
+            <pomExclude>it-property-updates-report-002-slow/*</pomExclude>
+          </pomExcludes>
+          <postBuildHookScript>verify</postBuildHookScript>
+          <filterProperties>
+            <repository.proxy.url>${repository.proxy.url}</repository.proxy.url>
+          </filterProperties>
+          <mavenOpts>-Xmx256m</mavenOpts>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <source>${mojo.java.target}</source>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>dependency-updates-report</report>
+              <report>plugin-updates-report</report>
+              <report>property-updates-report</report>
+              <report>parent-updates-report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <profiles>
+    <profile>
+      <!-- run integration tests
+          to use this profile:
+          or run integration tests: ./mvnw -Prun-its
+      -->
+      <id>run-its</id>
+      <build>
+        <defaultGoal>verify</defaultGoal>
+
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>mrm-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>start</goal>
+                  <goal>stop</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <propertyName>repository.proxy.url</propertyName>
+              <repositories>
+                <mockRepo>
+                  <source>src/it-repo</source>
+                </mockRepo>
+                <localRepo>
+                  <source>${project.build.directory}/local-repo</source>
+                </localRepo>
+                <proxyRepo />
+              </repositories>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-invoker-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>integration-test</id>
+                <goals>
+                  <goal>install</goal>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <streamLogs>false</streamLogs>
+                  <debug>true</debug>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/src/changes/changes.xml b/versions-maven-plugin/src/changes/changes.xml
similarity index 100%
rename from src/changes/changes.xml
rename to versions-maven-plugin/src/changes/changes.xml
diff --git a/src/it-repo/dummy-api-1.0.1.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.0.1.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.0.1.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.0.1.pom
diff --git a/src/it-repo/dummy-api-1.0.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.0.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.0.pom
diff --git a/src/it-repo/dummy-api-1.1-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.1-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.1-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.1-SNAPSHOT.pom
diff --git a/src/it-repo/dummy-api-1.1.0-2.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.1.0-2.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.1.0-2.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.1.0-2.pom
diff --git a/src/it-repo/dummy-api-1.1.1-2.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.1.1-2.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.1.1-2.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.1.1-2.pom
diff --git a/src/it-repo/dummy-api-1.1.1.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.1.1.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.1.1.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.1.1.pom
diff --git a/src/it-repo/dummy-api-1.1.2-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.1.2-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.1.2-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.1.2-SNAPSHOT.pom
diff --git a/src/it-repo/dummy-api-1.1.2.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.1.2.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.1.2.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.1.2.pom
diff --git a/src/it-repo/dummy-api-1.1.3.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.1.3.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.1.3.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.1.3.pom
diff --git a/src/it-repo/dummy-api-1.1.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.1.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.1.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.1.pom
diff --git a/src/it-repo/dummy-api-1.2.1.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.2.1.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.2.1.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.2.1.pom
diff --git a/src/it-repo/dummy-api-1.2.2.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.2.2.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.2.2.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.2.2.pom
diff --git a/src/it-repo/dummy-api-1.2.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.2.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.2.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.2.pom
diff --git a/src/it-repo/dummy-api-1.3.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.3.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.3.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.3.pom
diff --git a/src/it-repo/dummy-api-1.9.1-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/dummy-api-1.9.1-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/dummy-api-1.9.1-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-1.9.1-SNAPSHOT.pom
diff --git a/src/it-repo/dummy-api-2.0.pom b/versions-maven-plugin/src/it-repo/dummy-api-2.0.pom
similarity index 100%
rename from src/it-repo/dummy-api-2.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-2.0.pom
diff --git a/src/it-repo/dummy-api-2.1.1-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/dummy-api-2.1.1-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/dummy-api-2.1.1-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-2.1.1-SNAPSHOT.pom
diff --git a/src/it-repo/dummy-api-2.1.pom b/versions-maven-plugin/src/it-repo/dummy-api-2.1.pom
similarity index 100%
rename from src/it-repo/dummy-api-2.1.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-2.1.pom
diff --git a/src/it-repo/dummy-api-3.0.pom b/versions-maven-plugin/src/it-repo/dummy-api-3.0.pom
similarity index 100%
rename from src/it-repo/dummy-api-3.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-3.0.pom
diff --git a/src/it-repo/dummy-api-3.1.1-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/dummy-api-3.1.1-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/dummy-api-3.1.1-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-3.1.1-SNAPSHOT.pom
diff --git a/src/it-repo/dummy-api-3.1.5-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/dummy-api-3.1.5-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/dummy-api-3.1.5-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-3.1.5-SNAPSHOT.pom
diff --git a/src/it-repo/dummy-api-3.4.0-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/dummy-api-3.4.0-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/dummy-api-3.4.0-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-3.4.0-SNAPSHOT.pom
diff --git a/src/it-repo/dummy-api-impl-bom-pom-1.0.pom b/versions-maven-plugin/src/it-repo/dummy-api-impl-bom-pom-1.0.pom
similarity index 100%
rename from src/it-repo/dummy-api-impl-bom-pom-1.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-impl-bom-pom-1.0.pom
diff --git a/src/it-repo/dummy-api-impl-bom-pom-2.0.pom b/versions-maven-plugin/src/it-repo/dummy-api-impl-bom-pom-2.0.pom
similarity index 100%
rename from src/it-repo/dummy-api-impl-bom-pom-2.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-api-impl-bom-pom-2.0.pom
diff --git a/src/it-repo/dummy-bom-maven-mismatch-1.0.pom b/versions-maven-plugin/src/it-repo/dummy-bom-maven-mismatch-1.0.pom
similarity index 100%
rename from src/it-repo/dummy-bom-maven-mismatch-1.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-bom-maven-mismatch-1.0.pom
diff --git a/src/it-repo/dummy-bom-pom-1.0.pom b/versions-maven-plugin/src/it-repo/dummy-bom-pom-1.0.pom
similarity index 100%
rename from src/it-repo/dummy-bom-pom-1.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-bom-pom-1.0.pom
diff --git a/src/it-repo/dummy-impl-1.0.pom b/versions-maven-plugin/src/it-repo/dummy-impl-1.0.pom
similarity index 100%
rename from src/it-repo/dummy-impl-1.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-impl-1.0.pom
diff --git a/src/it-repo/dummy-impl-1.1.pom b/versions-maven-plugin/src/it-repo/dummy-impl-1.1.pom
similarity index 100%
rename from src/it-repo/dummy-impl-1.1.pom
rename to versions-maven-plugin/src/it-repo/dummy-impl-1.1.pom
diff --git a/src/it-repo/dummy-impl-1.2.pom b/versions-maven-plugin/src/it-repo/dummy-impl-1.2.pom
similarity index 100%
rename from src/it-repo/dummy-impl-1.2.pom
rename to versions-maven-plugin/src/it-repo/dummy-impl-1.2.pom
diff --git a/src/it-repo/dummy-impl-1.3.pom b/versions-maven-plugin/src/it-repo/dummy-impl-1.3.pom
similarity index 100%
rename from src/it-repo/dummy-impl-1.3.pom
rename to versions-maven-plugin/src/it-repo/dummy-impl-1.3.pom
diff --git a/src/it-repo/dummy-impl-1.4.pom b/versions-maven-plugin/src/it-repo/dummy-impl-1.4.pom
similarity index 100%
rename from src/it-repo/dummy-impl-1.4.pom
rename to versions-maven-plugin/src/it-repo/dummy-impl-1.4.pom
diff --git a/src/it-repo/dummy-impl-2.0.pom b/versions-maven-plugin/src/it-repo/dummy-impl-2.0.pom
similarity index 100%
rename from src/it-repo/dummy-impl-2.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-impl-2.0.pom
diff --git a/src/it-repo/dummy-impl-2.1.pom b/versions-maven-plugin/src/it-repo/dummy-impl-2.1.pom
similarity index 100%
rename from src/it-repo/dummy-impl-2.1.pom
rename to versions-maven-plugin/src/it-repo/dummy-impl-2.1.pom
diff --git a/src/it-repo/dummy-impl-2.2.pom b/versions-maven-plugin/src/it-repo/dummy-impl-2.2.pom
similarity index 100%
rename from src/it-repo/dummy-impl-2.2.pom
rename to versions-maven-plugin/src/it-repo/dummy-impl-2.2.pom
diff --git a/src/it-repo/dummy-maven-plugin-1.0.pom b/versions-maven-plugin/src/it-repo/dummy-maven-plugin-1.0.pom
similarity index 100%
rename from src/it-repo/dummy-maven-plugin-1.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-maven-plugin-1.0.pom
diff --git a/src/it-repo/dummy-maven-plugin-2.0.pom b/versions-maven-plugin/src/it-repo/dummy-maven-plugin-2.0.pom
similarity index 100%
rename from src/it-repo/dummy-maven-plugin-2.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-maven-plugin-2.0.pom
diff --git a/src/it-repo/dummy-maven-plugin-2.1.pom b/versions-maven-plugin/src/it-repo/dummy-maven-plugin-2.1.pom
similarity index 100%
rename from src/it-repo/dummy-maven-plugin-2.1.pom
rename to versions-maven-plugin/src/it-repo/dummy-maven-plugin-2.1.pom
diff --git a/src/it-repo/dummy-maven-plugin-3.0.pom b/versions-maven-plugin/src/it-repo/dummy-maven-plugin-3.0.pom
similarity index 100%
rename from src/it-repo/dummy-maven-plugin-3.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-maven-plugin-3.0.pom
diff --git a/src/it-repo/dummy-maven-plugin-3.1.pom b/versions-maven-plugin/src/it-repo/dummy-maven-plugin-3.1.pom
similarity index 100%
rename from src/it-repo/dummy-maven-plugin-3.1.pom
rename to versions-maven-plugin/src/it-repo/dummy-maven-plugin-3.1.pom
diff --git a/src/it-repo/dummy-parent-1.0.pom b/versions-maven-plugin/src/it-repo/dummy-parent-1.0.pom
similarity index 100%
rename from src/it-repo/dummy-parent-1.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent-1.0.pom
diff --git a/src/it-repo/dummy-parent-2.0.pom b/versions-maven-plugin/src/it-repo/dummy-parent-2.0.pom
similarity index 100%
rename from src/it-repo/dummy-parent-2.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent-2.0.pom
diff --git a/src/it-repo/dummy-parent-3.0.pom b/versions-maven-plugin/src/it-repo/dummy-parent-3.0.pom
similarity index 100%
rename from src/it-repo/dummy-parent-3.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent-3.0.pom
diff --git a/src/it-repo/dummy-parent-issue-582-1.0.pom b/versions-maven-plugin/src/it-repo/dummy-parent-issue-582-1.0.pom
similarity index 100%
rename from src/it-repo/dummy-parent-issue-582-1.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent-issue-582-1.0.pom
diff --git a/src/it-repo/dummy-parent2-1.0.pom b/versions-maven-plugin/src/it-repo/dummy-parent2-1.0.pom
similarity index 100%
rename from src/it-repo/dummy-parent2-1.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent2-1.0.pom
diff --git a/src/it-repo/dummy-parent2-2.0.pom b/versions-maven-plugin/src/it-repo/dummy-parent2-2.0.pom
similarity index 100%
rename from src/it-repo/dummy-parent2-2.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent2-2.0.pom
diff --git a/src/it-repo/dummy-parent2-3.0-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/dummy-parent2-3.0-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/dummy-parent2-3.0-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent2-3.0-SNAPSHOT.pom
diff --git a/src/it-repo/dummy-parent2-3.0-alpha-1.pom b/versions-maven-plugin/src/it-repo/dummy-parent2-3.0-alpha-1.pom
similarity index 100%
rename from src/it-repo/dummy-parent2-3.0-alpha-1.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent2-3.0-alpha-1.pom
diff --git a/src/it-repo/dummy-parent2-3.0-beta-1.pom b/versions-maven-plugin/src/it-repo/dummy-parent2-3.0-beta-1.pom
similarity index 100%
rename from src/it-repo/dummy-parent2-3.0-beta-1.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent2-3.0-beta-1.pom
diff --git a/src/it-repo/dummy-parent2-3.0-rc-1.pom b/versions-maven-plugin/src/it-repo/dummy-parent2-3.0-rc-1.pom
similarity index 100%
rename from src/it-repo/dummy-parent2-3.0-rc-1.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent2-3.0-rc-1.pom
diff --git a/src/it-repo/dummy-parent2-3.0.pom b/versions-maven-plugin/src/it-repo/dummy-parent2-3.0.pom
similarity index 100%
rename from src/it-repo/dummy-parent2-3.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent2-3.0.pom
diff --git a/src/it-repo/dummy-parent2-3.1.pom b/versions-maven-plugin/src/it-repo/dummy-parent2-3.1.pom
similarity index 100%
rename from src/it-repo/dummy-parent2-3.1.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent2-3.1.pom
diff --git a/src/it-repo/dummy-parent3-1.0.0-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/dummy-parent3-1.0.0-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/dummy-parent3-1.0.0-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent3-1.0.0-SNAPSHOT.pom
diff --git a/src/it-repo/dummy-parent3-1.0.0.pom b/versions-maven-plugin/src/it-repo/dummy-parent3-1.0.0.pom
similarity index 100%
rename from src/it-repo/dummy-parent3-1.0.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent3-1.0.0.pom
diff --git a/src/it-repo/dummy-parent4-70.pom b/versions-maven-plugin/src/it-repo/dummy-parent4-70.pom
similarity index 100%
rename from src/it-repo/dummy-parent4-70.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent4-70.pom
diff --git a/src/it-repo/dummy-parent4-71-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/dummy-parent4-71-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/dummy-parent4-71-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent4-71-SNAPSHOT.pom
diff --git a/src/it-repo/dummy-parent5-1.0.0.pom b/versions-maven-plugin/src/it-repo/dummy-parent5-1.0.0.pom
similarity index 100%
rename from src/it-repo/dummy-parent5-1.0.0.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent5-1.0.0.pom
diff --git a/src/it-repo/dummy-parent5-2.0.0-rc1.pom b/versions-maven-plugin/src/it-repo/dummy-parent5-2.0.0-rc1.pom
similarity index 100%
rename from src/it-repo/dummy-parent5-2.0.0-rc1.pom
rename to versions-maven-plugin/src/it-repo/dummy-parent5-2.0.0-rc1.pom
diff --git a/src/it-repo/issue-114-artifact-1.0.jar b/versions-maven-plugin/src/it-repo/issue-114-artifact-1.0.jar
similarity index 100%
rename from src/it-repo/issue-114-artifact-1.0.jar
rename to versions-maven-plugin/src/it-repo/issue-114-artifact-1.0.jar
diff --git a/src/it-repo/issue-114-artifact-1.0.pom b/versions-maven-plugin/src/it-repo/issue-114-artifact-1.0.pom
similarity index 100%
rename from src/it-repo/issue-114-artifact-1.0.pom
rename to versions-maven-plugin/src/it-repo/issue-114-artifact-1.0.pom
diff --git a/src/it-repo/issue-114-artifact-1.1.jar b/versions-maven-plugin/src/it-repo/issue-114-artifact-1.1.jar
similarity index 100%
rename from src/it-repo/issue-114-artifact-1.1.jar
rename to versions-maven-plugin/src/it-repo/issue-114-artifact-1.1.jar
diff --git a/src/it-repo/issue-114-artifact-1.1.pom b/versions-maven-plugin/src/it-repo/issue-114-artifact-1.1.pom
similarity index 100%
rename from src/it-repo/issue-114-artifact-1.1.pom
rename to versions-maven-plugin/src/it-repo/issue-114-artifact-1.1.pom
diff --git a/src/it-repo/issue-114-depmgmt-1.0.pom b/versions-maven-plugin/src/it-repo/issue-114-depmgmt-1.0.pom
similarity index 100%
rename from src/it-repo/issue-114-depmgmt-1.0.pom
rename to versions-maven-plugin/src/it-repo/issue-114-depmgmt-1.0.pom
diff --git a/src/it-repo/latest-versions-api-2.0.11.pom b/versions-maven-plugin/src/it-repo/latest-versions-api-2.0.11.pom
similarity index 100%
rename from src/it-repo/latest-versions-api-2.0.11.pom
rename to versions-maven-plugin/src/it-repo/latest-versions-api-2.0.11.pom
diff --git a/src/it-repo/latest-versions-api-2.0.8.pom b/versions-maven-plugin/src/it-repo/latest-versions-api-2.0.8.pom
similarity index 100%
rename from src/it-repo/latest-versions-api-2.0.8.pom
rename to versions-maven-plugin/src/it-repo/latest-versions-api-2.0.8.pom
diff --git a/src/it-repo/latest-versions-api-2.1.0-M1.pom b/versions-maven-plugin/src/it-repo/latest-versions-api-2.1.0-M1.pom
similarity index 100%
rename from src/it-repo/latest-versions-api-2.1.0-M1.pom
rename to versions-maven-plugin/src/it-repo/latest-versions-api-2.1.0-M1.pom
diff --git a/src/it-repo/latest-versions-api-2.2.1.pom b/versions-maven-plugin/src/it-repo/latest-versions-api-2.2.1.pom
similarity index 100%
rename from src/it-repo/latest-versions-api-2.2.1.pom
rename to versions-maven-plugin/src/it-repo/latest-versions-api-2.2.1.pom
diff --git a/src/it-repo/latest-versions-api-3.0-beta-3.pom b/versions-maven-plugin/src/it-repo/latest-versions-api-3.0-beta-3.pom
similarity index 100%
rename from src/it-repo/latest-versions-api-3.0-beta-3.pom
rename to versions-maven-plugin/src/it-repo/latest-versions-api-3.0-beta-3.pom
diff --git a/src/it-repo/latest-versions-api-3.0.pom b/versions-maven-plugin/src/it-repo/latest-versions-api-3.0.pom
similarity index 100%
rename from src/it-repo/latest-versions-api-3.0.pom
rename to versions-maven-plugin/src/it-repo/latest-versions-api-3.0.pom
diff --git a/src/it-repo/latest-versions-api-3.1.0.pom b/versions-maven-plugin/src/it-repo/latest-versions-api-3.1.0.pom
similarity index 100%
rename from src/it-repo/latest-versions-api-3.1.0.pom
rename to versions-maven-plugin/src/it-repo/latest-versions-api-3.1.0.pom
diff --git a/src/it-repo/latest-versions-api-3.3.0.pom b/versions-maven-plugin/src/it-repo/latest-versions-api-3.3.0.pom
similarity index 100%
rename from src/it-repo/latest-versions-api-3.3.0.pom
rename to versions-maven-plugin/src/it-repo/latest-versions-api-3.3.0.pom
diff --git a/src/it-repo/module-a1-1.0.pom b/versions-maven-plugin/src/it-repo/module-a1-1.0.pom
similarity index 100%
rename from src/it-repo/module-a1-1.0.pom
rename to versions-maven-plugin/src/it-repo/module-a1-1.0.pom
diff --git a/src/it-repo/test/bigversion/dummy-lib-1.1.1.1.jar b/versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-1.1.1.1.jar
similarity index 100%
rename from src/it-repo/test/bigversion/dummy-lib-1.1.1.1.jar
rename to versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-1.1.1.1.jar
diff --git a/src/it-repo/test/bigversion/dummy-lib-1.1.1.1.pom b/versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-1.1.1.1.pom
similarity index 100%
rename from src/it-repo/test/bigversion/dummy-lib-1.1.1.1.pom
rename to versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-1.1.1.1.pom
diff --git a/src/it-repo/test/bigversion/dummy-lib-2.0.0.0.jar b/versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-2.0.0.0.jar
similarity index 100%
rename from src/it-repo/test/bigversion/dummy-lib-2.0.0.0.jar
rename to versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-2.0.0.0.jar
diff --git a/src/it-repo/test/bigversion/dummy-lib-2.0.0.0.pom b/versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-2.0.0.0.pom
similarity index 100%
rename from src/it-repo/test/bigversion/dummy-lib-2.0.0.0.pom
rename to versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-2.0.0.0.pom
diff --git a/src/it-repo/test/bigversion/dummy-lib-2.0.10.0.jar b/versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-2.0.10.0.jar
similarity index 100%
rename from src/it-repo/test/bigversion/dummy-lib-2.0.10.0.jar
rename to versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-2.0.10.0.jar
diff --git a/src/it-repo/test/bigversion/dummy-lib-2.0.10.0.pom b/versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-2.0.10.0.pom
similarity index 100%
rename from src/it-repo/test/bigversion/dummy-lib-2.0.10.0.pom
rename to versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-2.0.10.0.pom
diff --git a/src/it-repo/test/bigversion/dummy-lib-2.12.0.0.jar b/versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-2.12.0.0.jar
similarity index 100%
rename from src/it-repo/test/bigversion/dummy-lib-2.12.0.0.jar
rename to versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-2.12.0.0.jar
diff --git a/src/it-repo/test/bigversion/dummy-lib-2.12.0.0.pom b/versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-2.12.0.0.pom
similarity index 100%
rename from src/it-repo/test/bigversion/dummy-lib-2.12.0.0.pom
rename to versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-2.12.0.0.pom
diff --git a/src/it-repo/test/bigversion/dummy-lib-3.0.0.0-SNAPSHOT.jar b/versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-3.0.0.0-SNAPSHOT.jar
similarity index 100%
rename from src/it-repo/test/bigversion/dummy-lib-3.0.0.0-SNAPSHOT.jar
rename to versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-3.0.0.0-SNAPSHOT.jar
diff --git a/src/it-repo/test/bigversion/dummy-lib-3.0.0.0-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-3.0.0.0-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/test/bigversion/dummy-lib-3.0.0.0-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/test/bigversion/dummy-lib-3.0.0.0-SNAPSHOT.pom
diff --git a/src/it-repo/test/package/module-0.0.2.19.jar b/versions-maven-plugin/src/it-repo/test/package/module-0.0.2.19.jar
similarity index 100%
rename from src/it-repo/test/package/module-0.0.2.19.jar
rename to versions-maven-plugin/src/it-repo/test/package/module-0.0.2.19.jar
diff --git a/src/it-repo/test/package/module-0.0.2.19.pom b/versions-maven-plugin/src/it-repo/test/package/module-0.0.2.19.pom
similarity index 100%
rename from src/it-repo/test/package/module-0.0.2.19.pom
rename to versions-maven-plugin/src/it-repo/test/package/module-0.0.2.19.pom
diff --git a/src/it-repo/test/package/module-1.2.3-SNAPSHOT.jar b/versions-maven-plugin/src/it-repo/test/package/module-1.2.3-SNAPSHOT.jar
similarity index 100%
rename from src/it-repo/test/package/module-1.2.3-SNAPSHOT.jar
rename to versions-maven-plugin/src/it-repo/test/package/module-1.2.3-SNAPSHOT.jar
diff --git a/src/it-repo/test/package/module-1.2.3-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/test/package/module-1.2.3-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/test/package/module-1.2.3-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/test/package/module-1.2.3-SNAPSHOT.pom
diff --git a/src/it-repo/test/package/moduleTest-0.0.2.18.jar b/versions-maven-plugin/src/it-repo/test/package/moduleTest-0.0.2.18.jar
similarity index 100%
rename from src/it-repo/test/package/moduleTest-0.0.2.18.jar
rename to versions-maven-plugin/src/it-repo/test/package/moduleTest-0.0.2.18.jar
diff --git a/src/it-repo/test/package/moduleTest-0.0.2.18.pom b/versions-maven-plugin/src/it-repo/test/package/moduleTest-0.0.2.18.pom
similarity index 100%
rename from src/it-repo/test/package/moduleTest-0.0.2.18.pom
rename to versions-maven-plugin/src/it-repo/test/package/moduleTest-0.0.2.18.pom
diff --git a/src/it-repo/test/package/moduleTest-0.0.2.19.jar b/versions-maven-plugin/src/it-repo/test/package/moduleTest-0.0.2.19.jar
similarity index 100%
rename from src/it-repo/test/package/moduleTest-0.0.2.19.jar
rename to versions-maven-plugin/src/it-repo/test/package/moduleTest-0.0.2.19.jar
diff --git a/src/it-repo/test/package/moduleTest-0.0.2.19.pom b/versions-maven-plugin/src/it-repo/test/package/moduleTest-0.0.2.19.pom
similarity index 100%
rename from src/it-repo/test/package/moduleTest-0.0.2.19.pom
rename to versions-maven-plugin/src/it-repo/test/package/moduleTest-0.0.2.19.pom
diff --git a/src/it-repo/test/package/moduleTest-0.0.2.20.jar b/versions-maven-plugin/src/it-repo/test/package/moduleTest-0.0.2.20.jar
similarity index 100%
rename from src/it-repo/test/package/moduleTest-0.0.2.20.jar
rename to versions-maven-plugin/src/it-repo/test/package/moduleTest-0.0.2.20.jar
diff --git a/src/it-repo/test/package/moduleTest-0.0.2.20.pom b/versions-maven-plugin/src/it-repo/test/package/moduleTest-0.0.2.20.pom
similarity index 100%
rename from src/it-repo/test/package/moduleTest-0.0.2.20.pom
rename to versions-maven-plugin/src/it-repo/test/package/moduleTest-0.0.2.20.pom
diff --git a/src/it-repo/test/package/moduleTest-1.2.3-SNAPSHOT.jar b/versions-maven-plugin/src/it-repo/test/package/moduleTest-1.2.3-SNAPSHOT.jar
similarity index 100%
rename from src/it-repo/test/package/moduleTest-1.2.3-SNAPSHOT.jar
rename to versions-maven-plugin/src/it-repo/test/package/moduleTest-1.2.3-SNAPSHOT.jar
diff --git a/src/it-repo/test/package/moduleTest-1.2.3-SNAPSHOT.pom b/versions-maven-plugin/src/it-repo/test/package/moduleTest-1.2.3-SNAPSHOT.pom
similarity index 100%
rename from src/it-repo/test/package/moduleTest-1.2.3-SNAPSHOT.pom
rename to versions-maven-plugin/src/it-repo/test/package/moduleTest-1.2.3-SNAPSHOT.pom
diff --git a/src/it-repo/the-grandparent-1.0.pom b/versions-maven-plugin/src/it-repo/the-grandparent-1.0.pom
similarity index 100%
rename from src/it-repo/the-grandparent-1.0.pom
rename to versions-maven-plugin/src/it-repo/the-grandparent-1.0.pom
diff --git a/src/it-repo/the-parent-1.0.pom b/versions-maven-plugin/src/it-repo/the-parent-1.0.pom
similarity index 100%
rename from src/it-repo/the-parent-1.0.pom
rename to versions-maven-plugin/src/it-repo/the-parent-1.0.pom
diff --git a/src/it-repo/update-api-1.9.5.pom b/versions-maven-plugin/src/it-repo/update-api-1.9.5.pom
similarity index 100%
rename from src/it-repo/update-api-1.9.5.pom
rename to versions-maven-plugin/src/it-repo/update-api-1.9.5.pom
diff --git a/src/it-repo/update-api-2.0.0-beta.pom b/versions-maven-plugin/src/it-repo/update-api-2.0.0-beta.pom
similarity index 100%
rename from src/it-repo/update-api-2.0.0-beta.pom
rename to versions-maven-plugin/src/it-repo/update-api-2.0.0-beta.pom
diff --git a/src/it-repo/versions-rules-3.0.1-1.1.pom b/versions-maven-plugin/src/it-repo/versions-rules-3.0.1-1.1.pom
similarity index 100%
rename from src/it-repo/versions-rules-3.0.1-1.1.pom
rename to versions-maven-plugin/src/it-repo/versions-rules-3.0.1-1.1.pom
diff --git a/src/it-repo/versions-rules-3.0.1-1.pom b/versions-maven-plugin/src/it-repo/versions-rules-3.0.1-1.pom
similarity index 100%
rename from src/it-repo/versions-rules-3.0.1-1.pom
rename to versions-maven-plugin/src/it-repo/versions-rules-3.0.1-1.pom
diff --git a/src/it-repo/versions-rules-3.0.1.pom b/versions-maven-plugin/src/it-repo/versions-rules-3.0.1.pom
similarity index 100%
rename from src/it-repo/versions-rules-3.0.1.pom
rename to versions-maven-plugin/src/it-repo/versions-rules-3.0.1.pom
diff --git a/src/it/it-abstract-versions-report-001/invoker.properties b/versions-maven-plugin/src/it/it-abstract-versions-report-001/invoker.properties
similarity index 100%
rename from src/it/it-abstract-versions-report-001/invoker.properties
rename to versions-maven-plugin/src/it/it-abstract-versions-report-001/invoker.properties
diff --git a/src/it/it-abstract-versions-report-001/pom.xml b/versions-maven-plugin/src/it/it-abstract-versions-report-001/pom.xml
similarity index 100%
rename from src/it/it-abstract-versions-report-001/pom.xml
rename to versions-maven-plugin/src/it/it-abstract-versions-report-001/pom.xml
diff --git a/src/it/it-abstract-versions-report-001/verify.groovy b/versions-maven-plugin/src/it/it-abstract-versions-report-001/verify.groovy
similarity index 100%
rename from src/it/it-abstract-versions-report-001/verify.groovy
rename to versions-maven-plugin/src/it/it-abstract-versions-report-001/verify.groovy
diff --git a/src/it/it-changerecord-update-parent-001/invoker.properties b/versions-maven-plugin/src/it/it-changerecord-update-parent-001/invoker.properties
similarity index 100%
rename from src/it/it-changerecord-update-parent-001/invoker.properties
rename to versions-maven-plugin/src/it/it-changerecord-update-parent-001/invoker.properties
diff --git a/src/it/it-changerecord-update-parent-001/pom.xml b/versions-maven-plugin/src/it/it-changerecord-update-parent-001/pom.xml
similarity index 100%
rename from src/it/it-changerecord-update-parent-001/pom.xml
rename to versions-maven-plugin/src/it/it-changerecord-update-parent-001/pom.xml
diff --git a/src/it/it-changerecord-update-parent-001/verify.bsh b/versions-maven-plugin/src/it/it-changerecord-update-parent-001/verify.bsh
similarity index 100%
rename from src/it/it-changerecord-update-parent-001/verify.bsh
rename to versions-maven-plugin/src/it/it-changerecord-update-parent-001/verify.bsh
diff --git a/src/it/it-changerecord-update-properties-001/invoker.properties b/versions-maven-plugin/src/it/it-changerecord-update-properties-001/invoker.properties
similarity index 100%
rename from src/it/it-changerecord-update-properties-001/invoker.properties
rename to versions-maven-plugin/src/it/it-changerecord-update-properties-001/invoker.properties
diff --git a/src/it/it-changerecord-update-properties-001/pom.xml b/versions-maven-plugin/src/it/it-changerecord-update-properties-001/pom.xml
similarity index 100%
rename from src/it/it-changerecord-update-properties-001/pom.xml
rename to versions-maven-plugin/src/it/it-changerecord-update-properties-001/pom.xml
diff --git a/src/it/it-changerecord-update-properties-001/verify.bsh b/versions-maven-plugin/src/it/it-changerecord-update-properties-001/verify.bsh
similarity index 100%
rename from src/it/it-changerecord-update-properties-001/verify.bsh
rename to versions-maven-plugin/src/it/it-changerecord-update-properties-001/verify.bsh
diff --git a/src/it/it-changerecord-use-latest-releases-001/invoker.properties b/versions-maven-plugin/src/it/it-changerecord-use-latest-releases-001/invoker.properties
similarity index 100%
rename from src/it/it-changerecord-use-latest-releases-001/invoker.properties
rename to versions-maven-plugin/src/it/it-changerecord-use-latest-releases-001/invoker.properties
diff --git a/src/it/it-changerecord-use-latest-releases-001/pom.xml b/versions-maven-plugin/src/it/it-changerecord-use-latest-releases-001/pom.xml
similarity index 100%
rename from src/it/it-changerecord-use-latest-releases-001/pom.xml
rename to versions-maven-plugin/src/it/it-changerecord-use-latest-releases-001/pom.xml
diff --git a/src/it/it-changerecord-use-latest-releases-001/verify.bsh b/versions-maven-plugin/src/it/it-changerecord-use-latest-releases-001/verify.bsh
similarity index 100%
rename from src/it/it-changerecord-use-latest-releases-001/verify.bsh
rename to versions-maven-plugin/src/it/it-changerecord-use-latest-releases-001/verify.bsh
diff --git a/src/it/it-changerecord-use-latest-snapshots-001/invoker.properties b/versions-maven-plugin/src/it/it-changerecord-use-latest-snapshots-001/invoker.properties
similarity index 100%
rename from src/it/it-changerecord-use-latest-snapshots-001/invoker.properties
rename to versions-maven-plugin/src/it/it-changerecord-use-latest-snapshots-001/invoker.properties
diff --git a/src/it/it-changerecord-use-latest-snapshots-001/pom.xml b/versions-maven-plugin/src/it/it-changerecord-use-latest-snapshots-001/pom.xml
similarity index 100%
rename from src/it/it-changerecord-use-latest-snapshots-001/pom.xml
rename to versions-maven-plugin/src/it/it-changerecord-use-latest-snapshots-001/pom.xml
diff --git a/src/it/it-changerecord-use-latest-snapshots-001/verify.bsh b/versions-maven-plugin/src/it/it-changerecord-use-latest-snapshots-001/verify.bsh
similarity index 100%
rename from src/it/it-changerecord-use-latest-snapshots-001/verify.bsh
rename to versions-maven-plugin/src/it/it-changerecord-use-latest-snapshots-001/verify.bsh
diff --git a/src/it/it-changerecord-use-latest-versions-001/invoker.properties b/versions-maven-plugin/src/it/it-changerecord-use-latest-versions-001/invoker.properties
similarity index 100%
rename from src/it/it-changerecord-use-latest-versions-001/invoker.properties
rename to versions-maven-plugin/src/it/it-changerecord-use-latest-versions-001/invoker.properties
diff --git a/src/it/it-changerecord-use-latest-versions-001/pom.xml b/versions-maven-plugin/src/it/it-changerecord-use-latest-versions-001/pom.xml
similarity index 100%
rename from src/it/it-changerecord-use-latest-versions-001/pom.xml
rename to versions-maven-plugin/src/it/it-changerecord-use-latest-versions-001/pom.xml
diff --git a/src/it/it-changerecord-use-latest-versions-001/verify.bsh b/versions-maven-plugin/src/it/it-changerecord-use-latest-versions-001/verify.bsh
similarity index 100%
rename from src/it/it-changerecord-use-latest-versions-001/verify.bsh
rename to versions-maven-plugin/src/it/it-changerecord-use-latest-versions-001/verify.bsh
diff --git a/src/it/it-changerecord-use-next-versions-001/invoker.properties b/versions-maven-plugin/src/it/it-changerecord-use-next-versions-001/invoker.properties
similarity index 100%
rename from src/it/it-changerecord-use-next-versions-001/invoker.properties
rename to versions-maven-plugin/src/it/it-changerecord-use-next-versions-001/invoker.properties
diff --git a/src/it/it-changerecord-use-next-versions-001/pom.xml b/versions-maven-plugin/src/it/it-changerecord-use-next-versions-001/pom.xml
similarity index 100%
rename from src/it/it-changerecord-use-next-versions-001/pom.xml
rename to versions-maven-plugin/src/it/it-changerecord-use-next-versions-001/pom.xml
diff --git a/src/it/it-changerecord-use-next-versions-001/verify.bsh b/versions-maven-plugin/src/it/it-changerecord-use-next-versions-001/verify.bsh
similarity index 100%
rename from src/it/it-changerecord-use-next-versions-001/verify.bsh
rename to versions-maven-plugin/src/it/it-changerecord-use-next-versions-001/verify.bsh
diff --git a/src/it/it-compare-dependencies-001/invoker.properties b/versions-maven-plugin/src/it/it-compare-dependencies-001/invoker.properties
similarity index 100%
rename from src/it/it-compare-dependencies-001/invoker.properties
rename to versions-maven-plugin/src/it/it-compare-dependencies-001/invoker.properties
diff --git a/src/it/it-compare-dependencies-001/pom.xml b/versions-maven-plugin/src/it/it-compare-dependencies-001/pom.xml
similarity index 100%
rename from src/it/it-compare-dependencies-001/pom.xml
rename to versions-maven-plugin/src/it/it-compare-dependencies-001/pom.xml
diff --git a/src/it/it-compare-dependencies-001/test.properties b/versions-maven-plugin/src/it/it-compare-dependencies-001/test.properties
similarity index 100%
rename from src/it/it-compare-dependencies-001/test.properties
rename to versions-maven-plugin/src/it/it-compare-dependencies-001/test.properties
diff --git a/src/it/it-compare-dependencies-001/verify.bsh b/versions-maven-plugin/src/it/it-compare-dependencies-001/verify.bsh
similarity index 100%
rename from src/it/it-compare-dependencies-001/verify.bsh
rename to versions-maven-plugin/src/it/it-compare-dependencies-001/verify.bsh
diff --git a/src/it/it-compare-dependencies-002/invoker.properties b/versions-maven-plugin/src/it/it-compare-dependencies-002/invoker.properties
similarity index 100%
rename from src/it/it-compare-dependencies-002/invoker.properties
rename to versions-maven-plugin/src/it/it-compare-dependencies-002/invoker.properties
diff --git a/src/it/it-compare-dependencies-002/pom.xml b/versions-maven-plugin/src/it/it-compare-dependencies-002/pom.xml
similarity index 100%
rename from src/it/it-compare-dependencies-002/pom.xml
rename to versions-maven-plugin/src/it/it-compare-dependencies-002/pom.xml
diff --git a/src/it/it-compare-dependencies-002/test.properties b/versions-maven-plugin/src/it/it-compare-dependencies-002/test.properties
similarity index 100%
rename from src/it/it-compare-dependencies-002/test.properties
rename to versions-maven-plugin/src/it/it-compare-dependencies-002/test.properties
diff --git a/src/it/it-compare-dependencies-002/verify.bsh b/versions-maven-plugin/src/it/it-compare-dependencies-002/verify.bsh
similarity index 100%
rename from src/it/it-compare-dependencies-002/verify.bsh
rename to versions-maven-plugin/src/it/it-compare-dependencies-002/verify.bsh
diff --git a/src/it/it-compare-dependencies-003/invoker.properties b/versions-maven-plugin/src/it/it-compare-dependencies-003/invoker.properties
similarity index 100%
rename from src/it/it-compare-dependencies-003/invoker.properties
rename to versions-maven-plugin/src/it/it-compare-dependencies-003/invoker.properties
diff --git a/src/it/it-compare-dependencies-003/pom.xml b/versions-maven-plugin/src/it/it-compare-dependencies-003/pom.xml
similarity index 100%
rename from src/it/it-compare-dependencies-003/pom.xml
rename to versions-maven-plugin/src/it/it-compare-dependencies-003/pom.xml
diff --git a/src/it/it-compare-dependencies-003/test.properties b/versions-maven-plugin/src/it/it-compare-dependencies-003/test.properties
similarity index 100%
rename from src/it/it-compare-dependencies-003/test.properties
rename to versions-maven-plugin/src/it/it-compare-dependencies-003/test.properties
diff --git a/src/it/it-compare-dependencies-003/verify.bsh b/versions-maven-plugin/src/it/it-compare-dependencies-003/verify.bsh
similarity index 100%
rename from src/it/it-compare-dependencies-003/verify.bsh
rename to versions-maven-plugin/src/it/it-compare-dependencies-003/verify.bsh
diff --git a/src/it/it-compare-dependencies-004/invoker.properties b/versions-maven-plugin/src/it/it-compare-dependencies-004/invoker.properties
similarity index 100%
rename from src/it/it-compare-dependencies-004/invoker.properties
rename to versions-maven-plugin/src/it/it-compare-dependencies-004/invoker.properties
diff --git a/src/it/it-compare-dependencies-004/pom.xml b/versions-maven-plugin/src/it/it-compare-dependencies-004/pom.xml
similarity index 100%
rename from src/it/it-compare-dependencies-004/pom.xml
rename to versions-maven-plugin/src/it/it-compare-dependencies-004/pom.xml
diff --git a/src/it/it-compare-dependencies-004/test.properties b/versions-maven-plugin/src/it/it-compare-dependencies-004/test.properties
similarity index 100%
rename from src/it/it-compare-dependencies-004/test.properties
rename to versions-maven-plugin/src/it/it-compare-dependencies-004/test.properties
diff --git a/src/it/it-compare-dependencies-004/verify.bsh b/versions-maven-plugin/src/it/it-compare-dependencies-004/verify.bsh
similarity index 100%
rename from src/it/it-compare-dependencies-004/verify.bsh
rename to versions-maven-plugin/src/it/it-compare-dependencies-004/verify.bsh
diff --git a/src/it/it-compare-dependencies-005/invoker.properties b/versions-maven-plugin/src/it/it-compare-dependencies-005/invoker.properties
similarity index 100%
rename from src/it/it-compare-dependencies-005/invoker.properties
rename to versions-maven-plugin/src/it/it-compare-dependencies-005/invoker.properties
diff --git a/src/it/it-compare-dependencies-005/pom.xml b/versions-maven-plugin/src/it/it-compare-dependencies-005/pom.xml
similarity index 100%
rename from src/it/it-compare-dependencies-005/pom.xml
rename to versions-maven-plugin/src/it/it-compare-dependencies-005/pom.xml
diff --git a/src/it/it-compare-dependencies-005/test.properties b/versions-maven-plugin/src/it/it-compare-dependencies-005/test.properties
similarity index 100%
rename from src/it/it-compare-dependencies-005/test.properties
rename to versions-maven-plugin/src/it/it-compare-dependencies-005/test.properties
diff --git a/src/it/it-compare-dependencies-005/verify.bsh b/versions-maven-plugin/src/it/it-compare-dependencies-005/verify.bsh
similarity index 100%
rename from src/it/it-compare-dependencies-005/verify.bsh
rename to versions-maven-plugin/src/it/it-compare-dependencies-005/verify.bsh
diff --git a/src/it/it-dependency-updates-report-001/invoker.properties b/versions-maven-plugin/src/it/it-dependency-updates-report-001/invoker.properties
similarity index 100%
rename from src/it/it-dependency-updates-report-001/invoker.properties
rename to versions-maven-plugin/src/it/it-dependency-updates-report-001/invoker.properties
diff --git a/src/it/it-dependency-updates-report-001/pom.xml b/versions-maven-plugin/src/it/it-dependency-updates-report-001/pom.xml
similarity index 100%
rename from src/it/it-dependency-updates-report-001/pom.xml
rename to versions-maven-plugin/src/it/it-dependency-updates-report-001/pom.xml
diff --git a/src/it/it-dependency-updates-report-001/src/site/site.xml b/versions-maven-plugin/src/it/it-dependency-updates-report-001/src/site/site.xml
similarity index 100%
rename from src/it/it-dependency-updates-report-001/src/site/site.xml
rename to versions-maven-plugin/src/it/it-dependency-updates-report-001/src/site/site.xml
diff --git a/src/it/it-dependency-updates-report-001/verify.bsh b/versions-maven-plugin/src/it/it-dependency-updates-report-001/verify.bsh
similarity index 100%
rename from src/it/it-dependency-updates-report-001/verify.bsh
rename to versions-maven-plugin/src/it/it-dependency-updates-report-001/verify.bsh
diff --git a/src/it/it-dependency-updates-report-002/invoker.properties b/versions-maven-plugin/src/it/it-dependency-updates-report-002/invoker.properties
similarity index 100%
rename from src/it/it-dependency-updates-report-002/invoker.properties
rename to versions-maven-plugin/src/it/it-dependency-updates-report-002/invoker.properties
diff --git a/src/it/it-dependency-updates-report-002/pom.xml b/versions-maven-plugin/src/it/it-dependency-updates-report-002/pom.xml
similarity index 100%
rename from src/it/it-dependency-updates-report-002/pom.xml
rename to versions-maven-plugin/src/it/it-dependency-updates-report-002/pom.xml
diff --git a/src/it/it-dependency-updates-report-002/src/site/site.xml b/versions-maven-plugin/src/it/it-dependency-updates-report-002/src/site/site.xml
similarity index 100%
rename from src/it/it-dependency-updates-report-002/src/site/site.xml
rename to versions-maven-plugin/src/it/it-dependency-updates-report-002/src/site/site.xml
diff --git a/src/it/it-dependency-updates-report-002/verify.bsh b/versions-maven-plugin/src/it/it-dependency-updates-report-002/verify.bsh
similarity index 100%
rename from src/it/it-dependency-updates-report-002/verify.bsh
rename to versions-maven-plugin/src/it/it-dependency-updates-report-002/verify.bsh
diff --git a/src/it/it-dependency-updates-report-003/invoker.properties b/versions-maven-plugin/src/it/it-dependency-updates-report-003/invoker.properties
similarity index 100%
rename from src/it/it-dependency-updates-report-003/invoker.properties
rename to versions-maven-plugin/src/it/it-dependency-updates-report-003/invoker.properties
diff --git a/src/it/it-dependency-updates-report-003/pom.xml b/versions-maven-plugin/src/it/it-dependency-updates-report-003/pom.xml
similarity index 100%
rename from src/it/it-dependency-updates-report-003/pom.xml
rename to versions-maven-plugin/src/it/it-dependency-updates-report-003/pom.xml
diff --git a/src/it/it-dependency-updates-report-003/src/site/site.xml b/versions-maven-plugin/src/it/it-dependency-updates-report-003/src/site/site.xml
similarity index 100%
rename from src/it/it-dependency-updates-report-003/src/site/site.xml
rename to versions-maven-plugin/src/it/it-dependency-updates-report-003/src/site/site.xml
diff --git a/src/it/it-dependency-updates-report-003/verify.bsh b/versions-maven-plugin/src/it/it-dependency-updates-report-003/verify.bsh
similarity index 100%
rename from src/it/it-dependency-updates-report-003/verify.bsh
rename to versions-maven-plugin/src/it/it-dependency-updates-report-003/verify.bsh
diff --git a/src/it/it-dependency-updates-report-004/invoker.properties b/versions-maven-plugin/src/it/it-dependency-updates-report-004/invoker.properties
similarity index 100%
rename from src/it/it-dependency-updates-report-004/invoker.properties
rename to versions-maven-plugin/src/it/it-dependency-updates-report-004/invoker.properties
diff --git a/src/it/it-dependency-updates-report-004/pom.xml b/versions-maven-plugin/src/it/it-dependency-updates-report-004/pom.xml
similarity index 100%
rename from src/it/it-dependency-updates-report-004/pom.xml
rename to versions-maven-plugin/src/it/it-dependency-updates-report-004/pom.xml
diff --git a/src/it/it-dependency-updates-report-004/src/site/site.xml b/versions-maven-plugin/src/it/it-dependency-updates-report-004/src/site/site.xml
similarity index 100%
rename from src/it/it-dependency-updates-report-004/src/site/site.xml
rename to versions-maven-plugin/src/it/it-dependency-updates-report-004/src/site/site.xml
diff --git a/src/it/it-dependency-updates-report-004/verify.bsh b/versions-maven-plugin/src/it/it-dependency-updates-report-004/verify.bsh
similarity index 100%
rename from src/it/it-dependency-updates-report-004/verify.bsh
rename to versions-maven-plugin/src/it/it-dependency-updates-report-004/verify.bsh
diff --git a/src/it/it-dependency-updates-report-issue-684-001/invoker.properties b/versions-maven-plugin/src/it/it-dependency-updates-report-issue-684-001/invoker.properties
similarity index 100%
rename from src/it/it-dependency-updates-report-issue-684-001/invoker.properties
rename to versions-maven-plugin/src/it/it-dependency-updates-report-issue-684-001/invoker.properties
diff --git a/src/it/it-dependency-updates-report-issue-684-001/pom.xml b/versions-maven-plugin/src/it/it-dependency-updates-report-issue-684-001/pom.xml
similarity index 100%
rename from src/it/it-dependency-updates-report-issue-684-001/pom.xml
rename to versions-maven-plugin/src/it/it-dependency-updates-report-issue-684-001/pom.xml
diff --git a/src/it/it-dependency-updates-report-issue-684-001/verify.groovy b/versions-maven-plugin/src/it/it-dependency-updates-report-issue-684-001/verify.groovy
similarity index 100%
rename from src/it/it-dependency-updates-report-issue-684-001/verify.groovy
rename to versions-maven-plugin/src/it/it-dependency-updates-report-issue-684-001/verify.groovy
diff --git a/src/it/it-dependency-updates-report-issue-755/invoker.properties b/versions-maven-plugin/src/it/it-dependency-updates-report-issue-755/invoker.properties
similarity index 100%
rename from src/it/it-dependency-updates-report-issue-755/invoker.properties
rename to versions-maven-plugin/src/it/it-dependency-updates-report-issue-755/invoker.properties
diff --git a/src/it/it-dependency-updates-report-issue-755/pom.xml b/versions-maven-plugin/src/it/it-dependency-updates-report-issue-755/pom.xml
similarity index 100%
rename from src/it/it-dependency-updates-report-issue-755/pom.xml
rename to versions-maven-plugin/src/it/it-dependency-updates-report-issue-755/pom.xml
diff --git a/src/it/it-dependency-updates-report-issue-755/verify.groovy b/versions-maven-plugin/src/it/it-dependency-updates-report-issue-755/verify.groovy
similarity index 100%
rename from src/it/it-dependency-updates-report-issue-755/verify.groovy
rename to versions-maven-plugin/src/it/it-dependency-updates-report-issue-755/verify.groovy
diff --git a/src/it/it-display-dependency-updates-001/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-001/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-001/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-001/invoker.properties
diff --git a/src/it/it-display-dependency-updates-001/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-001/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-001/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-001/pom.xml
diff --git a/src/it/it-display-dependency-updates-001/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-001/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-001/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-001/verify.groovy
diff --git a/src/it/it-display-dependency-updates-002/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-002/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-002/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-002/invoker.properties
diff --git a/src/it/it-display-dependency-updates-002/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-002/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-002/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-002/pom.xml
diff --git a/src/it/it-display-dependency-updates-002/verify.bsh b/versions-maven-plugin/src/it/it-display-dependency-updates-002/verify.bsh
similarity index 100%
rename from src/it/it-display-dependency-updates-002/verify.bsh
rename to versions-maven-plugin/src/it/it-display-dependency-updates-002/verify.bsh
diff --git a/src/it/it-display-dependency-updates-003/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-003/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-003/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-003/invoker.properties
diff --git a/src/it/it-display-dependency-updates-003/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-003/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-003/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-003/pom.xml
diff --git a/src/it/it-display-dependency-updates-003/verify.bsh b/versions-maven-plugin/src/it/it-display-dependency-updates-003/verify.bsh
similarity index 100%
rename from src/it/it-display-dependency-updates-003/verify.bsh
rename to versions-maven-plugin/src/it/it-display-dependency-updates-003/verify.bsh
diff --git a/src/it/it-display-dependency-updates-004/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-004/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-004/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-004/invoker.properties
diff --git a/src/it/it-display-dependency-updates-004/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-004/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-004/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-004/pom.xml
diff --git a/src/it/it-display-dependency-updates-004/verify.bsh b/versions-maven-plugin/src/it/it-display-dependency-updates-004/verify.bsh
similarity index 100%
rename from src/it/it-display-dependency-updates-004/verify.bsh
rename to versions-maven-plugin/src/it/it-display-dependency-updates-004/verify.bsh
diff --git a/src/it/it-display-dependency-updates-005/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-005/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-005/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-005/invoker.properties
diff --git a/src/it/it-display-dependency-updates-005/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-005/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-005/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-005/pom.xml
diff --git a/src/it/it-display-dependency-updates-005/verify.bsh b/versions-maven-plugin/src/it/it-display-dependency-updates-005/verify.bsh
similarity index 100%
rename from src/it/it-display-dependency-updates-005/verify.bsh
rename to versions-maven-plugin/src/it/it-display-dependency-updates-005/verify.bsh
diff --git a/src/it/it-display-dependency-updates-006/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-006/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-006/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-006/invoker.properties
diff --git a/src/it/it-display-dependency-updates-006/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-006/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-006/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-006/pom.xml
diff --git a/src/it/it-display-dependency-updates-006/verify.bsh b/versions-maven-plugin/src/it/it-display-dependency-updates-006/verify.bsh
similarity index 100%
rename from src/it/it-display-dependency-updates-006/verify.bsh
rename to versions-maven-plugin/src/it/it-display-dependency-updates-006/verify.bsh
diff --git a/src/it/it-display-dependency-updates-007-outputFile/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-007-outputFile/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-007-outputFile/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-007-outputFile/invoker.properties
diff --git a/src/it/it-display-dependency-updates-007-outputFile/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-007-outputFile/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-007-outputFile/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-007-outputFile/pom.xml
diff --git a/src/it/it-display-dependency-updates-007-outputFile/verify.bsh b/versions-maven-plugin/src/it/it-display-dependency-updates-007-outputFile/verify.bsh
similarity index 100%
rename from src/it/it-display-dependency-updates-007-outputFile/verify.bsh
rename to versions-maven-plugin/src/it/it-display-dependency-updates-007-outputFile/verify.bsh
diff --git a/src/it/it-display-dependency-updates-008-outputLineWidth/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-008-outputLineWidth/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-008-outputLineWidth/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-008-outputLineWidth/invoker.properties
diff --git a/src/it/it-display-dependency-updates-008-outputLineWidth/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-008-outputLineWidth/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-008-outputLineWidth/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-008-outputLineWidth/pom.xml
diff --git a/src/it/it-display-dependency-updates-008-outputLineWidth/verify.bsh b/versions-maven-plugin/src/it/it-display-dependency-updates-008-outputLineWidth/verify.bsh
similarity index 100%
rename from src/it/it-display-dependency-updates-008-outputLineWidth/verify.bsh
rename to versions-maven-plugin/src/it/it-display-dependency-updates-008-outputLineWidth/verify.bsh
diff --git a/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-false/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-false/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-false/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-false/invoker.properties
diff --git a/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-false/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-false/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-false/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-false/pom.xml
diff --git a/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-false/verify.bsh b/versions-maven-plugin/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-false/verify.bsh
similarity index 100%
rename from src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-false/verify.bsh
rename to versions-maven-plugin/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-false/verify.bsh
diff --git a/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-true/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-true/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-true/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-true/invoker.properties
diff --git a/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-true/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-true/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-true/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-true/pom.xml
diff --git a/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-true/verify.bsh b/versions-maven-plugin/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-true/verify.bsh
similarity index 100%
rename from src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-true/verify.bsh
rename to versions-maven-plugin/src/it/it-display-dependency-updates-009-processDependencyManagementTransitive-true/verify.bsh
diff --git a/src/it/it-display-dependency-updates-issue-258-dependencyIncludesAndExcludes/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-258-dependencyIncludesAndExcludes/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-258-dependencyIncludesAndExcludes/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-258-dependencyIncludesAndExcludes/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-258-dependencyIncludesAndExcludes/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-258-dependencyIncludesAndExcludes/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-258-dependencyIncludesAndExcludes/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-258-dependencyIncludesAndExcludes/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-258-dependencyIncludesAndExcludes/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-258-dependencyIncludesAndExcludes/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-258-dependencyIncludesAndExcludes/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-258-dependencyIncludesAndExcludes/verify.groovy
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyExcludes/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyExcludes/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyExcludes/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyExcludes/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyExcludes/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyExcludes/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyExcludes/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyExcludes/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyExcludes/test.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyExcludes/test.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyExcludes/test.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyExcludes/test.properties
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyExcludes/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyExcludes/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyExcludes/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyExcludes/verify.groovy
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/test.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/test.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/test.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/test.properties
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes-multi/verify.groovy
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyIncludes/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyIncludes/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyIncludes/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyIncludes/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyIncludes/test.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes/test.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyIncludes/test.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes/test.properties
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyIncludes/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyIncludes/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludes/verify.groovy
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/test.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/test.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/test.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/test.properties
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyIncludesAndExcludes/verify.groovy
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/test.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/test.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/test.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/test.properties
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementExcludes/verify.groovy
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/test.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/test.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/test.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/test.properties
diff --git a/src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-318-dependencyManagementIncludes/verify.groovy
diff --git a/src/it/it-display-dependency-updates-issue-34-1/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-1/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-1/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-1/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-34-1/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-1/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-1/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-1/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-34-1/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-1/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-1/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-1/verify.groovy
diff --git a/src/it/it-display-dependency-updates-issue-34-2/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-2/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-2/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-2/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-34-2/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-2/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-2/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-2/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-34-2/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-2/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-2/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-2/verify.groovy
diff --git a/src/it/it-display-dependency-updates-issue-34-3/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-3/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-3/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-3/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-34-3/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-3/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-3/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-3/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-34-3/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-3/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-3/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-3/verify.groovy
diff --git a/src/it/it-display-dependency-updates-issue-34-4/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-4/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-4/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-4/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-34-4/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-4/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-4/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-4/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-34-4/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-4/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-4/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-4/verify.groovy
diff --git a/src/it/it-display-dependency-updates-issue-34-5/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-5/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-5/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-5/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-34-5/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-5/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-5/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-5/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-34-5/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-5/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-34-5/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-34-5/verify.groovy
diff --git a/src/it/it-display-dependency-updates-issue-684-pom-based-rules/invoker.properties b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-684-pom-based-rules/invoker.properties
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-684-pom-based-rules/invoker.properties
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-684-pom-based-rules/invoker.properties
diff --git a/src/it/it-display-dependency-updates-issue-684-pom-based-rules/pom.xml b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-684-pom-based-rules/pom.xml
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-684-pom-based-rules/pom.xml
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-684-pom-based-rules/pom.xml
diff --git a/src/it/it-display-dependency-updates-issue-684-pom-based-rules/verify.groovy b/versions-maven-plugin/src/it/it-display-dependency-updates-issue-684-pom-based-rules/verify.groovy
similarity index 100%
rename from src/it/it-display-dependency-updates-issue-684-pom-based-rules/verify.groovy
rename to versions-maven-plugin/src/it/it-display-dependency-updates-issue-684-pom-based-rules/verify.groovy
diff --git a/src/it/it-display-plugin-updates-001/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-001/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-001/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-001/invoker.properties
diff --git a/src/it/it-display-plugin-updates-001/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-001/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-001/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-001/pom.xml
diff --git a/src/it/it-display-plugin-updates-001/verify.groovy b/versions-maven-plugin/src/it/it-display-plugin-updates-001/verify.groovy
similarity index 100%
rename from src/it/it-display-plugin-updates-001/verify.groovy
rename to versions-maven-plugin/src/it/it-display-plugin-updates-001/verify.groovy
diff --git a/src/it/it-display-plugin-updates-002/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-002/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-002/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-002/invoker.properties
diff --git a/src/it/it-display-plugin-updates-002/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-002/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-002/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-002/pom.xml
diff --git a/src/it/it-display-plugin-updates-002/verify.bsh b/versions-maven-plugin/src/it/it-display-plugin-updates-002/verify.bsh
similarity index 100%
rename from src/it/it-display-plugin-updates-002/verify.bsh
rename to versions-maven-plugin/src/it/it-display-plugin-updates-002/verify.bsh
diff --git a/src/it/it-display-plugin-updates-003/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-003/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-003/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-003/invoker.properties
diff --git a/src/it/it-display-plugin-updates-003/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-003/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-003/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-003/pom.xml
diff --git a/src/it/it-display-plugin-updates-003/verify.bsh b/versions-maven-plugin/src/it/it-display-plugin-updates-003/verify.bsh
similarity index 100%
rename from src/it/it-display-plugin-updates-003/verify.bsh
rename to versions-maven-plugin/src/it/it-display-plugin-updates-003/verify.bsh
diff --git a/src/it/it-display-plugin-updates-004/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-004/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-004/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-004/invoker.properties
diff --git a/src/it/it-display-plugin-updates-004/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-004/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-004/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-004/pom.xml
diff --git a/src/it/it-display-plugin-updates-004/verify.bsh b/versions-maven-plugin/src/it/it-display-plugin-updates-004/verify.bsh
similarity index 100%
rename from src/it/it-display-plugin-updates-004/verify.bsh
rename to versions-maven-plugin/src/it/it-display-plugin-updates-004/verify.bsh
diff --git a/src/it/it-display-plugin-updates-005/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-005/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-005/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-005/invoker.properties
diff --git a/src/it/it-display-plugin-updates-005/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-005/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-005/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-005/pom.xml
diff --git a/src/it/it-display-plugin-updates-005/verify.bsh b/versions-maven-plugin/src/it/it-display-plugin-updates-005/verify.bsh
similarity index 100%
rename from src/it/it-display-plugin-updates-005/verify.bsh
rename to versions-maven-plugin/src/it/it-display-plugin-updates-005/verify.bsh
diff --git a/src/it/it-display-plugin-updates-006/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-006/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-006/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-006/invoker.properties
diff --git a/src/it/it-display-plugin-updates-006/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-006/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-006/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-006/pom.xml
diff --git a/src/it/it-display-plugin-updates-006/verify.bsh b/versions-maven-plugin/src/it/it-display-plugin-updates-006/verify.bsh
similarity index 100%
rename from src/it/it-display-plugin-updates-006/verify.bsh
rename to versions-maven-plugin/src/it/it-display-plugin-updates-006/verify.bsh
diff --git a/src/it/it-display-plugin-updates-007/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-007/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-007/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-007/invoker.properties
diff --git a/src/it/it-display-plugin-updates-007/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-007/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-007/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-007/pom.xml
diff --git a/src/it/it-display-plugin-updates-007/verify.bsh b/versions-maven-plugin/src/it/it-display-plugin-updates-007/verify.bsh
similarity index 100%
rename from src/it/it-display-plugin-updates-007/verify.bsh
rename to versions-maven-plugin/src/it/it-display-plugin-updates-007/verify.bsh
diff --git a/src/it/it-display-plugin-updates-008/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-008/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-008/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-008/invoker.properties
diff --git a/src/it/it-display-plugin-updates-008/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-008/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-008/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-008/pom.xml
diff --git a/src/it/it-display-plugin-updates-008/verify.bsh b/versions-maven-plugin/src/it/it-display-plugin-updates-008/verify.bsh
similarity index 100%
rename from src/it/it-display-plugin-updates-008/verify.bsh
rename to versions-maven-plugin/src/it/it-display-plugin-updates-008/verify.bsh
diff --git a/src/it/it-display-plugin-updates-009-issue-422/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-009-issue-422/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-009-issue-422/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-009-issue-422/invoker.properties
diff --git a/src/it/it-display-plugin-updates-009-issue-422/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-009-issue-422/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-009-issue-422/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-009-issue-422/pom.xml
diff --git a/src/it/it-display-plugin-updates-009-issue-422/verify.bsh b/versions-maven-plugin/src/it/it-display-plugin-updates-009-issue-422/verify.bsh
similarity index 100%
rename from src/it/it-display-plugin-updates-009-issue-422/verify.bsh
rename to versions-maven-plugin/src/it/it-display-plugin-updates-009-issue-422/verify.bsh
diff --git a/src/it/it-display-plugin-updates-010-issue-526/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-010-issue-526/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-010-issue-526/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-010-issue-526/invoker.properties
diff --git a/src/it/it-display-plugin-updates-010-issue-526/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-010-issue-526/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-010-issue-526/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-010-issue-526/pom.xml
diff --git a/src/it/it-display-plugin-updates-010-issue-526/verify.bsh b/versions-maven-plugin/src/it/it-display-plugin-updates-010-issue-526/verify.bsh
similarity index 100%
rename from src/it/it-display-plugin-updates-010-issue-526/verify.bsh
rename to versions-maven-plugin/src/it/it-display-plugin-updates-010-issue-526/verify.bsh
diff --git a/src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/invoker.properties
diff --git a/src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/parent/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/parent/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/parent/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/parent/pom.xml
diff --git a/src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/pom.xml
diff --git a/src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/verify.bsh b/versions-maven-plugin/src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/verify.bsh
similarity index 100%
rename from src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/verify.bsh
rename to versions-maven-plugin/src/it/it-display-plugin-updates-011-ignore-plugin-defined-in-parent/verify.bsh
diff --git a/src/it/it-display-plugin-updates-012-outputLineWidth/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-012-outputLineWidth/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-012-outputLineWidth/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-012-outputLineWidth/invoker.properties
diff --git a/src/it/it-display-plugin-updates-012-outputLineWidth/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-012-outputLineWidth/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-012-outputLineWidth/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-012-outputLineWidth/pom.xml
diff --git a/src/it/it-display-plugin-updates-012-outputLineWidth/verify.bsh b/versions-maven-plugin/src/it/it-display-plugin-updates-012-outputLineWidth/verify.bsh
similarity index 100%
rename from src/it/it-display-plugin-updates-012-outputLineWidth/verify.bsh
rename to versions-maven-plugin/src/it/it-display-plugin-updates-012-outputLineWidth/verify.bsh
diff --git a/src/it/it-display-plugin-updates-issue-684-pom-based-rules/invoker.properties b/versions-maven-plugin/src/it/it-display-plugin-updates-issue-684-pom-based-rules/invoker.properties
similarity index 100%
rename from src/it/it-display-plugin-updates-issue-684-pom-based-rules/invoker.properties
rename to versions-maven-plugin/src/it/it-display-plugin-updates-issue-684-pom-based-rules/invoker.properties
diff --git a/src/it/it-display-plugin-updates-issue-684-pom-based-rules/pom.xml b/versions-maven-plugin/src/it/it-display-plugin-updates-issue-684-pom-based-rules/pom.xml
similarity index 100%
rename from src/it/it-display-plugin-updates-issue-684-pom-based-rules/pom.xml
rename to versions-maven-plugin/src/it/it-display-plugin-updates-issue-684-pom-based-rules/pom.xml
diff --git a/src/it/it-display-plugin-updates-issue-684-pom-based-rules/verify.groovy b/versions-maven-plugin/src/it/it-display-plugin-updates-issue-684-pom-based-rules/verify.groovy
similarity index 100%
rename from src/it/it-display-plugin-updates-issue-684-pom-based-rules/verify.groovy
rename to versions-maven-plugin/src/it/it-display-plugin-updates-issue-684-pom-based-rules/verify.groovy
diff --git a/src/it/it-display-property-updates-001/invoker.properties b/versions-maven-plugin/src/it/it-display-property-updates-001/invoker.properties
similarity index 100%
rename from src/it/it-display-property-updates-001/invoker.properties
rename to versions-maven-plugin/src/it/it-display-property-updates-001/invoker.properties
diff --git a/src/it/it-display-property-updates-001/pom.xml b/versions-maven-plugin/src/it/it-display-property-updates-001/pom.xml
similarity index 100%
rename from src/it/it-display-property-updates-001/pom.xml
rename to versions-maven-plugin/src/it/it-display-property-updates-001/pom.xml
diff --git a/src/it/it-display-property-updates-001/verify.groovy b/versions-maven-plugin/src/it/it-display-property-updates-001/verify.groovy
similarity index 100%
rename from src/it/it-display-property-updates-001/verify.groovy
rename to versions-maven-plugin/src/it/it-display-property-updates-001/verify.groovy
diff --git a/src/it/it-display-property-updates-002-outputLineWidth/invoker.properties b/versions-maven-plugin/src/it/it-display-property-updates-002-outputLineWidth/invoker.properties
similarity index 100%
rename from src/it/it-display-property-updates-002-outputLineWidth/invoker.properties
rename to versions-maven-plugin/src/it/it-display-property-updates-002-outputLineWidth/invoker.properties
diff --git a/src/it/it-display-property-updates-002-outputLineWidth/pom.xml b/versions-maven-plugin/src/it/it-display-property-updates-002-outputLineWidth/pom.xml
similarity index 100%
rename from src/it/it-display-property-updates-002-outputLineWidth/pom.xml
rename to versions-maven-plugin/src/it/it-display-property-updates-002-outputLineWidth/pom.xml
diff --git a/src/it/it-display-property-updates-002-outputLineWidth/verify.bsh b/versions-maven-plugin/src/it/it-display-property-updates-002-outputLineWidth/verify.bsh
similarity index 100%
rename from src/it/it-display-property-updates-002-outputLineWidth/verify.bsh
rename to versions-maven-plugin/src/it/it-display-property-updates-002-outputLineWidth/verify.bsh
diff --git a/src/it/it-display-property-updates-issue-684-pom-based-rules/invoker.properties b/versions-maven-plugin/src/it/it-display-property-updates-issue-684-pom-based-rules/invoker.properties
similarity index 100%
rename from src/it/it-display-property-updates-issue-684-pom-based-rules/invoker.properties
rename to versions-maven-plugin/src/it/it-display-property-updates-issue-684-pom-based-rules/invoker.properties
diff --git a/src/it/it-display-property-updates-issue-684-pom-based-rules/pom.xml b/versions-maven-plugin/src/it/it-display-property-updates-issue-684-pom-based-rules/pom.xml
similarity index 100%
rename from src/it/it-display-property-updates-issue-684-pom-based-rules/pom.xml
rename to versions-maven-plugin/src/it/it-display-property-updates-issue-684-pom-based-rules/pom.xml
diff --git a/src/it/it-display-property-updates-issue-684-pom-based-rules/verify.groovy b/versions-maven-plugin/src/it/it-display-property-updates-issue-684-pom-based-rules/verify.groovy
similarity index 100%
rename from src/it/it-display-property-updates-issue-684-pom-based-rules/verify.groovy
rename to versions-maven-plugin/src/it/it-display-property-updates-issue-684-pom-based-rules/verify.groovy
diff --git a/src/it/it-encoding-001/invoker.properties b/versions-maven-plugin/src/it/it-encoding-001/invoker.properties
similarity index 100%
rename from src/it/it-encoding-001/invoker.properties
rename to versions-maven-plugin/src/it/it-encoding-001/invoker.properties
diff --git a/src/it/it-encoding-001/pom.xml b/versions-maven-plugin/src/it/it-encoding-001/pom.xml
similarity index 100%
rename from src/it/it-encoding-001/pom.xml
rename to versions-maven-plugin/src/it/it-encoding-001/pom.xml
diff --git a/src/it/it-encoding-001/verify.bsh b/versions-maven-plugin/src/it/it-encoding-001/verify.bsh
similarity index 100%
rename from src/it/it-encoding-001/verify.bsh
rename to versions-maven-plugin/src/it/it-encoding-001/verify.bsh
diff --git a/src/it/it-parent-updates-report-001/invoker.properties b/versions-maven-plugin/src/it/it-parent-updates-report-001/invoker.properties
similarity index 100%
rename from src/it/it-parent-updates-report-001/invoker.properties
rename to versions-maven-plugin/src/it/it-parent-updates-report-001/invoker.properties
diff --git a/src/it/it-parent-updates-report-001/module/pom.xml b/versions-maven-plugin/src/it/it-parent-updates-report-001/module/pom.xml
similarity index 100%
rename from src/it/it-parent-updates-report-001/module/pom.xml
rename to versions-maven-plugin/src/it/it-parent-updates-report-001/module/pom.xml
diff --git a/src/it/it-parent-updates-report-001/pom.xml b/versions-maven-plugin/src/it/it-parent-updates-report-001/pom.xml
similarity index 100%
rename from src/it/it-parent-updates-report-001/pom.xml
rename to versions-maven-plugin/src/it/it-parent-updates-report-001/pom.xml
diff --git a/src/it/it-parent-updates-report-001/src/site/site.xml b/versions-maven-plugin/src/it/it-parent-updates-report-001/src/site/site.xml
similarity index 100%
rename from src/it/it-parent-updates-report-001/src/site/site.xml
rename to versions-maven-plugin/src/it/it-parent-updates-report-001/src/site/site.xml
diff --git a/src/it/it-parent-updates-report-001/verify.groovy b/versions-maven-plugin/src/it/it-parent-updates-report-001/verify.groovy
similarity index 100%
rename from src/it/it-parent-updates-report-001/verify.groovy
rename to versions-maven-plugin/src/it/it-parent-updates-report-001/verify.groovy
diff --git a/src/it/it-plugin-updates-report-001/invoker.properties b/versions-maven-plugin/src/it/it-plugin-updates-report-001/invoker.properties
similarity index 100%
rename from src/it/it-plugin-updates-report-001/invoker.properties
rename to versions-maven-plugin/src/it/it-plugin-updates-report-001/invoker.properties
diff --git a/src/it/it-plugin-updates-report-001/pom.xml b/versions-maven-plugin/src/it/it-plugin-updates-report-001/pom.xml
similarity index 100%
rename from src/it/it-plugin-updates-report-001/pom.xml
rename to versions-maven-plugin/src/it/it-plugin-updates-report-001/pom.xml
diff --git a/src/it/it-plugin-updates-report-001/src/site/site.xml b/versions-maven-plugin/src/it/it-plugin-updates-report-001/src/site/site.xml
similarity index 100%
rename from src/it/it-plugin-updates-report-001/src/site/site.xml
rename to versions-maven-plugin/src/it/it-plugin-updates-report-001/src/site/site.xml
diff --git a/src/it/it-plugin-updates-report-001/verify.bsh b/versions-maven-plugin/src/it/it-plugin-updates-report-001/verify.bsh
similarity index 100%
rename from src/it/it-plugin-updates-report-001/verify.bsh
rename to versions-maven-plugin/src/it/it-plugin-updates-report-001/verify.bsh
diff --git a/src/it/it-plugin-updates-report-002/invoker.properties b/versions-maven-plugin/src/it/it-plugin-updates-report-002/invoker.properties
similarity index 100%
rename from src/it/it-plugin-updates-report-002/invoker.properties
rename to versions-maven-plugin/src/it/it-plugin-updates-report-002/invoker.properties
diff --git a/src/it/it-plugin-updates-report-002/pom.xml b/versions-maven-plugin/src/it/it-plugin-updates-report-002/pom.xml
similarity index 100%
rename from src/it/it-plugin-updates-report-002/pom.xml
rename to versions-maven-plugin/src/it/it-plugin-updates-report-002/pom.xml
diff --git a/src/it/it-plugin-updates-report-002/src/site/site.xml b/versions-maven-plugin/src/it/it-plugin-updates-report-002/src/site/site.xml
similarity index 100%
rename from src/it/it-plugin-updates-report-002/src/site/site.xml
rename to versions-maven-plugin/src/it/it-plugin-updates-report-002/src/site/site.xml
diff --git a/src/it/it-plugin-updates-report-002/verify.bsh b/versions-maven-plugin/src/it/it-plugin-updates-report-002/verify.bsh
similarity index 100%
rename from src/it/it-plugin-updates-report-002/verify.bsh
rename to versions-maven-plugin/src/it/it-plugin-updates-report-002/verify.bsh
diff --git a/src/it/it-plugin-updates-report-003/invoker.properties b/versions-maven-plugin/src/it/it-plugin-updates-report-003/invoker.properties
similarity index 100%
rename from src/it/it-plugin-updates-report-003/invoker.properties
rename to versions-maven-plugin/src/it/it-plugin-updates-report-003/invoker.properties
diff --git a/src/it/it-plugin-updates-report-003/pom.xml b/versions-maven-plugin/src/it/it-plugin-updates-report-003/pom.xml
similarity index 100%
rename from src/it/it-plugin-updates-report-003/pom.xml
rename to versions-maven-plugin/src/it/it-plugin-updates-report-003/pom.xml
diff --git a/src/it/it-plugin-updates-report-003/src/site/site.xml b/versions-maven-plugin/src/it/it-plugin-updates-report-003/src/site/site.xml
similarity index 100%
rename from src/it/it-plugin-updates-report-003/src/site/site.xml
rename to versions-maven-plugin/src/it/it-plugin-updates-report-003/src/site/site.xml
diff --git a/src/it/it-plugin-updates-report-003/verify.bsh b/versions-maven-plugin/src/it/it-plugin-updates-report-003/verify.bsh
similarity index 100%
rename from src/it/it-plugin-updates-report-003/verify.bsh
rename to versions-maven-plugin/src/it/it-plugin-updates-report-003/verify.bsh
diff --git a/src/it/it-plugin-updates-report-issue-684-001/invoker.properties b/versions-maven-plugin/src/it/it-plugin-updates-report-issue-684-001/invoker.properties
similarity index 100%
rename from src/it/it-plugin-updates-report-issue-684-001/invoker.properties
rename to versions-maven-plugin/src/it/it-plugin-updates-report-issue-684-001/invoker.properties
diff --git a/src/it/it-plugin-updates-report-issue-684-001/pom.xml b/versions-maven-plugin/src/it/it-plugin-updates-report-issue-684-001/pom.xml
similarity index 100%
rename from src/it/it-plugin-updates-report-issue-684-001/pom.xml
rename to versions-maven-plugin/src/it/it-plugin-updates-report-issue-684-001/pom.xml
diff --git a/src/it/it-plugin-updates-report-issue-684-001/verify.groovy b/versions-maven-plugin/src/it/it-plugin-updates-report-issue-684-001/verify.groovy
similarity index 100%
rename from src/it/it-plugin-updates-report-issue-684-001/verify.groovy
rename to versions-maven-plugin/src/it/it-plugin-updates-report-issue-684-001/verify.groovy
diff --git a/src/it/it-plugin-updates-report-issue-755/invoker.properties b/versions-maven-plugin/src/it/it-plugin-updates-report-issue-755/invoker.properties
similarity index 100%
rename from src/it/it-plugin-updates-report-issue-755/invoker.properties
rename to versions-maven-plugin/src/it/it-plugin-updates-report-issue-755/invoker.properties
diff --git a/src/it/it-plugin-updates-report-issue-755/pom.xml b/versions-maven-plugin/src/it/it-plugin-updates-report-issue-755/pom.xml
similarity index 100%
rename from src/it/it-plugin-updates-report-issue-755/pom.xml
rename to versions-maven-plugin/src/it/it-plugin-updates-report-issue-755/pom.xml
diff --git a/src/it/it-plugin-updates-report-issue-755/verify.groovy b/versions-maven-plugin/src/it/it-plugin-updates-report-issue-755/verify.groovy
similarity index 100%
rename from src/it/it-plugin-updates-report-issue-755/verify.groovy
rename to versions-maven-plugin/src/it/it-plugin-updates-report-issue-755/verify.groovy
diff --git a/src/it/it-property-updates-report-001/invoker.properties b/versions-maven-plugin/src/it/it-property-updates-report-001/invoker.properties
similarity index 100%
rename from src/it/it-property-updates-report-001/invoker.properties
rename to versions-maven-plugin/src/it/it-property-updates-report-001/invoker.properties
diff --git a/src/it/it-property-updates-report-001/pom.xml b/versions-maven-plugin/src/it/it-property-updates-report-001/pom.xml
similarity index 100%
rename from src/it/it-property-updates-report-001/pom.xml
rename to versions-maven-plugin/src/it/it-property-updates-report-001/pom.xml
diff --git a/src/it/it-property-updates-report-001/src/site/site.xml b/versions-maven-plugin/src/it/it-property-updates-report-001/src/site/site.xml
similarity index 100%
rename from src/it/it-property-updates-report-001/src/site/site.xml
rename to versions-maven-plugin/src/it/it-property-updates-report-001/src/site/site.xml
diff --git a/src/it/it-property-updates-report-001/verify.bsh b/versions-maven-plugin/src/it/it-property-updates-report-001/verify.bsh
similarity index 100%
rename from src/it/it-property-updates-report-001/verify.bsh
rename to versions-maven-plugin/src/it/it-property-updates-report-001/verify.bsh
diff --git a/src/it/it-property-updates-report-002-slow/invoker.properties b/versions-maven-plugin/src/it/it-property-updates-report-002-slow/invoker.properties
similarity index 100%
rename from src/it/it-property-updates-report-002-slow/invoker.properties
rename to versions-maven-plugin/src/it/it-property-updates-report-002-slow/invoker.properties
diff --git a/src/it/it-property-updates-report-002-slow/maven-version-rules.xml b/versions-maven-plugin/src/it/it-property-updates-report-002-slow/maven-version-rules.xml
similarity index 100%
rename from src/it/it-property-updates-report-002-slow/maven-version-rules.xml
rename to versions-maven-plugin/src/it/it-property-updates-report-002-slow/maven-version-rules.xml
diff --git a/src/it/it-property-updates-report-002-slow/pom.xml b/versions-maven-plugin/src/it/it-property-updates-report-002-slow/pom.xml
similarity index 100%
rename from src/it/it-property-updates-report-002-slow/pom.xml
rename to versions-maven-plugin/src/it/it-property-updates-report-002-slow/pom.xml
diff --git a/src/it/it-property-updates-report-issue-684-001/invoker.properties b/versions-maven-plugin/src/it/it-property-updates-report-issue-684-001/invoker.properties
similarity index 100%
rename from src/it/it-property-updates-report-issue-684-001/invoker.properties
rename to versions-maven-plugin/src/it/it-property-updates-report-issue-684-001/invoker.properties
diff --git a/src/it/it-property-updates-report-issue-684-001/pom.xml b/versions-maven-plugin/src/it/it-property-updates-report-issue-684-001/pom.xml
similarity index 100%
rename from src/it/it-property-updates-report-issue-684-001/pom.xml
rename to versions-maven-plugin/src/it/it-property-updates-report-issue-684-001/pom.xml
diff --git a/src/it/it-property-updates-report-issue-684-001/verify.groovy b/versions-maven-plugin/src/it/it-property-updates-report-issue-684-001/verify.groovy
similarity index 100%
rename from src/it/it-property-updates-report-issue-684-001/verify.groovy
rename to versions-maven-plugin/src/it/it-property-updates-report-issue-684-001/verify.groovy
diff --git a/src/it/it-resolve-ranges-001/invoker.properties b/versions-maven-plugin/src/it/it-resolve-ranges-001/invoker.properties
similarity index 100%
rename from src/it/it-resolve-ranges-001/invoker.properties
rename to versions-maven-plugin/src/it/it-resolve-ranges-001/invoker.properties
diff --git a/src/it/it-resolve-ranges-001/pom.xml b/versions-maven-plugin/src/it/it-resolve-ranges-001/pom.xml
similarity index 100%
rename from src/it/it-resolve-ranges-001/pom.xml
rename to versions-maven-plugin/src/it/it-resolve-ranges-001/pom.xml
diff --git a/src/it/it-resolve-ranges-001/verify.bsh b/versions-maven-plugin/src/it/it-resolve-ranges-001/verify.bsh
similarity index 100%
rename from src/it/it-resolve-ranges-001/verify.bsh
rename to versions-maven-plugin/src/it/it-resolve-ranges-001/verify.bsh
diff --git a/src/it/it-resolve-ranges-002/invoker.properties b/versions-maven-plugin/src/it/it-resolve-ranges-002/invoker.properties
similarity index 100%
rename from src/it/it-resolve-ranges-002/invoker.properties
rename to versions-maven-plugin/src/it/it-resolve-ranges-002/invoker.properties
diff --git a/src/it/it-resolve-ranges-002/pom.xml b/versions-maven-plugin/src/it/it-resolve-ranges-002/pom.xml
similarity index 100%
rename from src/it/it-resolve-ranges-002/pom.xml
rename to versions-maven-plugin/src/it/it-resolve-ranges-002/pom.xml
diff --git a/src/it/it-resolve-ranges-002/verify.bsh b/versions-maven-plugin/src/it/it-resolve-ranges-002/verify.bsh
similarity index 100%
rename from src/it/it-resolve-ranges-002/verify.bsh
rename to versions-maven-plugin/src/it/it-resolve-ranges-002/verify.bsh
diff --git a/src/it/it-resolve-ranges-003/child/pom.xml b/versions-maven-plugin/src/it/it-resolve-ranges-003/child/pom.xml
similarity index 100%
rename from src/it/it-resolve-ranges-003/child/pom.xml
rename to versions-maven-plugin/src/it/it-resolve-ranges-003/child/pom.xml
diff --git a/src/it/it-resolve-ranges-003/child2/pom.xml b/versions-maven-plugin/src/it/it-resolve-ranges-003/child2/pom.xml
similarity index 100%
rename from src/it/it-resolve-ranges-003/child2/pom.xml
rename to versions-maven-plugin/src/it/it-resolve-ranges-003/child2/pom.xml
diff --git a/src/it/it-resolve-ranges-003/invoker.properties b/versions-maven-plugin/src/it/it-resolve-ranges-003/invoker.properties
similarity index 100%
rename from src/it/it-resolve-ranges-003/invoker.properties
rename to versions-maven-plugin/src/it/it-resolve-ranges-003/invoker.properties
diff --git a/src/it/it-resolve-ranges-003/pom.xml b/versions-maven-plugin/src/it/it-resolve-ranges-003/pom.xml
similarity index 100%
rename from src/it/it-resolve-ranges-003/pom.xml
rename to versions-maven-plugin/src/it/it-resolve-ranges-003/pom.xml
diff --git a/src/it/it-resolve-ranges-003/verify.bsh b/versions-maven-plugin/src/it/it-resolve-ranges-003/verify.bsh
similarity index 100%
rename from src/it/it-resolve-ranges-003/verify.bsh
rename to versions-maven-plugin/src/it/it-resolve-ranges-003/verify.bsh
diff --git a/src/it/it-resolve-ranges-004/child/pom.xml b/versions-maven-plugin/src/it/it-resolve-ranges-004/child/pom.xml
similarity index 100%
rename from src/it/it-resolve-ranges-004/child/pom.xml
rename to versions-maven-plugin/src/it/it-resolve-ranges-004/child/pom.xml
diff --git a/src/it/it-resolve-ranges-004/invoker.properties b/versions-maven-plugin/src/it/it-resolve-ranges-004/invoker.properties
similarity index 100%
rename from src/it/it-resolve-ranges-004/invoker.properties
rename to versions-maven-plugin/src/it/it-resolve-ranges-004/invoker.properties
diff --git a/src/it/it-resolve-ranges-004/pom.xml b/versions-maven-plugin/src/it/it-resolve-ranges-004/pom.xml
similarity index 100%
rename from src/it/it-resolve-ranges-004/pom.xml
rename to versions-maven-plugin/src/it/it-resolve-ranges-004/pom.xml
diff --git a/src/it/it-resolve-ranges-004/verify.bsh b/versions-maven-plugin/src/it/it-resolve-ranges-004/verify.bsh
similarity index 100%
rename from src/it/it-resolve-ranges-004/verify.bsh
rename to versions-maven-plugin/src/it/it-resolve-ranges-004/verify.bsh
diff --git a/src/it/it-resolve-ranges-005/invoker.properties b/versions-maven-plugin/src/it/it-resolve-ranges-005/invoker.properties
similarity index 100%
rename from src/it/it-resolve-ranges-005/invoker.properties
rename to versions-maven-plugin/src/it/it-resolve-ranges-005/invoker.properties
diff --git a/src/it/it-resolve-ranges-005/pom.xml b/versions-maven-plugin/src/it/it-resolve-ranges-005/pom.xml
similarity index 100%
rename from src/it/it-resolve-ranges-005/pom.xml
rename to versions-maven-plugin/src/it/it-resolve-ranges-005/pom.xml
diff --git a/src/it/it-resolve-ranges-005/verify.bsh b/versions-maven-plugin/src/it/it-resolve-ranges-005/verify.bsh
similarity index 100%
rename from src/it/it-resolve-ranges-005/verify.bsh
rename to versions-maven-plugin/src/it/it-resolve-ranges-005/verify.bsh
diff --git a/src/it/it-resolve-ranges-006/invoker.properties b/versions-maven-plugin/src/it/it-resolve-ranges-006/invoker.properties
similarity index 100%
rename from src/it/it-resolve-ranges-006/invoker.properties
rename to versions-maven-plugin/src/it/it-resolve-ranges-006/invoker.properties
diff --git a/src/it/it-resolve-ranges-006/pom.xml b/versions-maven-plugin/src/it/it-resolve-ranges-006/pom.xml
similarity index 100%
rename from src/it/it-resolve-ranges-006/pom.xml
rename to versions-maven-plugin/src/it/it-resolve-ranges-006/pom.xml
diff --git a/src/it/it-resolve-ranges-006/verify.bsh b/versions-maven-plugin/src/it/it-resolve-ranges-006/verify.bsh
similarity index 100%
rename from src/it/it-resolve-ranges-006/verify.bsh
rename to versions-maven-plugin/src/it/it-resolve-ranges-006/verify.bsh
diff --git a/src/it/it-resolve-ranges-issue-442/invoker.properties b/versions-maven-plugin/src/it/it-resolve-ranges-issue-442/invoker.properties
similarity index 100%
rename from src/it/it-resolve-ranges-issue-442/invoker.properties
rename to versions-maven-plugin/src/it/it-resolve-ranges-issue-442/invoker.properties
diff --git a/src/it/it-resolve-ranges-issue-442/pom.xml b/versions-maven-plugin/src/it/it-resolve-ranges-issue-442/pom.xml
similarity index 100%
rename from src/it/it-resolve-ranges-issue-442/pom.xml
rename to versions-maven-plugin/src/it/it-resolve-ranges-issue-442/pom.xml
diff --git a/src/it/it-resolve-ranges-issue-442/verify.groovy b/versions-maven-plugin/src/it/it-resolve-ranges-issue-442/verify.groovy
similarity index 100%
rename from src/it/it-resolve-ranges-issue-442/verify.groovy
rename to versions-maven-plugin/src/it/it-resolve-ranges-issue-442/verify.groovy
diff --git a/src/it/it-resolve-ranges-issue-454/invoker.properties b/versions-maven-plugin/src/it/it-resolve-ranges-issue-454/invoker.properties
similarity index 100%
rename from src/it/it-resolve-ranges-issue-454/invoker.properties
rename to versions-maven-plugin/src/it/it-resolve-ranges-issue-454/invoker.properties
diff --git a/src/it/it-resolve-ranges-issue-454/pom.xml b/versions-maven-plugin/src/it/it-resolve-ranges-issue-454/pom.xml
similarity index 100%
rename from src/it/it-resolve-ranges-issue-454/pom.xml
rename to versions-maven-plugin/src/it/it-resolve-ranges-issue-454/pom.xml
diff --git a/src/it/it-resolve-ranges-issue-454/verify.groovy b/versions-maven-plugin/src/it/it-resolve-ranges-issue-454/verify.groovy
similarity index 100%
rename from src/it/it-resolve-ranges-issue-454/verify.groovy
rename to versions-maven-plugin/src/it/it-resolve-ranges-issue-454/verify.groovy
diff --git a/src/it/it-revert-isssue-265/aggregate/pom.xml b/versions-maven-plugin/src/it/it-revert-isssue-265/aggregate/pom.xml
similarity index 100%
rename from src/it/it-revert-isssue-265/aggregate/pom.xml
rename to versions-maven-plugin/src/it/it-revert-isssue-265/aggregate/pom.xml
diff --git a/src/it/it-revert-isssue-265/invoker.properties b/versions-maven-plugin/src/it/it-revert-isssue-265/invoker.properties
similarity index 100%
rename from src/it/it-revert-isssue-265/invoker.properties
rename to versions-maven-plugin/src/it/it-revert-isssue-265/invoker.properties
diff --git a/src/it/it-revert-isssue-265/module-a/pom.xml b/versions-maven-plugin/src/it/it-revert-isssue-265/module-a/pom.xml
similarity index 100%
rename from src/it/it-revert-isssue-265/module-a/pom.xml
rename to versions-maven-plugin/src/it/it-revert-isssue-265/module-a/pom.xml
diff --git a/src/it/it-revert-isssue-265/module-b/pom.xml b/versions-maven-plugin/src/it/it-revert-isssue-265/module-b/pom.xml
similarity index 100%
rename from src/it/it-revert-isssue-265/module-b/pom.xml
rename to versions-maven-plugin/src/it/it-revert-isssue-265/module-b/pom.xml
diff --git a/src/it/it-revert-isssue-265/verify.groovy b/versions-maven-plugin/src/it/it-revert-isssue-265/verify.groovy
similarity index 100%
rename from src/it/it-revert-isssue-265/verify.groovy
rename to versions-maven-plugin/src/it/it-revert-isssue-265/verify.groovy
diff --git a/src/it/it-rules-via-classpath-001/invoker.properties b/versions-maven-plugin/src/it/it-rules-via-classpath-001/invoker.properties
similarity index 100%
rename from src/it/it-rules-via-classpath-001/invoker.properties
rename to versions-maven-plugin/src/it/it-rules-via-classpath-001/invoker.properties
diff --git a/src/it/it-rules-via-classpath-001/pom.xml b/versions-maven-plugin/src/it/it-rules-via-classpath-001/pom.xml
similarity index 100%
rename from src/it/it-rules-via-classpath-001/pom.xml
rename to versions-maven-plugin/src/it/it-rules-via-classpath-001/pom.xml
diff --git a/src/it/it-rules-via-classpath-001/verify.bsh b/versions-maven-plugin/src/it/it-rules-via-classpath-001/verify.bsh
similarity index 100%
rename from src/it/it-rules-via-classpath-001/verify.bsh
rename to versions-maven-plugin/src/it/it-rules-via-classpath-001/verify.bsh
diff --git a/src/it/it-rules-via-classpath-002/invoker.properties b/versions-maven-plugin/src/it/it-rules-via-classpath-002/invoker.properties
similarity index 100%
rename from src/it/it-rules-via-classpath-002/invoker.properties
rename to versions-maven-plugin/src/it/it-rules-via-classpath-002/invoker.properties
diff --git a/src/it/it-rules-via-classpath-002/pom.xml b/versions-maven-plugin/src/it/it-rules-via-classpath-002/pom.xml
similarity index 100%
rename from src/it/it-rules-via-classpath-002/pom.xml
rename to versions-maven-plugin/src/it/it-rules-via-classpath-002/pom.xml
diff --git a/src/it/it-rules-via-classpath-002/verify.bsh b/versions-maven-plugin/src/it/it-rules-via-classpath-002/verify.bsh
similarity index 100%
rename from src/it/it-rules-via-classpath-002/verify.bsh
rename to versions-maven-plugin/src/it/it-rules-via-classpath-002/verify.bsh
diff --git a/src/it/it-rules-via-classpath-003/invoker.properties b/versions-maven-plugin/src/it/it-rules-via-classpath-003/invoker.properties
similarity index 100%
rename from src/it/it-rules-via-classpath-003/invoker.properties
rename to versions-maven-plugin/src/it/it-rules-via-classpath-003/invoker.properties
diff --git a/src/it/it-rules-via-classpath-003/pom.xml b/versions-maven-plugin/src/it/it-rules-via-classpath-003/pom.xml
similarity index 100%
rename from src/it/it-rules-via-classpath-003/pom.xml
rename to versions-maven-plugin/src/it/it-rules-via-classpath-003/pom.xml
diff --git a/src/it/it-rules-via-classpath-003/verify.bsh b/versions-maven-plugin/src/it/it-rules-via-classpath-003/verify.bsh
similarity index 100%
rename from src/it/it-rules-via-classpath-003/verify.bsh
rename to versions-maven-plugin/src/it/it-rules-via-classpath-003/verify.bsh
diff --git a/src/it/it-set-001-issue-76/invoker.properties b/versions-maven-plugin/src/it/it-set-001-issue-76/invoker.properties
similarity index 100%
rename from src/it/it-set-001-issue-76/invoker.properties
rename to versions-maven-plugin/src/it/it-set-001-issue-76/invoker.properties
diff --git a/src/it/it-set-001-issue-76/pom.xml b/versions-maven-plugin/src/it/it-set-001-issue-76/pom.xml
similarity index 100%
rename from src/it/it-set-001-issue-76/pom.xml
rename to versions-maven-plugin/src/it/it-set-001-issue-76/pom.xml
diff --git a/src/it/it-set-001-issue-76/verify.groovy b/versions-maven-plugin/src/it/it-set-001-issue-76/verify.groovy
similarity index 100%
rename from src/it/it-set-001-issue-76/verify.groovy
rename to versions-maven-plugin/src/it/it-set-001-issue-76/verify.groovy
diff --git a/src/it/it-set-001/invoker.properties b/versions-maven-plugin/src/it/it-set-001/invoker.properties
similarity index 100%
rename from src/it/it-set-001/invoker.properties
rename to versions-maven-plugin/src/it/it-set-001/invoker.properties
diff --git a/src/it/it-set-001/pom.xml b/versions-maven-plugin/src/it/it-set-001/pom.xml
similarity index 100%
rename from src/it/it-set-001/pom.xml
rename to versions-maven-plugin/src/it/it-set-001/pom.xml
diff --git a/src/it/it-set-001/verify.bsh b/versions-maven-plugin/src/it/it-set-001/verify.bsh
similarity index 100%
rename from src/it/it-set-001/verify.bsh
rename to versions-maven-plugin/src/it/it-set-001/verify.bsh
diff --git a/src/it/it-set-002/child/pom.xml b/versions-maven-plugin/src/it/it-set-002/child/pom.xml
similarity index 100%
rename from src/it/it-set-002/child/pom.xml
rename to versions-maven-plugin/src/it/it-set-002/child/pom.xml
diff --git a/src/it/it-set-002/invoker.properties b/versions-maven-plugin/src/it/it-set-002/invoker.properties
similarity index 100%
rename from src/it/it-set-002/invoker.properties
rename to versions-maven-plugin/src/it/it-set-002/invoker.properties
diff --git a/src/it/it-set-002/pom.xml b/versions-maven-plugin/src/it/it-set-002/pom.xml
similarity index 100%
rename from src/it/it-set-002/pom.xml
rename to versions-maven-plugin/src/it/it-set-002/pom.xml
diff --git a/src/it/it-set-002/verify.bsh b/versions-maven-plugin/src/it/it-set-002/verify.bsh
similarity index 100%
rename from src/it/it-set-002/verify.bsh
rename to versions-maven-plugin/src/it/it-set-002/verify.bsh
diff --git a/src/it/it-set-003/child/pom.xml b/versions-maven-plugin/src/it/it-set-003/child/pom.xml
similarity index 100%
rename from src/it/it-set-003/child/pom.xml
rename to versions-maven-plugin/src/it/it-set-003/child/pom.xml
diff --git a/src/it/it-set-003/child2/pom.xml b/versions-maven-plugin/src/it/it-set-003/child2/pom.xml
similarity index 100%
rename from src/it/it-set-003/child2/pom.xml
rename to versions-maven-plugin/src/it/it-set-003/child2/pom.xml
diff --git a/src/it/it-set-003/invoker.properties b/versions-maven-plugin/src/it/it-set-003/invoker.properties
similarity index 100%
rename from src/it/it-set-003/invoker.properties
rename to versions-maven-plugin/src/it/it-set-003/invoker.properties
diff --git a/src/it/it-set-003/pom.xml b/versions-maven-plugin/src/it/it-set-003/pom.xml
similarity index 100%
rename from src/it/it-set-003/pom.xml
rename to versions-maven-plugin/src/it/it-set-003/pom.xml
diff --git a/src/it/it-set-003/verify.bsh b/versions-maven-plugin/src/it/it-set-003/verify.bsh
similarity index 100%
rename from src/it/it-set-003/verify.bsh
rename to versions-maven-plugin/src/it/it-set-003/verify.bsh
diff --git a/src/it/it-set-004/invoker.properties b/versions-maven-plugin/src/it/it-set-004/invoker.properties
similarity index 100%
rename from src/it/it-set-004/invoker.properties
rename to versions-maven-plugin/src/it/it-set-004/invoker.properties
diff --git a/src/it/it-set-004/pom.xml b/versions-maven-plugin/src/it/it-set-004/pom.xml
similarity index 100%
rename from src/it/it-set-004/pom.xml
rename to versions-maven-plugin/src/it/it-set-004/pom.xml
diff --git a/src/it/it-set-004/verify.bsh b/versions-maven-plugin/src/it/it-set-004/verify.bsh
similarity index 100%
rename from src/it/it-set-004/verify.bsh
rename to versions-maven-plugin/src/it/it-set-004/verify.bsh
diff --git a/src/it/it-set-005/invoker.properties b/versions-maven-plugin/src/it/it-set-005/invoker.properties
similarity index 100%
rename from src/it/it-set-005/invoker.properties
rename to versions-maven-plugin/src/it/it-set-005/invoker.properties
diff --git a/src/it/it-set-005/module-a1/pom.xml b/versions-maven-plugin/src/it/it-set-005/module-a1/pom.xml
similarity index 100%
rename from src/it/it-set-005/module-a1/pom.xml
rename to versions-maven-plugin/src/it/it-set-005/module-a1/pom.xml
diff --git a/src/it/it-set-005/module-a2/pom.xml b/versions-maven-plugin/src/it/it-set-005/module-a2/pom.xml
similarity index 100%
rename from src/it/it-set-005/module-a2/pom.xml
rename to versions-maven-plugin/src/it/it-set-005/module-a2/pom.xml
diff --git a/src/it/it-set-005/pom.xml b/versions-maven-plugin/src/it/it-set-005/pom.xml
similarity index 100%
rename from src/it/it-set-005/pom.xml
rename to versions-maven-plugin/src/it/it-set-005/pom.xml
diff --git a/src/it/it-set-005/verify.bsh b/versions-maven-plugin/src/it/it-set-005/verify.bsh
similarity index 100%
rename from src/it/it-set-005/verify.bsh
rename to versions-maven-plugin/src/it/it-set-005/verify.bsh
diff --git a/src/it/it-set-006/invoker.properties b/versions-maven-plugin/src/it/it-set-006/invoker.properties
similarity index 100%
rename from src/it/it-set-006/invoker.properties
rename to versions-maven-plugin/src/it/it-set-006/invoker.properties
diff --git a/src/it/it-set-006/module-a1/pom.xml b/versions-maven-plugin/src/it/it-set-006/module-a1/pom.xml
similarity index 100%
rename from src/it/it-set-006/module-a1/pom.xml
rename to versions-maven-plugin/src/it/it-set-006/module-a1/pom.xml
diff --git a/src/it/it-set-006/module-a2/pom.xml b/versions-maven-plugin/src/it/it-set-006/module-a2/pom.xml
similarity index 100%
rename from src/it/it-set-006/module-a2/pom.xml
rename to versions-maven-plugin/src/it/it-set-006/module-a2/pom.xml
diff --git a/src/it/it-set-006/module-a3/pom.xml b/versions-maven-plugin/src/it/it-set-006/module-a3/pom.xml
similarity index 100%
rename from src/it/it-set-006/module-a3/pom.xml
rename to versions-maven-plugin/src/it/it-set-006/module-a3/pom.xml
diff --git a/src/it/it-set-006/pom.xml b/versions-maven-plugin/src/it/it-set-006/pom.xml
similarity index 100%
rename from src/it/it-set-006/pom.xml
rename to versions-maven-plugin/src/it/it-set-006/pom.xml
diff --git a/src/it/it-set-006/verify.bsh b/versions-maven-plugin/src/it/it-set-006/verify.bsh
similarity index 100%
rename from src/it/it-set-006/verify.bsh
rename to versions-maven-plugin/src/it/it-set-006/verify.bsh
diff --git a/src/it/it-set-007/invoker.properties b/versions-maven-plugin/src/it/it-set-007/invoker.properties
similarity index 100%
rename from src/it/it-set-007/invoker.properties
rename to versions-maven-plugin/src/it/it-set-007/invoker.properties
diff --git a/src/it/it-set-007/module-a1/pom.xml b/versions-maven-plugin/src/it/it-set-007/module-a1/pom.xml
similarity index 100%
rename from src/it/it-set-007/module-a1/pom.xml
rename to versions-maven-plugin/src/it/it-set-007/module-a1/pom.xml
diff --git a/src/it/it-set-007/module-a2/pom.xml b/versions-maven-plugin/src/it/it-set-007/module-a2/pom.xml
similarity index 100%
rename from src/it/it-set-007/module-a2/pom.xml
rename to versions-maven-plugin/src/it/it-set-007/module-a2/pom.xml
diff --git a/src/it/it-set-007/pom.xml b/versions-maven-plugin/src/it/it-set-007/pom.xml
similarity index 100%
rename from src/it/it-set-007/pom.xml
rename to versions-maven-plugin/src/it/it-set-007/pom.xml
diff --git a/src/it/it-set-007/verify.bsh b/versions-maven-plugin/src/it/it-set-007/verify.bsh
similarity index 100%
rename from src/it/it-set-007/verify.bsh
rename to versions-maven-plugin/src/it/it-set-007/verify.bsh
diff --git a/src/it/it-set-008/invoker.properties b/versions-maven-plugin/src/it/it-set-008/invoker.properties
similarity index 100%
rename from src/it/it-set-008/invoker.properties
rename to versions-maven-plugin/src/it/it-set-008/invoker.properties
diff --git a/src/it/it-set-008/module-a1/module-b1/pom.xml b/versions-maven-plugin/src/it/it-set-008/module-a1/module-b1/pom.xml
similarity index 100%
rename from src/it/it-set-008/module-a1/module-b1/pom.xml
rename to versions-maven-plugin/src/it/it-set-008/module-a1/module-b1/pom.xml
diff --git a/src/it/it-set-008/module-a1/module-b2/pom.xml b/versions-maven-plugin/src/it/it-set-008/module-a1/module-b2/pom.xml
similarity index 100%
rename from src/it/it-set-008/module-a1/module-b2/pom.xml
rename to versions-maven-plugin/src/it/it-set-008/module-a1/module-b2/pom.xml
diff --git a/src/it/it-set-008/module-a1/module-b3/pom.xml b/versions-maven-plugin/src/it/it-set-008/module-a1/module-b3/pom.xml
similarity index 100%
rename from src/it/it-set-008/module-a1/module-b3/pom.xml
rename to versions-maven-plugin/src/it/it-set-008/module-a1/module-b3/pom.xml
diff --git a/src/it/it-set-008/module-a1/pom.xml b/versions-maven-plugin/src/it/it-set-008/module-a1/pom.xml
similarity index 100%
rename from src/it/it-set-008/module-a1/pom.xml
rename to versions-maven-plugin/src/it/it-set-008/module-a1/pom.xml
diff --git a/src/it/it-set-008/module-a2/pom.xml b/versions-maven-plugin/src/it/it-set-008/module-a2/pom.xml
similarity index 100%
rename from src/it/it-set-008/module-a2/pom.xml
rename to versions-maven-plugin/src/it/it-set-008/module-a2/pom.xml
diff --git a/src/it/it-set-008/pom.xml b/versions-maven-plugin/src/it/it-set-008/pom.xml
similarity index 100%
rename from src/it/it-set-008/pom.xml
rename to versions-maven-plugin/src/it/it-set-008/pom.xml
diff --git a/src/it/it-set-008/verify.groovy b/versions-maven-plugin/src/it/it-set-008/verify.groovy
similarity index 100%
rename from src/it/it-set-008/verify.groovy
rename to versions-maven-plugin/src/it/it-set-008/verify.groovy
diff --git a/src/it/it-set-009/alternative-pom.xml b/versions-maven-plugin/src/it/it-set-009/alternative-pom.xml
similarity index 100%
rename from src/it/it-set-009/alternative-pom.xml
rename to versions-maven-plugin/src/it/it-set-009/alternative-pom.xml
diff --git a/src/it/it-set-009/child/pom.xml b/versions-maven-plugin/src/it/it-set-009/child/pom.xml
similarity index 100%
rename from src/it/it-set-009/child/pom.xml
rename to versions-maven-plugin/src/it/it-set-009/child/pom.xml
diff --git a/src/it/it-set-009/invoker.properties b/versions-maven-plugin/src/it/it-set-009/invoker.properties
similarity index 100%
rename from src/it/it-set-009/invoker.properties
rename to versions-maven-plugin/src/it/it-set-009/invoker.properties
diff --git a/src/it/it-set-009/verify.groovy b/versions-maven-plugin/src/it/it-set-009/verify.groovy
similarity index 100%
rename from src/it/it-set-009/verify.groovy
rename to versions-maven-plugin/src/it/it-set-009/verify.groovy
diff --git a/src/it/it-set-010-issue-198/fake-api/pom.xml b/versions-maven-plugin/src/it/it-set-010-issue-198/fake-api/pom.xml
similarity index 100%
rename from src/it/it-set-010-issue-198/fake-api/pom.xml
rename to versions-maven-plugin/src/it/it-set-010-issue-198/fake-api/pom.xml
diff --git a/src/it/it-set-010-issue-198/fake-api/src/main/java/org/eclipse/jetty/App.java b/versions-maven-plugin/src/it/it-set-010-issue-198/fake-api/src/main/java/org/eclipse/jetty/App.java
similarity index 100%
rename from src/it/it-set-010-issue-198/fake-api/src/main/java/org/eclipse/jetty/App.java
rename to versions-maven-plugin/src/it/it-set-010-issue-198/fake-api/src/main/java/org/eclipse/jetty/App.java
diff --git a/src/it/it-set-010-issue-198/fake-api/src/test/java/org/eclipse/jetty/AppTest.java b/versions-maven-plugin/src/it/it-set-010-issue-198/fake-api/src/test/java/org/eclipse/jetty/AppTest.java
similarity index 100%
rename from src/it/it-set-010-issue-198/fake-api/src/test/java/org/eclipse/jetty/AppTest.java
rename to versions-maven-plugin/src/it/it-set-010-issue-198/fake-api/src/test/java/org/eclipse/jetty/AppTest.java
diff --git a/src/it/it-set-010-issue-198/invoker.properties b/versions-maven-plugin/src/it/it-set-010-issue-198/invoker.properties
similarity index 100%
rename from src/it/it-set-010-issue-198/invoker.properties
rename to versions-maven-plugin/src/it/it-set-010-issue-198/invoker.properties
diff --git a/src/it/it-set-010-issue-198/pom.xml b/versions-maven-plugin/src/it/it-set-010-issue-198/pom.xml
similarity index 100%
rename from src/it/it-set-010-issue-198/pom.xml
rename to versions-maven-plugin/src/it/it-set-010-issue-198/pom.xml
diff --git a/src/it/it-set-010-issue-198/the-bom/pom.xml b/versions-maven-plugin/src/it/it-set-010-issue-198/the-bom/pom.xml
similarity index 100%
rename from src/it/it-set-010-issue-198/the-bom/pom.xml
rename to versions-maven-plugin/src/it/it-set-010-issue-198/the-bom/pom.xml
diff --git a/src/it/it-set-010-issue-198/verify.groovy b/versions-maven-plugin/src/it/it-set-010-issue-198/verify.groovy
similarity index 100%
rename from src/it/it-set-010-issue-198/verify.groovy
rename to versions-maven-plugin/src/it/it-set-010-issue-198/verify.groovy
diff --git a/src/it/it-set-010/invoker.properties b/versions-maven-plugin/src/it/it-set-010/invoker.properties
similarity index 100%
rename from src/it/it-set-010/invoker.properties
rename to versions-maven-plugin/src/it/it-set-010/invoker.properties
diff --git a/src/it/it-set-010/pom.xml b/versions-maven-plugin/src/it/it-set-010/pom.xml
similarity index 100%
rename from src/it/it-set-010/pom.xml
rename to versions-maven-plugin/src/it/it-set-010/pom.xml
diff --git a/src/it/it-set-010/verify.bsh b/versions-maven-plugin/src/it/it-set-010/verify.bsh
similarity index 100%
rename from src/it/it-set-010/verify.bsh
rename to versions-maven-plugin/src/it/it-set-010/verify.bsh
diff --git a/src/it/it-set-011/child/pom.xml b/versions-maven-plugin/src/it/it-set-011/child/pom.xml
similarity index 100%
rename from src/it/it-set-011/child/pom.xml
rename to versions-maven-plugin/src/it/it-set-011/child/pom.xml
diff --git a/src/it/it-set-011/invoker.properties b/versions-maven-plugin/src/it/it-set-011/invoker.properties
similarity index 100%
rename from src/it/it-set-011/invoker.properties
rename to versions-maven-plugin/src/it/it-set-011/invoker.properties
diff --git a/src/it/it-set-011/pom.xml b/versions-maven-plugin/src/it/it-set-011/pom.xml
similarity index 100%
rename from src/it/it-set-011/pom.xml
rename to versions-maven-plugin/src/it/it-set-011/pom.xml
diff --git a/src/it/it-set-011/verify.bsh b/versions-maven-plugin/src/it/it-set-011/verify.bsh
similarity index 100%
rename from src/it/it-set-011/verify.bsh
rename to versions-maven-plugin/src/it/it-set-011/verify.bsh
diff --git a/src/it/it-set-012/invoker.properties b/versions-maven-plugin/src/it/it-set-012/invoker.properties
similarity index 100%
rename from src/it/it-set-012/invoker.properties
rename to versions-maven-plugin/src/it/it-set-012/invoker.properties
diff --git a/src/it/it-set-012/pom.xml b/versions-maven-plugin/src/it/it-set-012/pom.xml
similarity index 100%
rename from src/it/it-set-012/pom.xml
rename to versions-maven-plugin/src/it/it-set-012/pom.xml
diff --git a/src/it/it-set-012/verify.bsh b/versions-maven-plugin/src/it/it-set-012/verify.bsh
similarity index 100%
rename from src/it/it-set-012/verify.bsh
rename to versions-maven-plugin/src/it/it-set-012/verify.bsh
diff --git a/src/it/it-set-013/invoker.properties b/versions-maven-plugin/src/it/it-set-013/invoker.properties
similarity index 100%
rename from src/it/it-set-013/invoker.properties
rename to versions-maven-plugin/src/it/it-set-013/invoker.properties
diff --git a/src/it/it-set-013/pom.xml b/versions-maven-plugin/src/it/it-set-013/pom.xml
similarity index 100%
rename from src/it/it-set-013/pom.xml
rename to versions-maven-plugin/src/it/it-set-013/pom.xml
diff --git a/src/it/it-set-013/verify.bsh b/versions-maven-plugin/src/it/it-set-013/verify.bsh
similarity index 100%
rename from src/it/it-set-013/verify.bsh
rename to versions-maven-plugin/src/it/it-set-013/verify.bsh
diff --git a/src/it/it-set-014/invoker.properties b/versions-maven-plugin/src/it/it-set-014/invoker.properties
similarity index 100%
rename from src/it/it-set-014/invoker.properties
rename to versions-maven-plugin/src/it/it-set-014/invoker.properties
diff --git a/src/it/it-set-014/pom.xml b/versions-maven-plugin/src/it/it-set-014/pom.xml
similarity index 100%
rename from src/it/it-set-014/pom.xml
rename to versions-maven-plugin/src/it/it-set-014/pom.xml
diff --git a/src/it/it-set-014/verify.bsh b/versions-maven-plugin/src/it/it-set-014/verify.bsh
similarity index 100%
rename from src/it/it-set-014/verify.bsh
rename to versions-maven-plugin/src/it/it-set-014/verify.bsh
diff --git a/src/it/it-set-015/invoker.properties b/versions-maven-plugin/src/it/it-set-015/invoker.properties
similarity index 100%
rename from src/it/it-set-015/invoker.properties
rename to versions-maven-plugin/src/it/it-set-015/invoker.properties
diff --git a/src/it/it-set-015/pom.xml b/versions-maven-plugin/src/it/it-set-015/pom.xml
similarity index 100%
rename from src/it/it-set-015/pom.xml
rename to versions-maven-plugin/src/it/it-set-015/pom.xml
diff --git a/src/it/it-set-015/verify.bsh b/versions-maven-plugin/src/it/it-set-015/verify.bsh
similarity index 100%
rename from src/it/it-set-015/verify.bsh
rename to versions-maven-plugin/src/it/it-set-015/verify.bsh
diff --git a/src/it/it-set-016/child/pom.xml b/versions-maven-plugin/src/it/it-set-016/child/pom.xml
similarity index 100%
rename from src/it/it-set-016/child/pom.xml
rename to versions-maven-plugin/src/it/it-set-016/child/pom.xml
diff --git a/src/it/it-set-016/invoker.properties b/versions-maven-plugin/src/it/it-set-016/invoker.properties
similarity index 100%
rename from src/it/it-set-016/invoker.properties
rename to versions-maven-plugin/src/it/it-set-016/invoker.properties
diff --git a/src/it/it-set-016/pom.xml b/versions-maven-plugin/src/it/it-set-016/pom.xml
similarity index 100%
rename from src/it/it-set-016/pom.xml
rename to versions-maven-plugin/src/it/it-set-016/pom.xml
diff --git a/src/it/it-set-016/verify.bsh b/versions-maven-plugin/src/it/it-set-016/verify.bsh
similarity index 100%
rename from src/it/it-set-016/verify.bsh
rename to versions-maven-plugin/src/it/it-set-016/verify.bsh
diff --git a/src/it/it-set-017-issue-321/invoker.properties b/versions-maven-plugin/src/it/it-set-017-issue-321/invoker.properties
similarity index 100%
rename from src/it/it-set-017-issue-321/invoker.properties
rename to versions-maven-plugin/src/it/it-set-017-issue-321/invoker.properties
diff --git a/src/it/it-set-017-issue-321/module-a1/pom.xml b/versions-maven-plugin/src/it/it-set-017-issue-321/module-a1/pom.xml
similarity index 100%
rename from src/it/it-set-017-issue-321/module-a1/pom.xml
rename to versions-maven-plugin/src/it/it-set-017-issue-321/module-a1/pom.xml
diff --git a/src/it/it-set-017-issue-321/module-a2/pom.xml b/versions-maven-plugin/src/it/it-set-017-issue-321/module-a2/pom.xml
similarity index 100%
rename from src/it/it-set-017-issue-321/module-a2/pom.xml
rename to versions-maven-plugin/src/it/it-set-017-issue-321/module-a2/pom.xml
diff --git a/src/it/it-set-017-issue-321/pom.xml b/versions-maven-plugin/src/it/it-set-017-issue-321/pom.xml
similarity index 100%
rename from src/it/it-set-017-issue-321/pom.xml
rename to versions-maven-plugin/src/it/it-set-017-issue-321/pom.xml
diff --git a/src/it/it-set-017-issue-321/verify.bsh b/versions-maven-plugin/src/it/it-set-017-issue-321/verify.bsh
similarity index 100%
rename from src/it/it-set-017-issue-321/verify.bsh
rename to versions-maven-plugin/src/it/it-set-017-issue-321/verify.bsh
diff --git a/src/it/it-set-018-issue-82/invoker.properties b/versions-maven-plugin/src/it/it-set-018-issue-82/invoker.properties
similarity index 100%
rename from src/it/it-set-018-issue-82/invoker.properties
rename to versions-maven-plugin/src/it/it-set-018-issue-82/invoker.properties
diff --git a/src/it/it-set-018-issue-82/module-a1/module-b1/pom.xml b/versions-maven-plugin/src/it/it-set-018-issue-82/module-a1/module-b1/pom.xml
similarity index 100%
rename from src/it/it-set-018-issue-82/module-a1/module-b1/pom.xml
rename to versions-maven-plugin/src/it/it-set-018-issue-82/module-a1/module-b1/pom.xml
diff --git a/src/it/it-set-018-issue-82/module-a1/module-b2/pom.xml b/versions-maven-plugin/src/it/it-set-018-issue-82/module-a1/module-b2/pom.xml
similarity index 100%
rename from src/it/it-set-018-issue-82/module-a1/module-b2/pom.xml
rename to versions-maven-plugin/src/it/it-set-018-issue-82/module-a1/module-b2/pom.xml
diff --git a/src/it/it-set-018-issue-82/module-a1/module-b3/pom.xml b/versions-maven-plugin/src/it/it-set-018-issue-82/module-a1/module-b3/pom.xml
similarity index 100%
rename from src/it/it-set-018-issue-82/module-a1/module-b3/pom.xml
rename to versions-maven-plugin/src/it/it-set-018-issue-82/module-a1/module-b3/pom.xml
diff --git a/src/it/it-set-018-issue-82/module-a1/pom.xml b/versions-maven-plugin/src/it/it-set-018-issue-82/module-a1/pom.xml
similarity index 100%
rename from src/it/it-set-018-issue-82/module-a1/pom.xml
rename to versions-maven-plugin/src/it/it-set-018-issue-82/module-a1/pom.xml
diff --git a/src/it/it-set-018-issue-82/module-a2/pom.xml b/versions-maven-plugin/src/it/it-set-018-issue-82/module-a2/pom.xml
similarity index 100%
rename from src/it/it-set-018-issue-82/module-a2/pom.xml
rename to versions-maven-plugin/src/it/it-set-018-issue-82/module-a2/pom.xml
diff --git a/src/it/it-set-018-issue-82/pom.xml b/versions-maven-plugin/src/it/it-set-018-issue-82/pom.xml
similarity index 100%
rename from src/it/it-set-018-issue-82/pom.xml
rename to versions-maven-plugin/src/it/it-set-018-issue-82/pom.xml
diff --git a/src/it/it-set-018-issue-82/verify.groovy b/versions-maven-plugin/src/it/it-set-018-issue-82/verify.groovy
similarity index 100%
rename from src/it/it-set-018-issue-82/verify.groovy
rename to versions-maven-plugin/src/it/it-set-018-issue-82/verify.groovy
diff --git a/src/it/it-set-019-issue-426/invoker.properties b/versions-maven-plugin/src/it/it-set-019-issue-426/invoker.properties
similarity index 100%
rename from src/it/it-set-019-issue-426/invoker.properties
rename to versions-maven-plugin/src/it/it-set-019-issue-426/invoker.properties
diff --git a/src/it/it-set-019-issue-426/module-a1/module-b1/pom.xml b/versions-maven-plugin/src/it/it-set-019-issue-426/module-a1/module-b1/pom.xml
similarity index 100%
rename from src/it/it-set-019-issue-426/module-a1/module-b1/pom.xml
rename to versions-maven-plugin/src/it/it-set-019-issue-426/module-a1/module-b1/pom.xml
diff --git a/src/it/it-set-019-issue-426/module-a1/module-b2/pom.xml b/versions-maven-plugin/src/it/it-set-019-issue-426/module-a1/module-b2/pom.xml
similarity index 100%
rename from src/it/it-set-019-issue-426/module-a1/module-b2/pom.xml
rename to versions-maven-plugin/src/it/it-set-019-issue-426/module-a1/module-b2/pom.xml
diff --git a/src/it/it-set-019-issue-426/module-a1/module-b3/pom.xml b/versions-maven-plugin/src/it/it-set-019-issue-426/module-a1/module-b3/pom.xml
similarity index 100%
rename from src/it/it-set-019-issue-426/module-a1/module-b3/pom.xml
rename to versions-maven-plugin/src/it/it-set-019-issue-426/module-a1/module-b3/pom.xml
diff --git a/src/it/it-set-019-issue-426/module-a1/pom.xml b/versions-maven-plugin/src/it/it-set-019-issue-426/module-a1/pom.xml
similarity index 100%
rename from src/it/it-set-019-issue-426/module-a1/pom.xml
rename to versions-maven-plugin/src/it/it-set-019-issue-426/module-a1/pom.xml
diff --git a/src/it/it-set-019-issue-426/module-a2/pom.xml b/versions-maven-plugin/src/it/it-set-019-issue-426/module-a2/pom.xml
similarity index 100%
rename from src/it/it-set-019-issue-426/module-a2/pom.xml
rename to versions-maven-plugin/src/it/it-set-019-issue-426/module-a2/pom.xml
diff --git a/src/it/it-set-019-issue-426/pom.xml b/versions-maven-plugin/src/it/it-set-019-issue-426/pom.xml
similarity index 100%
rename from src/it/it-set-019-issue-426/pom.xml
rename to versions-maven-plugin/src/it/it-set-019-issue-426/pom.xml
diff --git a/src/it/it-set-019-issue-426/verify.groovy b/versions-maven-plugin/src/it/it-set-019-issue-426/verify.groovy
similarity index 100%
rename from src/it/it-set-019-issue-426/verify.groovy
rename to versions-maven-plugin/src/it/it-set-019-issue-426/verify.groovy
diff --git a/src/it/it-set-019-outputTimestamp/invoker.properties b/versions-maven-plugin/src/it/it-set-019-outputTimestamp/invoker.properties
similarity index 100%
rename from src/it/it-set-019-outputTimestamp/invoker.properties
rename to versions-maven-plugin/src/it/it-set-019-outputTimestamp/invoker.properties
diff --git a/src/it/it-set-019-outputTimestamp/pom.xml b/versions-maven-plugin/src/it/it-set-019-outputTimestamp/pom.xml
similarity index 100%
rename from src/it/it-set-019-outputTimestamp/pom.xml
rename to versions-maven-plugin/src/it/it-set-019-outputTimestamp/pom.xml
diff --git a/src/it/it-set-019-outputTimestamp/verify.groovy b/versions-maven-plugin/src/it/it-set-019-outputTimestamp/verify.groovy
similarity index 100%
rename from src/it/it-set-019-outputTimestamp/verify.groovy
rename to versions-maven-plugin/src/it/it-set-019-outputTimestamp/verify.groovy
diff --git a/src/it/it-set-020-outputTimestamp-disabled/invoker.properties b/versions-maven-plugin/src/it/it-set-020-outputTimestamp-disabled/invoker.properties
similarity index 100%
rename from src/it/it-set-020-outputTimestamp-disabled/invoker.properties
rename to versions-maven-plugin/src/it/it-set-020-outputTimestamp-disabled/invoker.properties
diff --git a/src/it/it-set-020-outputTimestamp-disabled/pom.xml b/versions-maven-plugin/src/it/it-set-020-outputTimestamp-disabled/pom.xml
similarity index 100%
rename from src/it/it-set-020-outputTimestamp-disabled/pom.xml
rename to versions-maven-plugin/src/it/it-set-020-outputTimestamp-disabled/pom.xml
diff --git a/src/it/it-set-020-outputTimestamp-disabled/verify.groovy b/versions-maven-plugin/src/it/it-set-020-outputTimestamp-disabled/verify.groovy
similarity index 100%
rename from src/it/it-set-020-outputTimestamp-disabled/verify.groovy
rename to versions-maven-plugin/src/it/it-set-020-outputTimestamp-disabled/verify.groovy
diff --git a/src/it/it-set-021-outputTimestampPolicy-always/invoker.properties b/versions-maven-plugin/src/it/it-set-021-outputTimestampPolicy-always/invoker.properties
similarity index 100%
rename from src/it/it-set-021-outputTimestampPolicy-always/invoker.properties
rename to versions-maven-plugin/src/it/it-set-021-outputTimestampPolicy-always/invoker.properties
diff --git a/src/it/it-set-021-outputTimestampPolicy-always/pom.xml b/versions-maven-plugin/src/it/it-set-021-outputTimestampPolicy-always/pom.xml
similarity index 100%
rename from src/it/it-set-021-outputTimestampPolicy-always/pom.xml
rename to versions-maven-plugin/src/it/it-set-021-outputTimestampPolicy-always/pom.xml
diff --git a/src/it/it-set-021-outputTimestampPolicy-always/verify.groovy b/versions-maven-plugin/src/it/it-set-021-outputTimestampPolicy-always/verify.groovy
similarity index 100%
rename from src/it/it-set-021-outputTimestampPolicy-always/verify.groovy
rename to versions-maven-plugin/src/it/it-set-021-outputTimestampPolicy-always/verify.groovy
diff --git a/src/it/it-set-022-outputTimestampPolicy-onchange/invoker.properties b/versions-maven-plugin/src/it/it-set-022-outputTimestampPolicy-onchange/invoker.properties
similarity index 100%
rename from src/it/it-set-022-outputTimestampPolicy-onchange/invoker.properties
rename to versions-maven-plugin/src/it/it-set-022-outputTimestampPolicy-onchange/invoker.properties
diff --git a/src/it/it-set-022-outputTimestampPolicy-onchange/pom.xml b/versions-maven-plugin/src/it/it-set-022-outputTimestampPolicy-onchange/pom.xml
similarity index 100%
rename from src/it/it-set-022-outputTimestampPolicy-onchange/pom.xml
rename to versions-maven-plugin/src/it/it-set-022-outputTimestampPolicy-onchange/pom.xml
diff --git a/src/it/it-set-022-outputTimestampPolicy-onchange/verify.groovy b/versions-maven-plugin/src/it/it-set-022-outputTimestampPolicy-onchange/verify.groovy
similarity index 100%
rename from src/it/it-set-022-outputTimestampPolicy-onchange/verify.groovy
rename to versions-maven-plugin/src/it/it-set-022-outputTimestampPolicy-onchange/verify.groovy
diff --git a/src/it/it-set-023-outputTimestampPolicy-never/invoker.properties b/versions-maven-plugin/src/it/it-set-023-outputTimestampPolicy-never/invoker.properties
similarity index 100%
rename from src/it/it-set-023-outputTimestampPolicy-never/invoker.properties
rename to versions-maven-plugin/src/it/it-set-023-outputTimestampPolicy-never/invoker.properties
diff --git a/src/it/it-set-023-outputTimestampPolicy-never/pom.xml b/versions-maven-plugin/src/it/it-set-023-outputTimestampPolicy-never/pom.xml
similarity index 100%
rename from src/it/it-set-023-outputTimestampPolicy-never/pom.xml
rename to versions-maven-plugin/src/it/it-set-023-outputTimestampPolicy-never/pom.xml
diff --git a/src/it/it-set-023-outputTimestampPolicy-never/verify.groovy b/versions-maven-plugin/src/it/it-set-023-outputTimestampPolicy-never/verify.groovy
similarity index 100%
rename from src/it/it-set-023-outputTimestampPolicy-never/verify.groovy
rename to versions-maven-plugin/src/it/it-set-023-outputTimestampPolicy-never/verify.groovy
diff --git a/src/it/it-set-024-versionless-dependency/child/pom.xml b/versions-maven-plugin/src/it/it-set-024-versionless-dependency/child/pom.xml
similarity index 100%
rename from src/it/it-set-024-versionless-dependency/child/pom.xml
rename to versions-maven-plugin/src/it/it-set-024-versionless-dependency/child/pom.xml
diff --git a/src/it/it-set-024-versionless-dependency/invoker.properties b/versions-maven-plugin/src/it/it-set-024-versionless-dependency/invoker.properties
similarity index 100%
rename from src/it/it-set-024-versionless-dependency/invoker.properties
rename to versions-maven-plugin/src/it/it-set-024-versionless-dependency/invoker.properties
diff --git a/src/it/it-set-024-versionless-dependency/pom.xml b/versions-maven-plugin/src/it/it-set-024-versionless-dependency/pom.xml
similarity index 100%
rename from src/it/it-set-024-versionless-dependency/pom.xml
rename to versions-maven-plugin/src/it/it-set-024-versionless-dependency/pom.xml
diff --git a/src/it/it-set-property-001/invoker.properties b/versions-maven-plugin/src/it/it-set-property-001/invoker.properties
similarity index 100%
rename from src/it/it-set-property-001/invoker.properties
rename to versions-maven-plugin/src/it/it-set-property-001/invoker.properties
diff --git a/src/it/it-set-property-001/pom.xml b/versions-maven-plugin/src/it/it-set-property-001/pom.xml
similarity index 100%
rename from src/it/it-set-property-001/pom.xml
rename to versions-maven-plugin/src/it/it-set-property-001/pom.xml
diff --git a/src/it/it-set-property-001/verify.bsh b/versions-maven-plugin/src/it/it-set-property-001/verify.bsh
similarity index 100%
rename from src/it/it-set-property-001/verify.bsh
rename to versions-maven-plugin/src/it/it-set-property-001/verify.bsh
diff --git a/src/it/it-set-property-002/invoker.properties b/versions-maven-plugin/src/it/it-set-property-002/invoker.properties
similarity index 100%
rename from src/it/it-set-property-002/invoker.properties
rename to versions-maven-plugin/src/it/it-set-property-002/invoker.properties
diff --git a/src/it/it-set-property-002/pom.xml b/versions-maven-plugin/src/it/it-set-property-002/pom.xml
similarity index 100%
rename from src/it/it-set-property-002/pom.xml
rename to versions-maven-plugin/src/it/it-set-property-002/pom.xml
diff --git a/src/it/it-set-property-002/verify.bsh b/versions-maven-plugin/src/it/it-set-property-002/verify.bsh
similarity index 100%
rename from src/it/it-set-property-002/verify.bsh
rename to versions-maven-plugin/src/it/it-set-property-002/verify.bsh
diff --git a/src/it/it-set-property-003-multiple-properties/invoker.properties b/versions-maven-plugin/src/it/it-set-property-003-multiple-properties/invoker.properties
similarity index 100%
rename from src/it/it-set-property-003-multiple-properties/invoker.properties
rename to versions-maven-plugin/src/it/it-set-property-003-multiple-properties/invoker.properties
diff --git a/src/it/it-set-property-003-multiple-properties/pom.xml b/versions-maven-plugin/src/it/it-set-property-003-multiple-properties/pom.xml
similarity index 100%
rename from src/it/it-set-property-003-multiple-properties/pom.xml
rename to versions-maven-plugin/src/it/it-set-property-003-multiple-properties/pom.xml
diff --git a/src/it/it-set-property-003-multiple-properties/verify.bsh b/versions-maven-plugin/src/it/it-set-property-003-multiple-properties/verify.bsh
similarity index 100%
rename from src/it/it-set-property-003-multiple-properties/verify.bsh
rename to versions-maven-plugin/src/it/it-set-property-003-multiple-properties/verify.bsh
diff --git a/src/it/it-set-scm-tag-001/invoker.properties b/versions-maven-plugin/src/it/it-set-scm-tag-001/invoker.properties
similarity index 100%
rename from src/it/it-set-scm-tag-001/invoker.properties
rename to versions-maven-plugin/src/it/it-set-scm-tag-001/invoker.properties
diff --git a/src/it/it-set-scm-tag-001/pom.xml b/versions-maven-plugin/src/it/it-set-scm-tag-001/pom.xml
similarity index 100%
rename from src/it/it-set-scm-tag-001/pom.xml
rename to versions-maven-plugin/src/it/it-set-scm-tag-001/pom.xml
diff --git a/src/it/it-set-scm-tag-001/verify.groovy b/versions-maven-plugin/src/it/it-set-scm-tag-001/verify.groovy
similarity index 100%
rename from src/it/it-set-scm-tag-001/verify.groovy
rename to versions-maven-plugin/src/it/it-set-scm-tag-001/verify.groovy
diff --git a/src/it/it-set-scm-tag-002/invoker.properties b/versions-maven-plugin/src/it/it-set-scm-tag-002/invoker.properties
similarity index 100%
rename from src/it/it-set-scm-tag-002/invoker.properties
rename to versions-maven-plugin/src/it/it-set-scm-tag-002/invoker.properties
diff --git a/src/it/it-set-scm-tag-002/pom.xml b/versions-maven-plugin/src/it/it-set-scm-tag-002/pom.xml
similarity index 100%
rename from src/it/it-set-scm-tag-002/pom.xml
rename to versions-maven-plugin/src/it/it-set-scm-tag-002/pom.xml
diff --git a/src/it/it-set-scm-tag-003/invoker.properties b/versions-maven-plugin/src/it/it-set-scm-tag-003/invoker.properties
similarity index 100%
rename from src/it/it-set-scm-tag-003/invoker.properties
rename to versions-maven-plugin/src/it/it-set-scm-tag-003/invoker.properties
diff --git a/src/it/it-set-scm-tag-003/pom.xml b/versions-maven-plugin/src/it/it-set-scm-tag-003/pom.xml
similarity index 100%
rename from src/it/it-set-scm-tag-003/pom.xml
rename to versions-maven-plugin/src/it/it-set-scm-tag-003/pom.xml
diff --git a/src/it/it-set-scm-tag-004/invoker.properties b/versions-maven-plugin/src/it/it-set-scm-tag-004/invoker.properties
similarity index 100%
rename from src/it/it-set-scm-tag-004/invoker.properties
rename to versions-maven-plugin/src/it/it-set-scm-tag-004/invoker.properties
diff --git a/src/it/it-set-scm-tag-004/module-a1/pom.xml b/versions-maven-plugin/src/it/it-set-scm-tag-004/module-a1/pom.xml
similarity index 100%
rename from src/it/it-set-scm-tag-004/module-a1/pom.xml
rename to versions-maven-plugin/src/it/it-set-scm-tag-004/module-a1/pom.xml
diff --git a/src/it/it-set-scm-tag-004/module-a2/pom.xml b/versions-maven-plugin/src/it/it-set-scm-tag-004/module-a2/pom.xml
similarity index 100%
rename from src/it/it-set-scm-tag-004/module-a2/pom.xml
rename to versions-maven-plugin/src/it/it-set-scm-tag-004/module-a2/pom.xml
diff --git a/src/it/it-set-scm-tag-004/pom.xml b/versions-maven-plugin/src/it/it-set-scm-tag-004/pom.xml
similarity index 100%
rename from src/it/it-set-scm-tag-004/pom.xml
rename to versions-maven-plugin/src/it/it-set-scm-tag-004/pom.xml
diff --git a/src/it/it-set-scm-tag-004/verify.bsh b/versions-maven-plugin/src/it/it-set-scm-tag-004/verify.bsh
similarity index 100%
rename from src/it/it-set-scm-tag-004/verify.bsh
rename to versions-maven-plugin/src/it/it-set-scm-tag-004/verify.bsh
diff --git a/src/it/it-unlock-snapshots-001/invoker.properties b/versions-maven-plugin/src/it/it-unlock-snapshots-001/invoker.properties
similarity index 100%
rename from src/it/it-unlock-snapshots-001/invoker.properties
rename to versions-maven-plugin/src/it/it-unlock-snapshots-001/invoker.properties
diff --git a/src/it/it-unlock-snapshots-001/pom.xml b/versions-maven-plugin/src/it/it-unlock-snapshots-001/pom.xml
similarity index 100%
rename from src/it/it-unlock-snapshots-001/pom.xml
rename to versions-maven-plugin/src/it/it-unlock-snapshots-001/pom.xml
diff --git a/src/it/it-unlock-snapshots-001/verify.bsh b/versions-maven-plugin/src/it/it-unlock-snapshots-001/verify.bsh
similarity index 100%
rename from src/it/it-unlock-snapshots-001/verify.bsh
rename to versions-maven-plugin/src/it/it-unlock-snapshots-001/verify.bsh
diff --git a/src/it/it-update-child-modules-001/child/pom.xml b/versions-maven-plugin/src/it/it-update-child-modules-001/child/pom.xml
similarity index 100%
rename from src/it/it-update-child-modules-001/child/pom.xml
rename to versions-maven-plugin/src/it/it-update-child-modules-001/child/pom.xml
diff --git a/src/it/it-update-child-modules-001/invoker.properties b/versions-maven-plugin/src/it/it-update-child-modules-001/invoker.properties
similarity index 100%
rename from src/it/it-update-child-modules-001/invoker.properties
rename to versions-maven-plugin/src/it/it-update-child-modules-001/invoker.properties
diff --git a/src/it/it-update-child-modules-001/pom.xml b/versions-maven-plugin/src/it/it-update-child-modules-001/pom.xml
similarity index 100%
rename from src/it/it-update-child-modules-001/pom.xml
rename to versions-maven-plugin/src/it/it-update-child-modules-001/pom.xml
diff --git a/src/it/it-update-child-modules-001/verify.bsh b/versions-maven-plugin/src/it/it-update-child-modules-001/verify.bsh
similarity index 100%
rename from src/it/it-update-child-modules-001/verify.bsh
rename to versions-maven-plugin/src/it/it-update-child-modules-001/verify.bsh
diff --git a/src/it/it-update-child-modules-002/child/pom.xml b/versions-maven-plugin/src/it/it-update-child-modules-002/child/pom.xml
similarity index 100%
rename from src/it/it-update-child-modules-002/child/pom.xml
rename to versions-maven-plugin/src/it/it-update-child-modules-002/child/pom.xml
diff --git a/src/it/it-update-child-modules-002/child/subchild/pom.xml b/versions-maven-plugin/src/it/it-update-child-modules-002/child/subchild/pom.xml
similarity index 100%
rename from src/it/it-update-child-modules-002/child/subchild/pom.xml
rename to versions-maven-plugin/src/it/it-update-child-modules-002/child/subchild/pom.xml
diff --git a/src/it/it-update-child-modules-002/child/subchild2/pom.xml b/versions-maven-plugin/src/it/it-update-child-modules-002/child/subchild2/pom.xml
similarity index 100%
rename from src/it/it-update-child-modules-002/child/subchild2/pom.xml
rename to versions-maven-plugin/src/it/it-update-child-modules-002/child/subchild2/pom.xml
diff --git a/src/it/it-update-child-modules-002/child2/pom.xml b/versions-maven-plugin/src/it/it-update-child-modules-002/child2/pom.xml
similarity index 100%
rename from src/it/it-update-child-modules-002/child2/pom.xml
rename to versions-maven-plugin/src/it/it-update-child-modules-002/child2/pom.xml
diff --git a/src/it/it-update-child-modules-002/invoker.properties b/versions-maven-plugin/src/it/it-update-child-modules-002/invoker.properties
similarity index 100%
rename from src/it/it-update-child-modules-002/invoker.properties
rename to versions-maven-plugin/src/it/it-update-child-modules-002/invoker.properties
diff --git a/src/it/it-update-child-modules-002/pom.xml b/versions-maven-plugin/src/it/it-update-child-modules-002/pom.xml
similarity index 100%
rename from src/it/it-update-child-modules-002/pom.xml
rename to versions-maven-plugin/src/it/it-update-child-modules-002/pom.xml
diff --git a/src/it/it-update-child-modules-002/verify.bsh b/versions-maven-plugin/src/it/it-update-child-modules-002/verify.bsh
similarity index 100%
rename from src/it/it-update-child-modules-002/verify.bsh
rename to versions-maven-plugin/src/it/it-update-child-modules-002/verify.bsh
diff --git a/src/it/it-update-parent-001/invoker.properties b/versions-maven-plugin/src/it/it-update-parent-001/invoker.properties
similarity index 100%
rename from src/it/it-update-parent-001/invoker.properties
rename to versions-maven-plugin/src/it/it-update-parent-001/invoker.properties
diff --git a/src/it/it-update-parent-001/pom.xml b/versions-maven-plugin/src/it/it-update-parent-001/pom.xml
similarity index 100%
rename from src/it/it-update-parent-001/pom.xml
rename to versions-maven-plugin/src/it/it-update-parent-001/pom.xml
diff --git a/src/it/it-update-parent-001/verify.bsh b/versions-maven-plugin/src/it/it-update-parent-001/verify.bsh
similarity index 100%
rename from src/it/it-update-parent-001/verify.bsh
rename to versions-maven-plugin/src/it/it-update-parent-001/verify.bsh
diff --git a/src/it/it-update-parent-004/invoker.properties b/versions-maven-plugin/src/it/it-update-parent-004/invoker.properties
similarity index 100%
rename from src/it/it-update-parent-004/invoker.properties
rename to versions-maven-plugin/src/it/it-update-parent-004/invoker.properties
diff --git a/src/it/it-update-parent-004/pom.xml b/versions-maven-plugin/src/it/it-update-parent-004/pom.xml
similarity index 100%
rename from src/it/it-update-parent-004/pom.xml
rename to versions-maven-plugin/src/it/it-update-parent-004/pom.xml
diff --git a/src/it/it-update-parent-004/verify.bsh b/versions-maven-plugin/src/it/it-update-parent-004/verify.bsh
similarity index 100%
rename from src/it/it-update-parent-004/verify.bsh
rename to versions-maven-plugin/src/it/it-update-parent-004/verify.bsh
diff --git a/src/it/it-update-parent-005-issue-610/invoker.properties b/versions-maven-plugin/src/it/it-update-parent-005-issue-610/invoker.properties
similarity index 100%
rename from src/it/it-update-parent-005-issue-610/invoker.properties
rename to versions-maven-plugin/src/it/it-update-parent-005-issue-610/invoker.properties
diff --git a/src/it/it-update-parent-005-issue-610/pom.xml b/versions-maven-plugin/src/it/it-update-parent-005-issue-610/pom.xml
similarity index 100%
rename from src/it/it-update-parent-005-issue-610/pom.xml
rename to versions-maven-plugin/src/it/it-update-parent-005-issue-610/pom.xml
diff --git a/src/it/it-update-parent-005-issue-610/verify.groovy b/versions-maven-plugin/src/it/it-update-parent-005-issue-610/verify.groovy
similarity index 100%
rename from src/it/it-update-parent-005-issue-610/verify.groovy
rename to versions-maven-plugin/src/it/it-update-parent-005-issue-610/verify.groovy
diff --git a/src/it/it-update-parent-005-issue-670/invoker.properties b/versions-maven-plugin/src/it/it-update-parent-005-issue-670/invoker.properties
similarity index 100%
rename from src/it/it-update-parent-005-issue-670/invoker.properties
rename to versions-maven-plugin/src/it/it-update-parent-005-issue-670/invoker.properties
diff --git a/src/it/it-update-parent-005-issue-670/pom.xml b/versions-maven-plugin/src/it/it-update-parent-005-issue-670/pom.xml
similarity index 100%
rename from src/it/it-update-parent-005-issue-670/pom.xml
rename to versions-maven-plugin/src/it/it-update-parent-005-issue-670/pom.xml
diff --git a/src/it/it-update-parent-005-issue-670/verify.groovy b/versions-maven-plugin/src/it/it-update-parent-005-issue-670/verify.groovy
similarity index 100%
rename from src/it/it-update-parent-005-issue-670/verify.groovy
rename to versions-maven-plugin/src/it/it-update-parent-005-issue-670/verify.groovy
diff --git a/src/it/it-update-parent-issue-454/invoker.properties b/versions-maven-plugin/src/it/it-update-parent-issue-454/invoker.properties
similarity index 100%
rename from src/it/it-update-parent-issue-454/invoker.properties
rename to versions-maven-plugin/src/it/it-update-parent-issue-454/invoker.properties
diff --git a/src/it/it-update-parent-issue-454/pom.xml b/versions-maven-plugin/src/it/it-update-parent-issue-454/pom.xml
similarity index 100%
rename from src/it/it-update-parent-issue-454/pom.xml
rename to versions-maven-plugin/src/it/it-update-parent-issue-454/pom.xml
diff --git a/src/it/it-update-parent-issue-454/verify.groovy b/versions-maven-plugin/src/it/it-update-parent-issue-454/verify.groovy
similarity index 100%
rename from src/it/it-update-parent-issue-454/verify.groovy
rename to versions-maven-plugin/src/it/it-update-parent-issue-454/verify.groovy
diff --git a/src/it/it-update-properties-001/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-001/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-001/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-001/invoker.properties
diff --git a/src/it/it-update-properties-001/pom.xml b/versions-maven-plugin/src/it/it-update-properties-001/pom.xml
similarity index 100%
rename from src/it/it-update-properties-001/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-001/pom.xml
diff --git a/src/it/it-update-properties-001/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-001/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-001/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-001/verify.bsh
diff --git a/src/it/it-update-properties-002/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-002/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-002/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-002/invoker.properties
diff --git a/src/it/it-update-properties-002/pom.xml b/versions-maven-plugin/src/it/it-update-properties-002/pom.xml
similarity index 100%
rename from src/it/it-update-properties-002/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-002/pom.xml
diff --git a/src/it/it-update-properties-002/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-002/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-002/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-002/verify.bsh
diff --git a/src/it/it-update-properties-003/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-003/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-003/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-003/invoker.properties
diff --git a/src/it/it-update-properties-003/pom.xml b/versions-maven-plugin/src/it/it-update-properties-003/pom.xml
similarity index 100%
rename from src/it/it-update-properties-003/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-003/pom.xml
diff --git a/src/it/it-update-properties-003/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-003/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-003/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-003/verify.bsh
diff --git a/src/it/it-update-properties-004/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-004/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-004/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-004/invoker.properties
diff --git a/src/it/it-update-properties-004/pom.xml b/versions-maven-plugin/src/it/it-update-properties-004/pom.xml
similarity index 100%
rename from src/it/it-update-properties-004/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-004/pom.xml
diff --git a/src/it/it-update-properties-004/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-004/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-004/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-004/verify.bsh
diff --git a/src/it/it-update-properties-005/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-005/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-005/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-005/invoker.properties
diff --git a/src/it/it-update-properties-005/pom.xml b/versions-maven-plugin/src/it/it-update-properties-005/pom.xml
similarity index 100%
rename from src/it/it-update-properties-005/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-005/pom.xml
diff --git a/src/it/it-update-properties-005/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-005/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-005/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-005/verify.bsh
diff --git a/src/it/it-update-properties-006/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-006/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-006/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-006/invoker.properties
diff --git a/src/it/it-update-properties-006/pom.xml b/versions-maven-plugin/src/it/it-update-properties-006/pom.xml
similarity index 100%
rename from src/it/it-update-properties-006/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-006/pom.xml
diff --git a/src/it/it-update-properties-006/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-006/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-006/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-006/verify.bsh
diff --git a/src/it/it-update-properties-007/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-007/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-007/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-007/invoker.properties
diff --git a/src/it/it-update-properties-007/pom.xml b/versions-maven-plugin/src/it/it-update-properties-007/pom.xml
similarity index 100%
rename from src/it/it-update-properties-007/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-007/pom.xml
diff --git a/src/it/it-update-properties-007/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-007/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-007/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-007/verify.bsh
diff --git a/src/it/it-update-properties-008/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-008/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-008/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-008/invoker.properties
diff --git a/src/it/it-update-properties-008/pom.xml b/versions-maven-plugin/src/it/it-update-properties-008/pom.xml
similarity index 100%
rename from src/it/it-update-properties-008/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-008/pom.xml
diff --git a/src/it/it-update-properties-008/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-008/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-008/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-008/verify.bsh
diff --git a/src/it/it-update-properties-009/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-009/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-009/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-009/invoker.properties
diff --git a/src/it/it-update-properties-009/pom.xml b/versions-maven-plugin/src/it/it-update-properties-009/pom.xml
similarity index 100%
rename from src/it/it-update-properties-009/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-009/pom.xml
diff --git a/src/it/it-update-properties-009/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-009/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-009/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-009/verify.bsh
diff --git a/src/it/it-update-properties-010/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-010/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-010/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-010/invoker.properties
diff --git a/src/it/it-update-properties-010/pom.xml b/versions-maven-plugin/src/it/it-update-properties-010/pom.xml
similarity index 100%
rename from src/it/it-update-properties-010/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-010/pom.xml
diff --git a/src/it/it-update-properties-010/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-010/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-010/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-010/verify.bsh
diff --git a/src/it/it-update-properties-011/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-011/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-011/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-011/invoker.properties
diff --git a/src/it/it-update-properties-011/pom.xml b/versions-maven-plugin/src/it/it-update-properties-011/pom.xml
similarity index 100%
rename from src/it/it-update-properties-011/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-011/pom.xml
diff --git a/src/it/it-update-properties-011/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-011/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-011/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-011/verify.bsh
diff --git a/src/it/it-update-properties-012/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-012/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-012/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-012/invoker.properties
diff --git a/src/it/it-update-properties-012/pom.xml b/versions-maven-plugin/src/it/it-update-properties-012/pom.xml
similarity index 100%
rename from src/it/it-update-properties-012/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-012/pom.xml
diff --git a/src/it/it-update-properties-012/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-012/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-012/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-012/verify.bsh
diff --git a/src/it/it-update-properties-013/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-013/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-013/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-013/invoker.properties
diff --git a/src/it/it-update-properties-013/pom.xml b/versions-maven-plugin/src/it/it-update-properties-013/pom.xml
similarity index 100%
rename from src/it/it-update-properties-013/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-013/pom.xml
diff --git a/src/it/it-update-properties-013/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-013/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-013/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-013/verify.bsh
diff --git a/src/it/it-update-properties-014/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-014/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-014/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-014/invoker.properties
diff --git a/src/it/it-update-properties-014/pom.xml b/versions-maven-plugin/src/it/it-update-properties-014/pom.xml
similarity index 100%
rename from src/it/it-update-properties-014/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-014/pom.xml
diff --git a/src/it/it-update-properties-014/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-014/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-014/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-014/verify.bsh
diff --git a/src/it/it-update-properties-015/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-015/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-015/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-015/invoker.properties
diff --git a/src/it/it-update-properties-015/pom.xml b/versions-maven-plugin/src/it/it-update-properties-015/pom.xml
similarity index 100%
rename from src/it/it-update-properties-015/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-015/pom.xml
diff --git a/src/it/it-update-properties-015/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-015/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-015/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-015/verify.bsh
diff --git a/src/it/it-update-properties-016/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-016/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-016/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-016/invoker.properties
diff --git a/src/it/it-update-properties-016/pom.xml b/versions-maven-plugin/src/it/it-update-properties-016/pom.xml
similarity index 100%
rename from src/it/it-update-properties-016/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-016/pom.xml
diff --git a/src/it/it-update-properties-016/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-016/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-016/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-016/verify.bsh
diff --git a/src/it/it-update-properties-017/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-017/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-017/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-017/invoker.properties
diff --git a/src/it/it-update-properties-017/pom.xml b/versions-maven-plugin/src/it/it-update-properties-017/pom.xml
similarity index 100%
rename from src/it/it-update-properties-017/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-017/pom.xml
diff --git a/src/it/it-update-properties-017/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-017/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-017/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-017/verify.bsh
diff --git a/src/it/it-update-properties-018/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-018/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-018/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-018/invoker.properties
diff --git a/src/it/it-update-properties-018/pom.xml b/versions-maven-plugin/src/it/it-update-properties-018/pom.xml
similarity index 100%
rename from src/it/it-update-properties-018/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-018/pom.xml
diff --git a/src/it/it-update-properties-018/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-018/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-018/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-018/verify.bsh
diff --git a/src/it/it-update-properties-019/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-019/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-019/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-019/invoker.properties
diff --git a/src/it/it-update-properties-019/pom.xml b/versions-maven-plugin/src/it/it-update-properties-019/pom.xml
similarity index 100%
rename from src/it/it-update-properties-019/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-019/pom.xml
diff --git a/src/it/it-update-properties-019/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-019/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-019/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-019/verify.bsh
diff --git a/src/it/it-update-properties-020/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-020/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-020/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-020/invoker.properties
diff --git a/src/it/it-update-properties-020/pom.xml b/versions-maven-plugin/src/it/it-update-properties-020/pom.xml
similarity index 100%
rename from src/it/it-update-properties-020/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-020/pom.xml
diff --git a/src/it/it-update-properties-020/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-020/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-020/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-020/verify.bsh
diff --git a/src/it/it-update-properties-021/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-021/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-021/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-021/invoker.properties
diff --git a/src/it/it-update-properties-021/pom.xml b/versions-maven-plugin/src/it/it-update-properties-021/pom.xml
similarity index 100%
rename from src/it/it-update-properties-021/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-021/pom.xml
diff --git a/src/it/it-update-properties-021/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-021/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-021/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-021/verify.bsh
diff --git a/src/it/it-update-properties-022/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-022/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-022/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-022/invoker.properties
diff --git a/src/it/it-update-properties-022/pom.xml b/versions-maven-plugin/src/it/it-update-properties-022/pom.xml
similarity index 100%
rename from src/it/it-update-properties-022/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-022/pom.xml
diff --git a/src/it/it-update-properties-022/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-022/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-022/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-022/verify.bsh
diff --git a/src/it/it-update-properties-023/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-023/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-023/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-023/invoker.properties
diff --git a/src/it/it-update-properties-023/pom.xml b/versions-maven-plugin/src/it/it-update-properties-023/pom.xml
similarity index 100%
rename from src/it/it-update-properties-023/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-023/pom.xml
diff --git a/src/it/it-update-properties-023/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-023/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-023/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-023/verify.bsh
diff --git a/src/it/it-update-properties-issue-279-1/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-issue-279-1/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-issue-279-1/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-1/invoker.properties
diff --git a/src/it/it-update-properties-issue-279-1/pom.xml b/versions-maven-plugin/src/it/it-update-properties-issue-279-1/pom.xml
similarity index 100%
rename from src/it/it-update-properties-issue-279-1/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-1/pom.xml
diff --git a/src/it/it-update-properties-issue-279-1/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-issue-279-1/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-issue-279-1/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-1/verify.bsh
diff --git a/src/it/it-update-properties-issue-279-2/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-issue-279-2/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-issue-279-2/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-2/invoker.properties
diff --git a/src/it/it-update-properties-issue-279-2/pom.xml b/versions-maven-plugin/src/it/it-update-properties-issue-279-2/pom.xml
similarity index 100%
rename from src/it/it-update-properties-issue-279-2/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-2/pom.xml
diff --git a/src/it/it-update-properties-issue-279-2/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-issue-279-2/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-issue-279-2/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-2/verify.bsh
diff --git a/src/it/it-update-properties-issue-279-3/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-issue-279-3/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-issue-279-3/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-3/invoker.properties
diff --git a/src/it/it-update-properties-issue-279-3/pom.xml b/versions-maven-plugin/src/it/it-update-properties-issue-279-3/pom.xml
similarity index 100%
rename from src/it/it-update-properties-issue-279-3/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-3/pom.xml
diff --git a/src/it/it-update-properties-issue-279-3/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-issue-279-3/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-issue-279-3/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-3/verify.bsh
diff --git a/src/it/it-update-properties-issue-279-4/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-issue-279-4/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-issue-279-4/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-4/invoker.properties
diff --git a/src/it/it-update-properties-issue-279-4/pom.xml b/versions-maven-plugin/src/it/it-update-properties-issue-279-4/pom.xml
similarity index 100%
rename from src/it/it-update-properties-issue-279-4/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-4/pom.xml
diff --git a/src/it/it-update-properties-issue-279-4/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-issue-279-4/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-issue-279-4/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-4/verify.bsh
diff --git a/src/it/it-update-properties-issue-279-5/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-issue-279-5/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-issue-279-5/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-5/invoker.properties
diff --git a/src/it/it-update-properties-issue-279-5/pom.xml b/versions-maven-plugin/src/it/it-update-properties-issue-279-5/pom.xml
similarity index 100%
rename from src/it/it-update-properties-issue-279-5/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-5/pom.xml
diff --git a/src/it/it-update-properties-issue-279-5/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-issue-279-5/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-issue-279-5/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-issue-279-5/verify.bsh
diff --git a/src/it/it-update-properties-issue-582/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-issue-582/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-issue-582/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-issue-582/invoker.properties
diff --git a/src/it/it-update-properties-issue-582/pom.xml b/versions-maven-plugin/src/it/it-update-properties-issue-582/pom.xml
similarity index 100%
rename from src/it/it-update-properties-issue-582/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-issue-582/pom.xml
diff --git a/src/it/it-update-properties-issue-582/verify.groovy b/versions-maven-plugin/src/it/it-update-properties-issue-582/verify.groovy
similarity index 100%
rename from src/it/it-update-properties-issue-582/verify.groovy
rename to versions-maven-plugin/src/it/it-update-properties-issue-582/verify.groovy
diff --git a/src/it/it-update-properties-issue-98-1/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-issue-98-1/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-issue-98-1/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-issue-98-1/invoker.properties
diff --git a/src/it/it-update-properties-issue-98-1/pom.xml b/versions-maven-plugin/src/it/it-update-properties-issue-98-1/pom.xml
similarity index 100%
rename from src/it/it-update-properties-issue-98-1/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-issue-98-1/pom.xml
diff --git a/src/it/it-update-properties-issue-98-1/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-issue-98-1/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-issue-98-1/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-issue-98-1/verify.bsh
diff --git a/src/it/it-update-properties-issue-98-2/invoker.properties b/versions-maven-plugin/src/it/it-update-properties-issue-98-2/invoker.properties
similarity index 100%
rename from src/it/it-update-properties-issue-98-2/invoker.properties
rename to versions-maven-plugin/src/it/it-update-properties-issue-98-2/invoker.properties
diff --git a/src/it/it-update-properties-issue-98-2/pom.xml b/versions-maven-plugin/src/it/it-update-properties-issue-98-2/pom.xml
similarity index 100%
rename from src/it/it-update-properties-issue-98-2/pom.xml
rename to versions-maven-plugin/src/it/it-update-properties-issue-98-2/pom.xml
diff --git a/src/it/it-update-properties-issue-98-2/verify.bsh b/versions-maven-plugin/src/it/it-update-properties-issue-98-2/verify.bsh
similarity index 100%
rename from src/it/it-update-properties-issue-98-2/verify.bsh
rename to versions-maven-plugin/src/it/it-update-properties-issue-98-2/verify.bsh
diff --git a/src/it/it-update-property-001/invoker.properties b/versions-maven-plugin/src/it/it-update-property-001/invoker.properties
similarity index 100%
rename from src/it/it-update-property-001/invoker.properties
rename to versions-maven-plugin/src/it/it-update-property-001/invoker.properties
diff --git a/src/it/it-update-property-001/pom.xml b/versions-maven-plugin/src/it/it-update-property-001/pom.xml
similarity index 100%
rename from src/it/it-update-property-001/pom.xml
rename to versions-maven-plugin/src/it/it-update-property-001/pom.xml
diff --git a/src/it/it-update-property-001/verify.bsh b/versions-maven-plugin/src/it/it-update-property-001/verify.bsh
similarity index 100%
rename from src/it/it-update-property-001/verify.bsh
rename to versions-maven-plugin/src/it/it-update-property-001/verify.bsh
diff --git a/src/it/it-update-property-002/invoker.properties b/versions-maven-plugin/src/it/it-update-property-002/invoker.properties
similarity index 100%
rename from src/it/it-update-property-002/invoker.properties
rename to versions-maven-plugin/src/it/it-update-property-002/invoker.properties
diff --git a/src/it/it-update-property-002/pom.xml b/versions-maven-plugin/src/it/it-update-property-002/pom.xml
similarity index 100%
rename from src/it/it-update-property-002/pom.xml
rename to versions-maven-plugin/src/it/it-update-property-002/pom.xml
diff --git a/src/it/it-update-property-002/verify.bsh b/versions-maven-plugin/src/it/it-update-property-002/verify.bsh
similarity index 100%
rename from src/it/it-update-property-002/verify.bsh
rename to versions-maven-plugin/src/it/it-update-property-002/verify.bsh
diff --git a/src/it/it-update-property-issue-140-1/invoker.properties b/versions-maven-plugin/src/it/it-update-property-issue-140-1/invoker.properties
similarity index 100%
rename from src/it/it-update-property-issue-140-1/invoker.properties
rename to versions-maven-plugin/src/it/it-update-property-issue-140-1/invoker.properties
diff --git a/src/it/it-update-property-issue-140-1/pom.xml b/versions-maven-plugin/src/it/it-update-property-issue-140-1/pom.xml
similarity index 100%
rename from src/it/it-update-property-issue-140-1/pom.xml
rename to versions-maven-plugin/src/it/it-update-property-issue-140-1/pom.xml
diff --git a/src/it/it-update-property-issue-140-1/verify.bsh b/versions-maven-plugin/src/it/it-update-property-issue-140-1/verify.bsh
similarity index 100%
rename from src/it/it-update-property-issue-140-1/verify.bsh
rename to versions-maven-plugin/src/it/it-update-property-issue-140-1/verify.bsh
diff --git a/src/it/it-update-property-issue-140-2/invoker.properties b/versions-maven-plugin/src/it/it-update-property-issue-140-2/invoker.properties
similarity index 100%
rename from src/it/it-update-property-issue-140-2/invoker.properties
rename to versions-maven-plugin/src/it/it-update-property-issue-140-2/invoker.properties
diff --git a/src/it/it-update-property-issue-140-2/pom.xml b/versions-maven-plugin/src/it/it-update-property-issue-140-2/pom.xml
similarity index 100%
rename from src/it/it-update-property-issue-140-2/pom.xml
rename to versions-maven-plugin/src/it/it-update-property-issue-140-2/pom.xml
diff --git a/src/it/it-update-property-issue-140-2/verify.bsh b/versions-maven-plugin/src/it/it-update-property-issue-140-2/verify.bsh
similarity index 100%
rename from src/it/it-update-property-issue-140-2/verify.bsh
rename to versions-maven-plugin/src/it/it-update-property-issue-140-2/verify.bsh
diff --git a/src/it/it-update-property-issue-140-3/invoker.properties b/versions-maven-plugin/src/it/it-update-property-issue-140-3/invoker.properties
similarity index 100%
rename from src/it/it-update-property-issue-140-3/invoker.properties
rename to versions-maven-plugin/src/it/it-update-property-issue-140-3/invoker.properties
diff --git a/src/it/it-update-property-issue-140-3/pom.xml b/versions-maven-plugin/src/it/it-update-property-issue-140-3/pom.xml
similarity index 100%
rename from src/it/it-update-property-issue-140-3/pom.xml
rename to versions-maven-plugin/src/it/it-update-property-issue-140-3/pom.xml
diff --git a/src/it/it-update-property-issue-140-3/verify.bsh b/versions-maven-plugin/src/it/it-update-property-issue-140-3/verify.bsh
similarity index 100%
rename from src/it/it-update-property-issue-140-3/verify.bsh
rename to versions-maven-plugin/src/it/it-update-property-issue-140-3/verify.bsh
diff --git a/src/it/it-update-property-issue-140/invoker.properties b/versions-maven-plugin/src/it/it-update-property-issue-140/invoker.properties
similarity index 100%
rename from src/it/it-update-property-issue-140/invoker.properties
rename to versions-maven-plugin/src/it/it-update-property-issue-140/invoker.properties
diff --git a/src/it/it-update-property-issue-140/pom.xml b/versions-maven-plugin/src/it/it-update-property-issue-140/pom.xml
similarity index 100%
rename from src/it/it-update-property-issue-140/pom.xml
rename to versions-maven-plugin/src/it/it-update-property-issue-140/pom.xml
diff --git a/src/it/it-update-property-issue-140/verify.bsh b/versions-maven-plugin/src/it/it-update-property-issue-140/verify.bsh
similarity index 100%
rename from src/it/it-update-property-issue-140/verify.bsh
rename to versions-maven-plugin/src/it/it-update-property-issue-140/verify.bsh
diff --git a/src/it/it-use-latest-releases-001/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-releases-001/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-releases-001/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-releases-001/invoker.properties
diff --git a/src/it/it-use-latest-releases-001/pom.xml b/versions-maven-plugin/src/it/it-use-latest-releases-001/pom.xml
similarity index 100%
rename from src/it/it-use-latest-releases-001/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-releases-001/pom.xml
diff --git a/src/it/it-use-latest-releases-001/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-releases-001/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-releases-001/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-releases-001/verify.bsh
diff --git a/src/it/it-use-latest-releases-002/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-releases-002/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-releases-002/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-releases-002/invoker.properties
diff --git a/src/it/it-use-latest-releases-002/pom.xml b/versions-maven-plugin/src/it/it-use-latest-releases-002/pom.xml
similarity index 100%
rename from src/it/it-use-latest-releases-002/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-releases-002/pom.xml
diff --git a/src/it/it-use-latest-releases-002/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-releases-002/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-releases-002/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-releases-002/verify.bsh
diff --git a/src/it/it-use-latest-releases-003/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-releases-003/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-releases-003/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-releases-003/invoker.properties
diff --git a/src/it/it-use-latest-releases-003/pom.xml b/versions-maven-plugin/src/it/it-use-latest-releases-003/pom.xml
similarity index 100%
rename from src/it/it-use-latest-releases-003/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-releases-003/pom.xml
diff --git a/src/it/it-use-latest-releases-003/rule-set.xml b/versions-maven-plugin/src/it/it-use-latest-releases-003/rule-set.xml
similarity index 100%
rename from src/it/it-use-latest-releases-003/rule-set.xml
rename to versions-maven-plugin/src/it/it-use-latest-releases-003/rule-set.xml
diff --git a/src/it/it-use-latest-releases-003/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-releases-003/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-releases-003/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-releases-003/verify.bsh
diff --git a/src/it/it-use-latest-releases-004/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-releases-004/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-releases-004/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-releases-004/invoker.properties
diff --git a/src/it/it-use-latest-releases-004/pom.xml b/versions-maven-plugin/src/it/it-use-latest-releases-004/pom.xml
similarity index 100%
rename from src/it/it-use-latest-releases-004/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-releases-004/pom.xml
diff --git a/src/it/it-use-latest-releases-004/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-releases-004/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-releases-004/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-releases-004/verify.bsh
diff --git a/src/it/it-use-latest-releases-005/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-releases-005/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-releases-005/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-releases-005/invoker.properties
diff --git a/src/it/it-use-latest-releases-005/pom.xml b/versions-maven-plugin/src/it/it-use-latest-releases-005/pom.xml
similarity index 100%
rename from src/it/it-use-latest-releases-005/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-releases-005/pom.xml
diff --git a/src/it/it-use-latest-releases-005/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-releases-005/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-releases-005/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-releases-005/verify.bsh
diff --git a/src/it/it-use-latest-releases-006/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-releases-006/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-releases-006/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-releases-006/invoker.properties
diff --git a/src/it/it-use-latest-releases-006/pom.xml b/versions-maven-plugin/src/it/it-use-latest-releases-006/pom.xml
similarity index 100%
rename from src/it/it-use-latest-releases-006/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-releases-006/pom.xml
diff --git a/src/it/it-use-latest-releases-006/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-releases-006/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-releases-006/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-releases-006/verify.bsh
diff --git a/src/it/it-use-latest-releases-007/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-releases-007/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-releases-007/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-releases-007/invoker.properties
diff --git a/src/it/it-use-latest-releases-007/pom.xml b/versions-maven-plugin/src/it/it-use-latest-releases-007/pom.xml
similarity index 100%
rename from src/it/it-use-latest-releases-007/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-releases-007/pom.xml
diff --git a/src/it/it-use-latest-releases-007/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-releases-007/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-releases-007/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-releases-007/verify.bsh
diff --git a/src/it/it-use-latest-snapshots-001/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-snapshots-001/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-snapshots-001/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-001/invoker.properties
diff --git a/src/it/it-use-latest-snapshots-001/pom.xml b/versions-maven-plugin/src/it/it-use-latest-snapshots-001/pom.xml
similarity index 100%
rename from src/it/it-use-latest-snapshots-001/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-001/pom.xml
diff --git a/src/it/it-use-latest-snapshots-001/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-snapshots-001/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-snapshots-001/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-001/verify.bsh
diff --git a/src/it/it-use-latest-snapshots-002/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-snapshots-002/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-snapshots-002/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-002/invoker.properties
diff --git a/src/it/it-use-latest-snapshots-002/pom.xml b/versions-maven-plugin/src/it/it-use-latest-snapshots-002/pom.xml
similarity index 100%
rename from src/it/it-use-latest-snapshots-002/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-002/pom.xml
diff --git a/src/it/it-use-latest-snapshots-002/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-snapshots-002/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-snapshots-002/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-002/verify.bsh
diff --git a/src/it/it-use-latest-snapshots-003/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-snapshots-003/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-snapshots-003/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-003/invoker.properties
diff --git a/src/it/it-use-latest-snapshots-003/pom.xml b/versions-maven-plugin/src/it/it-use-latest-snapshots-003/pom.xml
similarity index 100%
rename from src/it/it-use-latest-snapshots-003/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-003/pom.xml
diff --git a/src/it/it-use-latest-snapshots-003/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-snapshots-003/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-snapshots-003/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-003/verify.bsh
diff --git a/src/it/it-use-latest-snapshots-004/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-snapshots-004/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-snapshots-004/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-004/invoker.properties
diff --git a/src/it/it-use-latest-snapshots-004/pom.xml b/versions-maven-plugin/src/it/it-use-latest-snapshots-004/pom.xml
similarity index 100%
rename from src/it/it-use-latest-snapshots-004/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-004/pom.xml
diff --git a/src/it/it-use-latest-snapshots-004/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-snapshots-004/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-snapshots-004/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-004/verify.bsh
diff --git a/src/it/it-use-latest-snapshots-005/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-snapshots-005/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-snapshots-005/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-005/invoker.properties
diff --git a/src/it/it-use-latest-snapshots-005/pom.xml b/versions-maven-plugin/src/it/it-use-latest-snapshots-005/pom.xml
similarity index 100%
rename from src/it/it-use-latest-snapshots-005/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-005/pom.xml
diff --git a/src/it/it-use-latest-snapshots-005/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-snapshots-005/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-snapshots-005/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-snapshots-005/verify.bsh
diff --git a/src/it/it-use-latest-versions-001/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-versions-001/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-versions-001/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-versions-001/invoker.properties
diff --git a/src/it/it-use-latest-versions-001/pom.xml b/versions-maven-plugin/src/it/it-use-latest-versions-001/pom.xml
similarity index 100%
rename from src/it/it-use-latest-versions-001/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-versions-001/pom.xml
diff --git a/src/it/it-use-latest-versions-001/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-versions-001/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-versions-001/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-versions-001/verify.bsh
diff --git a/src/it/it-use-latest-versions-002/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-versions-002/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-versions-002/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-versions-002/invoker.properties
diff --git a/src/it/it-use-latest-versions-002/pom.xml b/versions-maven-plugin/src/it/it-use-latest-versions-002/pom.xml
similarity index 100%
rename from src/it/it-use-latest-versions-002/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-versions-002/pom.xml
diff --git a/src/it/it-use-latest-versions-002/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-versions-002/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-versions-002/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-versions-002/verify.bsh
diff --git a/src/it/it-use-latest-versions-003/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-versions-003/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-versions-003/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-versions-003/invoker.properties
diff --git a/src/it/it-use-latest-versions-003/pom.xml b/versions-maven-plugin/src/it/it-use-latest-versions-003/pom.xml
similarity index 100%
rename from src/it/it-use-latest-versions-003/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-versions-003/pom.xml
diff --git a/src/it/it-use-latest-versions-003/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-versions-003/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-versions-003/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-versions-003/verify.bsh
diff --git a/src/it/it-use-latest-versions-004/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-versions-004/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-versions-004/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-versions-004/invoker.properties
diff --git a/src/it/it-use-latest-versions-004/pom.xml b/versions-maven-plugin/src/it/it-use-latest-versions-004/pom.xml
similarity index 100%
rename from src/it/it-use-latest-versions-004/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-versions-004/pom.xml
diff --git a/src/it/it-use-latest-versions-004/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-versions-004/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-versions-004/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-versions-004/verify.bsh
diff --git a/src/it/it-use-latest-versions-005/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-versions-005/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-versions-005/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-versions-005/invoker.properties
diff --git a/src/it/it-use-latest-versions-005/pom.xml b/versions-maven-plugin/src/it/it-use-latest-versions-005/pom.xml
similarity index 100%
rename from src/it/it-use-latest-versions-005/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-versions-005/pom.xml
diff --git a/src/it/it-use-latest-versions-005/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-versions-005/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-versions-005/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-versions-005/verify.bsh
diff --git a/src/it/it-use-latest-versions-006/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-versions-006/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-versions-006/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-versions-006/invoker.properties
diff --git a/src/it/it-use-latest-versions-006/pom.xml b/versions-maven-plugin/src/it/it-use-latest-versions-006/pom.xml
similarity index 100%
rename from src/it/it-use-latest-versions-006/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-versions-006/pom.xml
diff --git a/src/it/it-use-latest-versions-006/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-versions-006/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-versions-006/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-versions-006/verify.bsh
diff --git a/src/it/it-use-latest-versions-007/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-versions-007/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-versions-007/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-versions-007/invoker.properties
diff --git a/src/it/it-use-latest-versions-007/pom.xml b/versions-maven-plugin/src/it/it-use-latest-versions-007/pom.xml
similarity index 100%
rename from src/it/it-use-latest-versions-007/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-versions-007/pom.xml
diff --git a/src/it/it-use-latest-versions-007/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-versions-007/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-versions-007/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-versions-007/verify.bsh
diff --git a/src/it/it-use-latest-versions-008/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-versions-008/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-versions-008/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-versions-008/invoker.properties
diff --git a/src/it/it-use-latest-versions-008/pom.xml b/versions-maven-plugin/src/it/it-use-latest-versions-008/pom.xml
similarity index 100%
rename from src/it/it-use-latest-versions-008/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-versions-008/pom.xml
diff --git a/src/it/it-use-latest-versions-008/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-versions-008/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-versions-008/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-versions-008/verify.bsh
diff --git a/src/it/it-use-latest-versions-009/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-versions-009/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-versions-009/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-versions-009/invoker.properties
diff --git a/src/it/it-use-latest-versions-009/pom.xml b/versions-maven-plugin/src/it/it-use-latest-versions-009/pom.xml
similarity index 100%
rename from src/it/it-use-latest-versions-009/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-versions-009/pom.xml
diff --git a/src/it/it-use-latest-versions-009/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-versions-009/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-versions-009/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-versions-009/verify.bsh
diff --git a/src/it/it-use-latest-versions-010/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-versions-010/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-versions-010/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-versions-010/invoker.properties
diff --git a/src/it/it-use-latest-versions-010/pom.xml b/versions-maven-plugin/src/it/it-use-latest-versions-010/pom.xml
similarity index 100%
rename from src/it/it-use-latest-versions-010/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-versions-010/pom.xml
diff --git a/src/it/it-use-latest-versions-010/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-versions-010/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-versions-010/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-versions-010/verify.bsh
diff --git a/src/it/it-use-latest-versions-011/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-versions-011/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-versions-011/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-versions-011/invoker.properties
diff --git a/src/it/it-use-latest-versions-011/pom.xml b/versions-maven-plugin/src/it/it-use-latest-versions-011/pom.xml
similarity index 100%
rename from src/it/it-use-latest-versions-011/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-versions-011/pom.xml
diff --git a/src/it/it-use-latest-versions-011/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-versions-011/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-versions-011/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-versions-011/verify.bsh
diff --git a/src/it/it-use-latest-versions-012/invoker.properties b/versions-maven-plugin/src/it/it-use-latest-versions-012/invoker.properties
similarity index 100%
rename from src/it/it-use-latest-versions-012/invoker.properties
rename to versions-maven-plugin/src/it/it-use-latest-versions-012/invoker.properties
diff --git a/src/it/it-use-latest-versions-012/pom.xml b/versions-maven-plugin/src/it/it-use-latest-versions-012/pom.xml
similarity index 100%
rename from src/it/it-use-latest-versions-012/pom.xml
rename to versions-maven-plugin/src/it/it-use-latest-versions-012/pom.xml
diff --git a/src/it/it-use-latest-versions-012/verify.bsh b/versions-maven-plugin/src/it/it-use-latest-versions-012/verify.bsh
similarity index 100%
rename from src/it/it-use-latest-versions-012/verify.bsh
rename to versions-maven-plugin/src/it/it-use-latest-versions-012/verify.bsh
diff --git a/src/it/it-use-next-releases-001/invoker.properties b/versions-maven-plugin/src/it/it-use-next-releases-001/invoker.properties
similarity index 100%
rename from src/it/it-use-next-releases-001/invoker.properties
rename to versions-maven-plugin/src/it/it-use-next-releases-001/invoker.properties
diff --git a/src/it/it-use-next-releases-001/pom.xml b/versions-maven-plugin/src/it/it-use-next-releases-001/pom.xml
similarity index 100%
rename from src/it/it-use-next-releases-001/pom.xml
rename to versions-maven-plugin/src/it/it-use-next-releases-001/pom.xml
diff --git a/src/it/it-use-next-releases-001/verify.bsh b/versions-maven-plugin/src/it/it-use-next-releases-001/verify.bsh
similarity index 100%
rename from src/it/it-use-next-releases-001/verify.bsh
rename to versions-maven-plugin/src/it/it-use-next-releases-001/verify.bsh
diff --git a/src/it/it-use-next-releases-002/invoker.properties b/versions-maven-plugin/src/it/it-use-next-releases-002/invoker.properties
similarity index 100%
rename from src/it/it-use-next-releases-002/invoker.properties
rename to versions-maven-plugin/src/it/it-use-next-releases-002/invoker.properties
diff --git a/src/it/it-use-next-releases-002/pom.xml b/versions-maven-plugin/src/it/it-use-next-releases-002/pom.xml
similarity index 100%
rename from src/it/it-use-next-releases-002/pom.xml
rename to versions-maven-plugin/src/it/it-use-next-releases-002/pom.xml
diff --git a/src/it/it-use-next-releases-002/verify.bsh b/versions-maven-plugin/src/it/it-use-next-releases-002/verify.bsh
similarity index 100%
rename from src/it/it-use-next-releases-002/verify.bsh
rename to versions-maven-plugin/src/it/it-use-next-releases-002/verify.bsh
diff --git a/src/it/it-use-next-releases-003/invoker.properties b/versions-maven-plugin/src/it/it-use-next-releases-003/invoker.properties
similarity index 100%
rename from src/it/it-use-next-releases-003/invoker.properties
rename to versions-maven-plugin/src/it/it-use-next-releases-003/invoker.properties
diff --git a/src/it/it-use-next-releases-003/pom.xml b/versions-maven-plugin/src/it/it-use-next-releases-003/pom.xml
similarity index 100%
rename from src/it/it-use-next-releases-003/pom.xml
rename to versions-maven-plugin/src/it/it-use-next-releases-003/pom.xml
diff --git a/src/it/it-use-next-releases-003/verify.bsh b/versions-maven-plugin/src/it/it-use-next-releases-003/verify.bsh
similarity index 100%
rename from src/it/it-use-next-releases-003/verify.bsh
rename to versions-maven-plugin/src/it/it-use-next-releases-003/verify.bsh
diff --git a/src/it/it-use-next-releases-004/invoker.properties b/versions-maven-plugin/src/it/it-use-next-releases-004/invoker.properties
similarity index 100%
rename from src/it/it-use-next-releases-004/invoker.properties
rename to versions-maven-plugin/src/it/it-use-next-releases-004/invoker.properties
diff --git a/src/it/it-use-next-releases-004/pom.xml b/versions-maven-plugin/src/it/it-use-next-releases-004/pom.xml
similarity index 100%
rename from src/it/it-use-next-releases-004/pom.xml
rename to versions-maven-plugin/src/it/it-use-next-releases-004/pom.xml
diff --git a/src/it/it-use-next-releases-004/verify.bsh b/versions-maven-plugin/src/it/it-use-next-releases-004/verify.bsh
similarity index 100%
rename from src/it/it-use-next-releases-004/verify.bsh
rename to versions-maven-plugin/src/it/it-use-next-releases-004/verify.bsh
diff --git a/src/it/it-use-next-snapshots-001/invoker.properties b/versions-maven-plugin/src/it/it-use-next-snapshots-001/invoker.properties
similarity index 100%
rename from src/it/it-use-next-snapshots-001/invoker.properties
rename to versions-maven-plugin/src/it/it-use-next-snapshots-001/invoker.properties
diff --git a/src/it/it-use-next-snapshots-001/pom.xml b/versions-maven-plugin/src/it/it-use-next-snapshots-001/pom.xml
similarity index 100%
rename from src/it/it-use-next-snapshots-001/pom.xml
rename to versions-maven-plugin/src/it/it-use-next-snapshots-001/pom.xml
diff --git a/src/it/it-use-next-snapshots-001/verify.bsh b/versions-maven-plugin/src/it/it-use-next-snapshots-001/verify.bsh
similarity index 100%
rename from src/it/it-use-next-snapshots-001/verify.bsh
rename to versions-maven-plugin/src/it/it-use-next-snapshots-001/verify.bsh
diff --git a/src/it/it-use-next-snapshots-002/invoker.properties b/versions-maven-plugin/src/it/it-use-next-snapshots-002/invoker.properties
similarity index 100%
rename from src/it/it-use-next-snapshots-002/invoker.properties
rename to versions-maven-plugin/src/it/it-use-next-snapshots-002/invoker.properties
diff --git a/src/it/it-use-next-snapshots-002/pom.xml b/versions-maven-plugin/src/it/it-use-next-snapshots-002/pom.xml
similarity index 100%
rename from src/it/it-use-next-snapshots-002/pom.xml
rename to versions-maven-plugin/src/it/it-use-next-snapshots-002/pom.xml
diff --git a/src/it/it-use-next-snapshots-002/verify.bsh b/versions-maven-plugin/src/it/it-use-next-snapshots-002/verify.bsh
similarity index 100%
rename from src/it/it-use-next-snapshots-002/verify.bsh
rename to versions-maven-plugin/src/it/it-use-next-snapshots-002/verify.bsh
diff --git a/src/it/it-use-next-versions-001/invoker.properties b/versions-maven-plugin/src/it/it-use-next-versions-001/invoker.properties
similarity index 100%
rename from src/it/it-use-next-versions-001/invoker.properties
rename to versions-maven-plugin/src/it/it-use-next-versions-001/invoker.properties
diff --git a/src/it/it-use-next-versions-001/pom.xml b/versions-maven-plugin/src/it/it-use-next-versions-001/pom.xml
similarity index 100%
rename from src/it/it-use-next-versions-001/pom.xml
rename to versions-maven-plugin/src/it/it-use-next-versions-001/pom.xml
diff --git a/src/it/it-use-next-versions-001/verify.bsh b/versions-maven-plugin/src/it/it-use-next-versions-001/verify.bsh
similarity index 100%
rename from src/it/it-use-next-versions-001/verify.bsh
rename to versions-maven-plugin/src/it/it-use-next-versions-001/verify.bsh
diff --git a/src/it/it-use-next-versions-002-snapshot/invoker.properties b/versions-maven-plugin/src/it/it-use-next-versions-002-snapshot/invoker.properties
similarity index 100%
rename from src/it/it-use-next-versions-002-snapshot/invoker.properties
rename to versions-maven-plugin/src/it/it-use-next-versions-002-snapshot/invoker.properties
diff --git a/src/it/it-use-next-versions-002-snapshot/pom.xml b/versions-maven-plugin/src/it/it-use-next-versions-002-snapshot/pom.xml
similarity index 100%
rename from src/it/it-use-next-versions-002-snapshot/pom.xml
rename to versions-maven-plugin/src/it/it-use-next-versions-002-snapshot/pom.xml
diff --git a/src/it/it-use-next-versions-002-snapshot/verify.bsh b/versions-maven-plugin/src/it/it-use-next-versions-002-snapshot/verify.bsh
similarity index 100%
rename from src/it/it-use-next-versions-002-snapshot/verify.bsh
rename to versions-maven-plugin/src/it/it-use-next-versions-002-snapshot/verify.bsh
diff --git a/src/it/it-use-next-versions-002/invoker.properties b/versions-maven-plugin/src/it/it-use-next-versions-002/invoker.properties
similarity index 100%
rename from src/it/it-use-next-versions-002/invoker.properties
rename to versions-maven-plugin/src/it/it-use-next-versions-002/invoker.properties
diff --git a/src/it/it-use-next-versions-002/pom.xml b/versions-maven-plugin/src/it/it-use-next-versions-002/pom.xml
similarity index 100%
rename from src/it/it-use-next-versions-002/pom.xml
rename to versions-maven-plugin/src/it/it-use-next-versions-002/pom.xml
diff --git a/src/it/it-use-next-versions-002/verify.bsh b/versions-maven-plugin/src/it/it-use-next-versions-002/verify.bsh
similarity index 100%
rename from src/it/it-use-next-versions-002/verify.bsh
rename to versions-maven-plugin/src/it/it-use-next-versions-002/verify.bsh
diff --git a/src/it/it-use-next-versions-003/invoker.properties b/versions-maven-plugin/src/it/it-use-next-versions-003/invoker.properties
similarity index 100%
rename from src/it/it-use-next-versions-003/invoker.properties
rename to versions-maven-plugin/src/it/it-use-next-versions-003/invoker.properties
diff --git a/src/it/it-use-next-versions-003/pom.xml b/versions-maven-plugin/src/it/it-use-next-versions-003/pom.xml
similarity index 100%
rename from src/it/it-use-next-versions-003/pom.xml
rename to versions-maven-plugin/src/it/it-use-next-versions-003/pom.xml
diff --git a/src/it/it-use-next-versions-003/verify.bsh b/versions-maven-plugin/src/it/it-use-next-versions-003/verify.bsh
similarity index 100%
rename from src/it/it-use-next-versions-003/verify.bsh
rename to versions-maven-plugin/src/it/it-use-next-versions-003/verify.bsh
diff --git a/src/it/it-use-reactor-001/invoker.properties b/versions-maven-plugin/src/it/it-use-reactor-001/invoker.properties
similarity index 100%
rename from src/it/it-use-reactor-001/invoker.properties
rename to versions-maven-plugin/src/it/it-use-reactor-001/invoker.properties
diff --git a/src/it/it-use-reactor-001/module-a1/pom.xml b/versions-maven-plugin/src/it/it-use-reactor-001/module-a1/pom.xml
similarity index 100%
rename from src/it/it-use-reactor-001/module-a1/pom.xml
rename to versions-maven-plugin/src/it/it-use-reactor-001/module-a1/pom.xml
diff --git a/src/it/it-use-reactor-001/module-a2/pom.xml b/versions-maven-plugin/src/it/it-use-reactor-001/module-a2/pom.xml
similarity index 100%
rename from src/it/it-use-reactor-001/module-a2/pom.xml
rename to versions-maven-plugin/src/it/it-use-reactor-001/module-a2/pom.xml
diff --git a/src/it/it-use-reactor-001/pom.xml b/versions-maven-plugin/src/it/it-use-reactor-001/pom.xml
similarity index 100%
rename from src/it/it-use-reactor-001/pom.xml
rename to versions-maven-plugin/src/it/it-use-reactor-001/pom.xml
diff --git a/src/it/it-use-reactor-001/the-grandparent/pom.xml b/versions-maven-plugin/src/it/it-use-reactor-001/the-grandparent/pom.xml
similarity index 100%
rename from src/it/it-use-reactor-001/the-grandparent/pom.xml
rename to versions-maven-plugin/src/it/it-use-reactor-001/the-grandparent/pom.xml
diff --git a/src/it/it-use-reactor-001/the-parent/pom.xml b/versions-maven-plugin/src/it/it-use-reactor-001/the-parent/pom.xml
similarity index 100%
rename from src/it/it-use-reactor-001/the-parent/pom.xml
rename to versions-maven-plugin/src/it/it-use-reactor-001/the-parent/pom.xml
diff --git a/src/it/it-use-reactor-001/verify.bsh b/versions-maven-plugin/src/it/it-use-reactor-001/verify.bsh
similarity index 100%
rename from src/it/it-use-reactor-001/verify.bsh
rename to versions-maven-plugin/src/it/it-use-reactor-001/verify.bsh
diff --git a/src/it/it-use-reactor-002/invoker.properties b/versions-maven-plugin/src/it/it-use-reactor-002/invoker.properties
similarity index 100%
rename from src/it/it-use-reactor-002/invoker.properties
rename to versions-maven-plugin/src/it/it-use-reactor-002/invoker.properties
diff --git a/src/it/it-use-reactor-002/module-a1/pom.xml b/versions-maven-plugin/src/it/it-use-reactor-002/module-a1/pom.xml
similarity index 100%
rename from src/it/it-use-reactor-002/module-a1/pom.xml
rename to versions-maven-plugin/src/it/it-use-reactor-002/module-a1/pom.xml
diff --git a/src/it/it-use-reactor-002/module-a2/pom.xml b/versions-maven-plugin/src/it/it-use-reactor-002/module-a2/pom.xml
similarity index 100%
rename from src/it/it-use-reactor-002/module-a2/pom.xml
rename to versions-maven-plugin/src/it/it-use-reactor-002/module-a2/pom.xml
diff --git a/src/it/it-use-reactor-002/pom.xml b/versions-maven-plugin/src/it/it-use-reactor-002/pom.xml
similarity index 100%
rename from src/it/it-use-reactor-002/pom.xml
rename to versions-maven-plugin/src/it/it-use-reactor-002/pom.xml
diff --git a/src/it/it-use-reactor-002/the-grandparent/pom.xml b/versions-maven-plugin/src/it/it-use-reactor-002/the-grandparent/pom.xml
similarity index 100%
rename from src/it/it-use-reactor-002/the-grandparent/pom.xml
rename to versions-maven-plugin/src/it/it-use-reactor-002/the-grandparent/pom.xml
diff --git a/src/it/it-use-reactor-002/the-parent/pom.xml b/versions-maven-plugin/src/it/it-use-reactor-002/the-parent/pom.xml
similarity index 100%
rename from src/it/it-use-reactor-002/the-parent/pom.xml
rename to versions-maven-plugin/src/it/it-use-reactor-002/the-parent/pom.xml
diff --git a/src/it/it-use-reactor-002/verify.bsh b/versions-maven-plugin/src/it/it-use-reactor-002/verify.bsh
similarity index 100%
rename from src/it/it-use-reactor-002/verify.bsh
rename to versions-maven-plugin/src/it/it-use-reactor-002/verify.bsh
diff --git a/src/it/it-use-releases-001/invoker.properties b/versions-maven-plugin/src/it/it-use-releases-001/invoker.properties
similarity index 100%
rename from src/it/it-use-releases-001/invoker.properties
rename to versions-maven-plugin/src/it/it-use-releases-001/invoker.properties
diff --git a/src/it/it-use-releases-001/pom.xml b/versions-maven-plugin/src/it/it-use-releases-001/pom.xml
similarity index 100%
rename from src/it/it-use-releases-001/pom.xml
rename to versions-maven-plugin/src/it/it-use-releases-001/pom.xml
diff --git a/src/it/it-use-releases-001/verify.bsh b/versions-maven-plugin/src/it/it-use-releases-001/verify.bsh
similarity index 100%
rename from src/it/it-use-releases-001/verify.bsh
rename to versions-maven-plugin/src/it/it-use-releases-001/verify.bsh
diff --git a/src/it/it-use-releases-002/invoker.properties b/versions-maven-plugin/src/it/it-use-releases-002/invoker.properties
similarity index 100%
rename from src/it/it-use-releases-002/invoker.properties
rename to versions-maven-plugin/src/it/it-use-releases-002/invoker.properties
diff --git a/src/it/it-use-releases-002/pom.xml b/versions-maven-plugin/src/it/it-use-releases-002/pom.xml
similarity index 100%
rename from src/it/it-use-releases-002/pom.xml
rename to versions-maven-plugin/src/it/it-use-releases-002/pom.xml
diff --git a/src/it/it-use-releases-002/verify.bsh b/versions-maven-plugin/src/it/it-use-releases-002/verify.bsh
similarity index 100%
rename from src/it/it-use-releases-002/verify.bsh
rename to versions-maven-plugin/src/it/it-use-releases-002/verify.bsh
diff --git a/src/it/it-use-releases-003/invoker.properties b/versions-maven-plugin/src/it/it-use-releases-003/invoker.properties
similarity index 100%
rename from src/it/it-use-releases-003/invoker.properties
rename to versions-maven-plugin/src/it/it-use-releases-003/invoker.properties
diff --git a/src/it/it-use-releases-003/pom.xml b/versions-maven-plugin/src/it/it-use-releases-003/pom.xml
similarity index 100%
rename from src/it/it-use-releases-003/pom.xml
rename to versions-maven-plugin/src/it/it-use-releases-003/pom.xml
diff --git a/src/it/it-use-releases-003/verify.bsh b/versions-maven-plugin/src/it/it-use-releases-003/verify.bsh
similarity index 100%
rename from src/it/it-use-releases-003/verify.bsh
rename to versions-maven-plugin/src/it/it-use-releases-003/verify.bsh
diff --git a/src/it/it-use-releases-issue-583/invoker.properties b/versions-maven-plugin/src/it/it-use-releases-issue-583/invoker.properties
similarity index 100%
rename from src/it/it-use-releases-issue-583/invoker.properties
rename to versions-maven-plugin/src/it/it-use-releases-issue-583/invoker.properties
diff --git a/src/it/it-use-releases-issue-583/pom.xml b/versions-maven-plugin/src/it/it-use-releases-issue-583/pom.xml
similarity index 100%
rename from src/it/it-use-releases-issue-583/pom.xml
rename to versions-maven-plugin/src/it/it-use-releases-issue-583/pom.xml
diff --git a/src/it/it-use-releases-issue-583/verify.bsh b/versions-maven-plugin/src/it/it-use-releases-issue-583/verify.bsh
similarity index 100%
rename from src/it/it-use-releases-issue-583/verify.bsh
rename to versions-maven-plugin/src/it/it-use-releases-issue-583/verify.bsh
diff --git a/src/it/prep-settings.xml b/versions-maven-plugin/src/it/prep-settings.xml
similarity index 100%
rename from src/it/prep-settings.xml
rename to versions-maven-plugin/src/it/prep-settings.xml
diff --git a/src/it/settings.xml b/versions-maven-plugin/src/it/settings.xml
similarity index 100%
rename from src/it/settings.xml
rename to versions-maven-plugin/src/it/settings.xml
diff --git a/src/it/setup-provide-rules-in-jar/invoker.properties b/versions-maven-plugin/src/it/setup-provide-rules-in-jar/invoker.properties
similarity index 100%
rename from src/it/setup-provide-rules-in-jar/invoker.properties
rename to versions-maven-plugin/src/it/setup-provide-rules-in-jar/invoker.properties
diff --git a/src/it/setup-provide-rules-in-jar/pom.xml b/versions-maven-plugin/src/it/setup-provide-rules-in-jar/pom.xml
similarity index 100%
rename from src/it/setup-provide-rules-in-jar/pom.xml
rename to versions-maven-plugin/src/it/setup-provide-rules-in-jar/pom.xml
diff --git a/src/it/setup-provide-rules-in-jar/src/main/resources/package/foo/bar/rules.xml b/versions-maven-plugin/src/it/setup-provide-rules-in-jar/src/main/resources/package/foo/bar/rules.xml
similarity index 100%
rename from src/it/setup-provide-rules-in-jar/src/main/resources/package/foo/bar/rules.xml
rename to versions-maven-plugin/src/it/setup-provide-rules-in-jar/src/main/resources/package/foo/bar/rules.xml
diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDependencyUpdaterMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDependencyUpdaterMojo.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/AbstractVersionsDependencyUpdaterMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDependencyUpdaterMojo.java
diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDisplayMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDisplayMojo.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/AbstractVersionsDisplayMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsDisplayMojo.java
diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java
index 336febe83..3d7b14ed5 100644
--- a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java
@@ -44,8 +44,8 @@
 import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.settings.Settings;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.DefaultVersionsHelper;
 import org.codehaus.mojo.versions.api.VersionsHelper;
+import org.codehaus.mojo.versions.impl.DefaultVersionsHelper;
 import org.codehaus.mojo.versions.model.RuleSet;
 import org.codehaus.mojo.versions.reporting.ReportRendererFactory;
 import org.codehaus.plexus.i18n.I18N;
diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java
index ca59f3755..3ffe096c0 100644
--- a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojo.java
@@ -53,11 +53,12 @@
 import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.settings.Settings;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.DefaultVersionsHelper;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
+import org.codehaus.mojo.versions.api.Property;
 import org.codehaus.mojo.versions.api.PropertyVersions;
 import org.codehaus.mojo.versions.api.Segment;
 import org.codehaus.mojo.versions.api.VersionsHelper;
+import org.codehaus.mojo.versions.impl.DefaultVersionsHelper;
 import org.codehaus.mojo.versions.model.RuleSet;
 import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
 import org.codehaus.mojo.versions.recording.ChangeRecorder;
diff --git a/src/main/java/org/codehaus/mojo/versions/CommitMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/CommitMojo.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/CommitMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/CommitMojo.java
diff --git a/src/main/java/org/codehaus/mojo/versions/CompareDependenciesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/CompareDependenciesMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/CompareDependenciesMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/CompareDependenciesMojo.java
index 1c015fd82..e2d8c2420 100644
--- a/src/main/java/org/codehaus/mojo/versions/CompareDependenciesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/CompareDependenciesMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.io.File;
@@ -45,10 +46,11 @@
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactAssociation;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.api.Property;
 import org.codehaus.mojo.versions.api.PropertyVersions;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 import org.codehaus.mojo.versions.utils.DependencyBuilder;
+import org.codehaus.mojo.versions.utils.PomHelper;
 
 /**
  * Compare dependency versions of the current project to dependencies or dependency management of a remote repository
@@ -137,7 +139,7 @@ public CompareDependenciesMojo( RepositorySystem repositorySystem,
      * @throws org.apache.maven.plugin.MojoExecutionException Something wrong with the plugin itself
      * @throws org.apache.maven.plugin.MojoFailureException   The plugin detected an error in the build
      * @throws javax.xml.stream.XMLStreamException            when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException
diff --git a/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojo.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojo.java
diff --git a/src/main/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojo.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojo.java
index 0c8c23d91..88cfaf64e 100644
--- a/src/main/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.ArrayList;
@@ -789,7 +790,7 @@ private void logUpdates( Map<Dependency, ArtifactVersions> updates, String secti
      * @throws org.apache.maven.plugin.MojoExecutionException when things go wrong
      * @throws org.apache.maven.plugin.MojoFailureException   when things go wrong in a very bad way
      * @throws javax.xml.stream.XMLStreamException            when things go wrong with XML streaming
-     * @see org.codehaus.mojo.versions.AbstractVersionsUpdaterMojo#update(org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader)
+     * @see org.codehaus.mojo.versions.AbstractVersionsUpdaterMojo#update(XMLEventReader)
      * @since 1.0-alpha-1
      */
     @Override
diff --git a/src/main/java/org/codehaus/mojo/versions/DisplayParentUpdatesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayParentUpdatesMojo.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/DisplayParentUpdatesMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayParentUpdatesMojo.java
diff --git a/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java
index fe15039f7..438fa3e6b 100644
--- a/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPluginUpdatesMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.XMLEvent;
 
@@ -93,7 +94,7 @@
 import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.settings.Settings;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.ordering.MavenVersionComparator;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 import org.codehaus.mojo.versions.utils.DependencyBuilder;
@@ -215,7 +216,7 @@ private Map<String, String> getSuperPomPluginManagement()
                         try ( Reader reader = ReaderFactory.newXmlReader( superPom ) )
                         {
                             StringBuilder buf = new StringBuilder( IOUtil.toString( reader ) );
-                            ModifiedPomXMLEventReader pom = newModifiedPomXER( buf, superPom.toString() );
+                            XMLEventReader pom = newModifiedPomXER( buf, superPom.toString() );
 
                             Pattern pathRegex = Pattern.compile( "/project(/profiles/profile)?"
                                                                      + "((/build(/pluginManagement)?)|(/reporting))"
@@ -881,7 +882,7 @@ private Set<String> findPluginsWithVersionsSpecified( StringBuilder pomContents,
         throws XMLStreamException
     {
         Set<String> result = new HashSet<>();
-        ModifiedPomXMLEventReader pom = newModifiedPomXER( pomContents, path );
+        XMLEventReader pom = newModifiedPomXER( pomContents, path );
 
         Pattern pathRegex = Pattern.compile( "/project(/profiles/profile)?"
                                                  + "((/build(/pluginManagement)?)|(/reporting))" + "/plugins/plugin" );
@@ -1821,7 +1822,7 @@ private Map<String, String> getReportPlugins( Model model, boolean onlyIncludeIn
      * @throws MojoExecutionException when things go wrong
      * @throws MojoFailureException   when things go wrong in a very bad way
      * @throws XMLStreamException     when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      * @since 1.0-alpha-1
      */
     protected void update( ModifiedPomXMLEventReader pom )
diff --git a/src/main/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojo.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojo.java
index 2120aac1c..6d309945d 100644
--- a/src/main/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojo.java
@@ -40,6 +40,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
+import org.codehaus.mojo.versions.api.Property;
 import org.codehaus.mojo.versions.api.PropertyVersions;
 import org.codehaus.mojo.versions.api.Segment;
 import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
diff --git a/src/main/java/org/codehaus/mojo/versions/ForceReleasesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ForceReleasesMojo.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/ForceReleasesMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ForceReleasesMojo.java
index 56c981264..f2514349c 100644
--- a/src/main/java/org/codehaus/mojo/versions/ForceReleasesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ForceReleasesMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.Collection;
@@ -39,7 +40,7 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 /**
@@ -77,7 +78,7 @@ public ForceReleasesMojo( RepositorySystem repositorySystem,
      * @throws org.apache.maven.plugin.MojoExecutionException when things go wrong
      * @throws org.apache.maven.plugin.MojoFailureException   when things go wrong in a very bad way
      * @throws javax.xml.stream.XMLStreamException            when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException
diff --git a/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java
index 9e17a3594..97d249cb6 100644
--- a/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/LockSnapshotsMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.Collection;
@@ -37,7 +38,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 /**
@@ -78,7 +79,7 @@ public LockSnapshotsMojo( RepositorySystem repositorySystem,
      * @throws MojoExecutionException when things go wrong
      * @throws MojoFailureException when things go wrong in a very bad way
      * @throws XMLStreamException when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException
diff --git a/src/main/java/org/codehaus/mojo/versions/MinimalMavenBuildVersionFinder.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/MinimalMavenBuildVersionFinder.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/MinimalMavenBuildVersionFinder.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/MinimalMavenBuildVersionFinder.java
diff --git a/src/main/java/org/codehaus/mojo/versions/ParentUpdatesReportMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ParentUpdatesReportMojo.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/ParentUpdatesReportMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ParentUpdatesReportMojo.java
diff --git a/src/main/java/org/codehaus/mojo/versions/PluginUpdatesReportMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/PluginUpdatesReportMojo.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/PluginUpdatesReportMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/PluginUpdatesReportMojo.java
index 1b47c0f7c..18d5f7ed8 100644
--- a/src/main/java/org/codehaus/mojo/versions/PluginUpdatesReportMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/PluginUpdatesReportMojo.java
@@ -41,6 +41,7 @@
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.repository.RepositorySystem;
+import org.codehaus.mojo.versions.api.PluginUpdatesDetails;
 import org.codehaus.mojo.versions.reporting.ReportRendererFactory;
 import org.codehaus.mojo.versions.reporting.model.PluginUpdatesModel;
 import org.codehaus.mojo.versions.utils.PluginComparator;
diff --git a/src/main/java/org/codehaus/mojo/versions/PropertyUpdatesReportMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/PropertyUpdatesReportMojo.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/PropertyUpdatesReportMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/PropertyUpdatesReportMojo.java
index 3299d0e0e..bbde7e9af 100644
--- a/src/main/java/org/codehaus/mojo/versions/PropertyUpdatesReportMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/PropertyUpdatesReportMojo.java
@@ -35,6 +35,7 @@
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.reporting.MavenReportException;
 import org.apache.maven.repository.RepositorySystem;
+import org.codehaus.mojo.versions.api.Property;
 import org.codehaus.mojo.versions.api.PropertyVersions;
 import org.codehaus.mojo.versions.reporting.ReportRendererFactory;
 import org.codehaus.mojo.versions.reporting.model.PropertyUpdatesModel;
diff --git a/src/main/java/org/codehaus/mojo/versions/ResolveRangesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ResolveRangesMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/ResolveRangesMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ResolveRangesMojo.java
index db997e1b0..bd32f46c5 100644
--- a/src/main/java/org/codehaus/mojo/versions/ResolveRangesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ResolveRangesMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.Collection;
@@ -43,11 +44,12 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.api.Property;
 import org.codehaus.mojo.versions.api.PropertyVersions;
 import org.codehaus.mojo.versions.api.Segment;
 import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.utils.SegmentUtils;
 
 /**
@@ -139,7 +141,7 @@ public ResolveRangesMojo( RepositorySystem repositorySystem,
      * @throws MojoExecutionException when things go wrong
      * @throws MojoFailureException   when things go wrong in a very bad way
      * @throws XMLStreamException     when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException, ArtifactMetadataRetrievalException
diff --git a/src/main/java/org/codehaus/mojo/versions/RevertMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/RevertMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/RevertMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/RevertMojo.java
index c2c294fcf..672ff1b6b 100644
--- a/src/main/java/org/codehaus/mojo/versions/RevertMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/RevertMojo.java
@@ -35,7 +35,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
diff --git a/src/main/java/org/codehaus/mojo/versions/SetMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetMojo.java
similarity index 95%
rename from src/main/java/org/codehaus/mojo/versions/SetMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetMojo.java
index 0305a2968..5ede2204c 100644
--- a/src/main/java/org/codehaus/mojo/versions/SetMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetMojo.java
@@ -28,6 +28,7 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -52,14 +53,13 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.mojo.versions.api.PomHelper;
 import org.codehaus.mojo.versions.change.VersionChange;
 import org.codehaus.mojo.versions.change.VersionChanger;
 import org.codehaus.mojo.versions.change.VersionChangerFactory;
-import org.codehaus.mojo.versions.ordering.ReactorDepthComparator;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 import org.codehaus.mojo.versions.utils.ContextualLog;
 import org.codehaus.mojo.versions.utils.DelegatingContextualLog;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.utils.RegexUtils;
 import org.codehaus.plexus.components.interactivity.Prompter;
 import org.codehaus.plexus.components.interactivity.PrompterException;
@@ -643,4 +643,38 @@ else if ( buildOutputTimestamp.length() <= 1 )
         PomHelper.setPropertyVersion( pom, null, "project.build.outputTimestamp", buildOutputTimestamp );
     }
 
+
+    /**
+     * Compares project paths relative to the base directory based on their depth in a reactor
+     *
+     * @author Stephen Connolly
+     * @since 15-Sep-2010 14:54:42
+     */
+    protected static class ReactorDepthComparator
+            implements Comparator<String>
+    {
+        private final Map<String, Model> reactor;
+
+        protected ReactorDepthComparator( Map<String, Model> reactor )
+        {
+            this.reactor = reactor;
+        }
+
+        public int compare( String o1, String o2 )
+        {
+            final Model m1 = reactor.get( o1 );
+            final Model m2 = reactor.get( o2 );
+            final int d1 = PomHelper.getReactorParentCount( reactor, m1 );
+            final int d2 = PomHelper.getReactorParentCount( reactor, m2 );
+            if ( d1 < d2 )
+            {
+                return -1;
+            }
+            else if ( d1 > d2 )
+            {
+                return 1;
+            }
+            return PomHelper.getGAV( m1 ).compareTo( PomHelper.getGAV( m2 ) );
+        }
+    }
 }
diff --git a/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java
index 6ab591534..b84c6a624 100644
--- a/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetPropertyMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.io.IOException;
@@ -35,9 +36,10 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.api.Property;
 import org.codehaus.mojo.versions.api.PropertyVersions;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.utils.PropertiesVersionsFileReader;
 
 import static org.apache.commons.lang3.StringUtils.defaultString;
@@ -103,7 +105,7 @@ public SetPropertyMojo( RepositorySystem repositorySystem,
      * @throws MojoExecutionException when things go wrong
      * @throws MojoFailureException   when things go wrong in a very bad way
      * @throws XMLStreamException     when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException
diff --git a/src/main/java/org/codehaus/mojo/versions/SetScmTagMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetScmTagMojo.java
similarity index 96%
rename from src/main/java/org/codehaus/mojo/versions/SetScmTagMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetScmTagMojo.java
index addeab5dc..eeaf92f82 100644
--- a/src/main/java/org/codehaus/mojo/versions/SetScmTagMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/SetScmTagMojo.java
@@ -1,160 +1,160 @@
-package org.codehaus.mojo.versions;
-
-import javax.inject.Inject;
-import javax.xml.stream.XMLStreamException;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.maven.artifact.manager.WagonManager;
-import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.model.Scm;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProjectBuilder;
-import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.mojo.versions.api.PomHelper;
-import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
-
-import static org.apache.commons.lang3.StringUtils.isAllBlank;
-import static org.apache.commons.lang3.StringUtils.isBlank;
-
-/**
- * Updates the current project's SCM tag.
- *
- * @author Anton Johansson
- * @since 2.5
- */
-@Mojo( name = "set-scm-tag", aggregator = true, threadSafe = true )
-public class SetScmTagMojo extends AbstractVersionsUpdaterMojo
-{
-
-    /**
-     * The new SCM tag to set.
-     *
-     * @since 2.5
-     */
-    @Parameter( property = "newTag" )
-    private String newTag;
-
-    /**
-     * The new SCM connection property
-     *
-     * @since 2.12.0
-     */
-    @Parameter( property = "connection" )
-    private String connection;
-
-    /**
-     * The new SCM developerConnection property
-     *
-     * @since 2.12.0
-     */
-    @Parameter( property = "developerConnection" )
-    private String developerConnection;
-
-    /**
-     * The new SCM url property
-     *
-     * @since 2.12.0
-     */
-    @Parameter( property = "url" )
-    private String url;
-
-    @Inject
-    public SetScmTagMojo( RepositorySystem repositorySystem,
-                                           MavenProjectBuilder projectBuilder,
-                                           ArtifactMetadataSource artifactMetadataSource,
-                                           WagonManager wagonManager,
-                                           ArtifactResolver artifactResolver )
-    {
-        super( repositorySystem, projectBuilder, artifactMetadataSource, wagonManager, artifactResolver );
-    }
-
-    /**
-     * Called when this mojo is executed.
-     *
-     * @throws org.apache.maven.plugin.MojoExecutionException when things go wrong.
-     * @throws org.apache.maven.plugin.MojoFailureException   when things go wrong.
-     */
-    @Override
-    public void execute() throws MojoExecutionException, MojoFailureException
-    {
-        if ( isAllBlank( newTag, connection, developerConnection, url ) )
-        {
-            throw new MojoFailureException(
-                    "One of: \"newTag\", \"connection\", \"developerConnection\", \"url\" should be provided." );
-        }
-
-        super.execute();
-    }
-
-    @Override
-    protected void update( ModifiedPomXMLEventReader pom )
-            throws MojoExecutionException, MojoFailureException, XMLStreamException, ArtifactMetadataRetrievalException
-    {
-        try
-        {
-            Scm scm = PomHelper.getRawModel( pom ).getScm();
-            if ( scm == null )
-            {
-                throw new MojoFailureException( "No <scm> was present" );
-            }
-
-            List<String> failures = new ArrayList<>();
-            if ( !isBlank( newTag ) )
-            {
-                getLog().info( "Updating tag: " + ( scm != null && scm.getTag() != null
-                        ? scm.getTag() : "(empty)" ) + " -> " + newTag );
-                if ( !PomHelper.setElementValue( pom, "/project/scm", "tag", newTag ) )
-                {
-                    failures.add( "tag: " + newTag );
-                }
-            }
-            if ( !isBlank( connection ) )
-            {
-                getLog().info( "Updating connection: " + ( scm != null && scm.getConnection() != null
-                        ? scm.getConnection() : "(empty)" ) + " -> " + connection );
-                if ( !PomHelper.setElementValue( pom, "/project/scm", "connection", connection ) )
-                {
-                    failures.add( "connection: " + connection );
-                }
-            }
-            if ( !isBlank( developerConnection ) )
-            {
-                getLog().info( "Updating developerConnection: "
-                        + ( scm != null && scm.getDeveloperConnection() != null
-                        ? scm.getDeveloperConnection() : "(empty)" ) + " -> "
-                        + developerConnection );
-                if ( !PomHelper.setElementValue( pom, "/project/scm", "developerConnection",
-                        developerConnection ) )
-                {
-                    failures.add( "developerConnection: " + developerConnection );
-                }
-            }
-            if ( !isBlank( url ) )
-            {
-                getLog().info( "Updating url: " + ( scm != null && scm.getUrl() != null
-                        ? scm.getUrl() : "(empty)" ) + " -> " + url );
-                if ( !PomHelper.setElementValue( pom, "/project/scm", "url", url ) )
-                {
-                    failures.add( "url: " + url );
-                }
-            }
-            if ( !failures.isEmpty() )
-            {
-                throw new MojoFailureException( "Could not update one or more SCM elements: " + String.join( ", ",
-                        failures ) + ". Please make sure they are present in the original POM. " );
-            }
-        }
-        catch ( IOException e )
-        {
-            throw new MojoExecutionException( e.getMessage(), e );
-        }
-    }
-}
+package org.codehaus.mojo.versions;
+
+import javax.inject.Inject;
+import javax.xml.stream.XMLStreamException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.model.Scm;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.repository.RepositorySystem;
+import org.codehaus.mojo.versions.utils.PomHelper;
+import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
+
+import static org.apache.commons.lang3.StringUtils.isAllBlank;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+/**
+ * Updates the current project's SCM tag.
+ *
+ * @author Anton Johansson
+ * @since 2.5
+ */
+@Mojo( name = "set-scm-tag", aggregator = true, threadSafe = true )
+public class SetScmTagMojo extends AbstractVersionsUpdaterMojo
+{
+
+    /**
+     * The new SCM tag to set.
+     *
+     * @since 2.5
+     */
+    @Parameter( property = "newTag" )
+    private String newTag;
+
+    /**
+     * The new SCM connection property
+     *
+     * @since 2.12.0
+     */
+    @Parameter( property = "connection" )
+    private String connection;
+
+    /**
+     * The new SCM developerConnection property
+     *
+     * @since 2.12.0
+     */
+    @Parameter( property = "developerConnection" )
+    private String developerConnection;
+
+    /**
+     * The new SCM url property
+     *
+     * @since 2.12.0
+     */
+    @Parameter( property = "url" )
+    private String url;
+
+    @Inject
+    public SetScmTagMojo( RepositorySystem repositorySystem,
+                                           MavenProjectBuilder projectBuilder,
+                                           ArtifactMetadataSource artifactMetadataSource,
+                                           WagonManager wagonManager,
+                                           ArtifactResolver artifactResolver )
+    {
+        super( repositorySystem, projectBuilder, artifactMetadataSource, wagonManager, artifactResolver );
+    }
+
+    /**
+     * Called when this mojo is executed.
+     *
+     * @throws org.apache.maven.plugin.MojoExecutionException when things go wrong.
+     * @throws org.apache.maven.plugin.MojoFailureException   when things go wrong.
+     */
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException
+    {
+        if ( isAllBlank( newTag, connection, developerConnection, url ) )
+        {
+            throw new MojoFailureException(
+                    "One of: \"newTag\", \"connection\", \"developerConnection\", \"url\" should be provided." );
+        }
+
+        super.execute();
+    }
+
+    @Override
+    protected void update( ModifiedPomXMLEventReader pom )
+            throws MojoExecutionException, MojoFailureException, XMLStreamException, ArtifactMetadataRetrievalException
+    {
+        try
+        {
+            Scm scm = PomHelper.getRawModel( pom ).getScm();
+            if ( scm == null )
+            {
+                throw new MojoFailureException( "No <scm> was present" );
+            }
+
+            List<String> failures = new ArrayList<>();
+            if ( !isBlank( newTag ) )
+            {
+                getLog().info( "Updating tag: " + ( scm != null && scm.getTag() != null
+                        ? scm.getTag() : "(empty)" ) + " -> " + newTag );
+                if ( !PomHelper.setElementValue( pom, "/project/scm", "tag", newTag ) )
+                {
+                    failures.add( "tag: " + newTag );
+                }
+            }
+            if ( !isBlank( connection ) )
+            {
+                getLog().info( "Updating connection: " + ( scm != null && scm.getConnection() != null
+                        ? scm.getConnection() : "(empty)" ) + " -> " + connection );
+                if ( !PomHelper.setElementValue( pom, "/project/scm", "connection", connection ) )
+                {
+                    failures.add( "connection: " + connection );
+                }
+            }
+            if ( !isBlank( developerConnection ) )
+            {
+                getLog().info( "Updating developerConnection: "
+                        + ( scm != null && scm.getDeveloperConnection() != null
+                        ? scm.getDeveloperConnection() : "(empty)" ) + " -> "
+                        + developerConnection );
+                if ( !PomHelper.setElementValue( pom, "/project/scm", "developerConnection",
+                        developerConnection ) )
+                {
+                    failures.add( "developerConnection: " + developerConnection );
+                }
+            }
+            if ( !isBlank( url ) )
+            {
+                getLog().info( "Updating url: " + ( scm != null && scm.getUrl() != null
+                        ? scm.getUrl() : "(empty)" ) + " -> " + url );
+                if ( !PomHelper.setElementValue( pom, "/project/scm", "url", url ) )
+                {
+                    failures.add( "url: " + url );
+                }
+            }
+            if ( !failures.isEmpty() )
+            {
+                throw new MojoFailureException( "Could not update one or more SCM elements: " + String.join( ", ",
+                        failures ) + ". Please make sure they are present in the original POM. " );
+            }
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException( e.getMessage(), e );
+        }
+    }
+}
diff --git a/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java
index d338a53d3..6008c35b3 100644
--- a/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UnlockSnapshotsMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.List;
@@ -37,7 +38,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 /**
@@ -77,7 +78,7 @@ public UnlockSnapshotsMojo( RepositorySystem repositorySystem,
      * @throws MojoExecutionException when things go wrong
      * @throws MojoFailureException   when things go wrong in a very bad way
      * @throws XMLStreamException     when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException
diff --git a/src/main/java/org/codehaus/mojo/versions/UpdateChildModulesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateChildModulesMojo.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/UpdateChildModulesMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateChildModulesMojo.java
index be50bbeb0..7841a9578 100644
--- a/src/main/java/org/codehaus/mojo/versions/UpdateChildModulesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateChildModulesMojo.java
@@ -39,7 +39,7 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 /**
diff --git a/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java
index caa60b4ce..caef10a97 100644
--- a/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdateParentMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.Arrays;
@@ -43,7 +44,7 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.api.Segment;
 import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
@@ -150,7 +151,7 @@ public UpdateParentMojo( RepositorySystem repositorySystem,
      * @throws MojoExecutionException when things go wrong
      * @throws MojoFailureException   when things go wrong in a very bad way
      * @throws XMLStreamException     when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      * @since 1.0-alpha-1
      */
     protected void update( ModifiedPomXMLEventReader pom )
diff --git a/src/main/java/org/codehaus/mojo/versions/UpdatePropertiesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertiesMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/UpdatePropertiesMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertiesMojo.java
index 9e20ce076..14c94cad2 100644
--- a/src/main/java/org/codehaus/mojo/versions/UpdatePropertiesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertiesMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.Map;
@@ -37,6 +38,7 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactAssociation;
+import org.codehaus.mojo.versions.api.Property;
 import org.codehaus.mojo.versions.api.PropertyVersions;
 import org.codehaus.mojo.versions.api.Segment;
 import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
@@ -150,7 +152,7 @@ public UpdatePropertiesMojo( RepositorySystem repositorySystem,
      * @throws MojoExecutionException when things go wrong
      * @throws MojoFailureException   when things go wrong in a very bad way
      * @throws XMLStreamException     when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      * @since 1.0-alpha-1
      */
     protected void update( ModifiedPomXMLEventReader pom )
diff --git a/src/main/java/org/codehaus/mojo/versions/UpdatePropertyMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertyMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/UpdatePropertyMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertyMojo.java
index 4e8cecc7e..8101ba7f9 100644
--- a/src/main/java/org/codehaus/mojo/versions/UpdatePropertyMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UpdatePropertyMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.Map;
@@ -37,6 +38,7 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactAssociation;
+import org.codehaus.mojo.versions.api.Property;
 import org.codehaus.mojo.versions.api.PropertyVersions;
 import org.codehaus.mojo.versions.api.Segment;
 import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
@@ -149,7 +151,7 @@ public UpdatePropertyMojo( RepositorySystem repositorySystem,
      * @throws MojoExecutionException when things go wrong
      * @throws MojoFailureException   when things go wrong in a very bad way
      * @throws XMLStreamException     when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      * @since 1.0-alpha-1
      */
     protected void update( ModifiedPomXMLEventReader pom )
diff --git a/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java
index ccd389e0a..94d756569 100644
--- a/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java
@@ -37,7 +37,7 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 /**
diff --git a/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java
index d0464d1f4..e55457773 100644
--- a/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.ArrayList;
@@ -47,7 +48,7 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.api.Segment;
 import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
@@ -120,7 +121,7 @@ public UseLatestReleasesMojo( RepositorySystem repositorySystem,
      * @throws org.apache.maven.plugin.MojoExecutionException when things go wrong
      * @throws org.apache.maven.plugin.MojoFailureException   when things go wrong in a very bad way
      * @throws javax.xml.stream.XMLStreamException            when things go wrong with XML streaming
-     * @see org.codehaus.mojo.versions.AbstractVersionsUpdaterMojo#update(org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader)
+     * @see org.codehaus.mojo.versions.AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException
diff --git a/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java
index b593d5263..ba23c25bd 100644
--- a/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.ArrayList;
@@ -45,7 +46,7 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.api.Segment;
 import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
 import org.codehaus.mojo.versions.ordering.VersionComparator;
@@ -118,7 +119,7 @@ public UseLatestSnapshotsMojo( RepositorySystem repositorySystem,
      * @throws org.apache.maven.plugin.MojoExecutionException when things go wrong
      * @throws org.apache.maven.plugin.MojoFailureException   when things go wrong in a very bad way
      * @throws javax.xml.stream.XMLStreamException            when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException
diff --git a/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java
index 8b9b23430..750156f2e 100644
--- a/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.io.IOException;
@@ -42,7 +43,7 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.api.Segment;
 import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
@@ -126,7 +127,7 @@ public void execute() throws MojoExecutionException, MojoFailureException
      * @throws org.apache.maven.plugin.MojoExecutionException when things go wrong
      * @throws org.apache.maven.plugin.MojoFailureException   when things go wrong in a very bad way
      * @throws javax.xml.stream.XMLStreamException            when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException
diff --git a/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java
index 149cc23f0..fa70aba6f 100644
--- a/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.Collection;
@@ -39,7 +40,7 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 /**
@@ -77,7 +78,7 @@ public UseNextReleasesMojo( RepositorySystem repositorySystem,
      * @throws org.apache.maven.plugin.MojoExecutionException when things go wrong
      * @throws org.apache.maven.plugin.MojoFailureException when things go wrong in a very bad way
      * @throws javax.xml.stream.XMLStreamException when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException, ArtifactMetadataRetrievalException
diff --git a/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java
index a9e693a5b..881bd9975 100644
--- a/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.Arrays;
@@ -44,7 +45,7 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.api.Segment;
 import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
 import org.codehaus.mojo.versions.ordering.VersionComparator;
@@ -115,7 +116,7 @@ public UseNextSnapshotsMojo( RepositorySystem repositorySystem,
      * @throws org.apache.maven.plugin.MojoExecutionException when things go wrong
      * @throws org.apache.maven.plugin.MojoFailureException   when things go wrong in a very bad way
      * @throws javax.xml.stream.XMLStreamException            when things go wrong with XML streaming
-     * @see org.codehaus.mojo.versions.AbstractVersionsUpdaterMojo#update(org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader)
+     * @see org.codehaus.mojo.versions.AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException
diff --git a/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java
index ba0223cf9..a623af746 100644
--- a/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.Collection;
@@ -37,7 +38,7 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 /**
@@ -68,7 +69,7 @@ public UseNextVersionsMojo( RepositorySystem repositorySystem,
      * @throws org.apache.maven.plugin.MojoExecutionException when things go wrong
      * @throws org.apache.maven.plugin.MojoFailureException   when things go wrong in a very bad way
      * @throws javax.xml.stream.XMLStreamException            when things go wrong with XML streaming
-     * @see org.codehaus.mojo.versions.AbstractVersionsUpdaterMojo#update(org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader)
+     * @see org.codehaus.mojo.versions.AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException
diff --git a/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java
index b4d2b91f8..5535c2275 100644
--- a/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReactorMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.Collection;
@@ -37,7 +38,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 /**
@@ -68,7 +69,7 @@ public UseReactorMojo( RepositorySystem repositorySystem,
      * @throws org.apache.maven.plugin.MojoExecutionException when things go wrong
      * @throws org.apache.maven.plugin.MojoFailureException   when things go wrong in a very bad way
      * @throws javax.xml.stream.XMLStreamException            when things go wrong with XML streaming
-     * @see AbstractVersionsUpdaterMojo#update(org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader)
+     * @see AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException
diff --git a/src/main/java/org/codehaus/mojo/versions/UseReleasesMojo.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReleasesMojo.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/UseReleasesMojo.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReleasesMojo.java
index 6e71ff0aa..30c217ac0 100644
--- a/src/main/java/org/codehaus/mojo/versions/UseReleasesMojo.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/UseReleasesMojo.java
@@ -20,6 +20,7 @@
  */
 
 import javax.inject.Inject;
+import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 
 import java.util.Collection;
@@ -42,7 +43,7 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 import org.codehaus.mojo.versions.utils.DependencyBuilder;
 
@@ -97,7 +98,7 @@ public UseReleasesMojo( RepositorySystem repositorySystem,
      * @throws org.apache.maven.plugin.MojoExecutionException when things go wrong
      * @throws org.apache.maven.plugin.MojoFailureException   when things go wrong in a very bad way
      * @throws javax.xml.stream.XMLStreamException            when things go wrong with XML streaming
-     * @see org.codehaus.mojo.versions.AbstractVersionsUpdaterMojo#update(org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader)
+     * @see org.codehaus.mojo.versions.AbstractVersionsUpdaterMojo#update(XMLEventReader)
      */
     protected void update( ModifiedPomXMLEventReader pom )
         throws MojoExecutionException, MojoFailureException, XMLStreamException
diff --git a/src/main/java/org/codehaus/mojo/versions/change/AbstractVersionChanger.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/AbstractVersionChanger.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/change/AbstractVersionChanger.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/AbstractVersionChanger.java
diff --git a/src/main/java/org/codehaus/mojo/versions/change/CompositeVersionChanger.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/CompositeVersionChanger.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/change/CompositeVersionChanger.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/CompositeVersionChanger.java
diff --git a/src/main/java/org/codehaus/mojo/versions/change/DependencyVersionChanger.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/DependencyVersionChanger.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/change/DependencyVersionChanger.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/DependencyVersionChanger.java
index 2ae717322..24a8421ee 100644
--- a/src/main/java/org/codehaus/mojo/versions/change/DependencyVersionChanger.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/DependencyVersionChanger.java
@@ -23,7 +23,7 @@
 
 import org.apache.maven.model.Model;
 import org.apache.maven.plugin.logging.Log;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 /**
diff --git a/src/main/java/org/codehaus/mojo/versions/change/ParentVersionChanger.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/ParentVersionChanger.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/change/ParentVersionChanger.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/ParentVersionChanger.java
index 7d39e15a0..66e6fabb4 100644
--- a/src/main/java/org/codehaus/mojo/versions/change/ParentVersionChanger.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/ParentVersionChanger.java
@@ -23,7 +23,7 @@
 
 import org.apache.maven.model.Model;
 import org.apache.maven.plugin.logging.Log;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 /**
diff --git a/src/main/java/org/codehaus/mojo/versions/change/PluginVersionChanger.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/PluginVersionChanger.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/change/PluginVersionChanger.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/PluginVersionChanger.java
index 8c2f80ea1..c713a87fc 100644
--- a/src/main/java/org/codehaus/mojo/versions/change/PluginVersionChanger.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/PluginVersionChanger.java
@@ -23,7 +23,7 @@
 
 import org.apache.maven.model.Model;
 import org.apache.maven.plugin.logging.Log;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 /**
diff --git a/src/main/java/org/codehaus/mojo/versions/change/ProjectVersionChanger.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/ProjectVersionChanger.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/change/ProjectVersionChanger.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/ProjectVersionChanger.java
index 17fc8b9c8..299420009 100644
--- a/src/main/java/org/codehaus/mojo/versions/change/ProjectVersionChanger.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/ProjectVersionChanger.java
@@ -23,7 +23,7 @@
 
 import org.apache.maven.model.Model;
 import org.apache.maven.plugin.logging.Log;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 /**
diff --git a/src/main/java/org/codehaus/mojo/versions/change/VersionChange.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/VersionChange.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/change/VersionChange.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/VersionChange.java
diff --git a/src/main/java/org/codehaus/mojo/versions/change/VersionChanger.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/VersionChanger.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/change/VersionChanger.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/VersionChanger.java
diff --git a/src/main/java/org/codehaus/mojo/versions/change/VersionChangerFactory.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/VersionChangerFactory.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/change/VersionChangerFactory.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/VersionChangerFactory.java
index 1f1d543d6..9be3d3484 100644
--- a/src/main/java/org/codehaus/mojo/versions/change/VersionChangerFactory.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/change/VersionChangerFactory.java
@@ -19,6 +19,8 @@
  * under the License.
  */
 
+import javax.xml.stream.XMLEventReader;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -50,7 +52,7 @@ public synchronized void setModel( Model model )
         this.model = model;
     }
 
-    public synchronized ModifiedPomXMLEventReader getPom()
+    public synchronized XMLEventReader getPom()
     {
         return pom;
     }
diff --git a/src/main/java/org/codehaus/mojo/versions/filtering/DependencyFilter.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/filtering/DependencyFilter.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/filtering/DependencyFilter.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/filtering/DependencyFilter.java
diff --git a/src/main/java/org/codehaus/mojo/versions/filtering/NullAwareWildcardMatcher.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/filtering/NullAwareWildcardMatcher.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/filtering/NullAwareWildcardMatcher.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/filtering/NullAwareWildcardMatcher.java
diff --git a/src/main/java/org/codehaus/mojo/versions/filtering/TokenizedMatcher.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/filtering/TokenizedMatcher.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/filtering/TokenizedMatcher.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/filtering/TokenizedMatcher.java
diff --git a/src/main/java/org/codehaus/mojo/versions/filtering/WildcardMatcher.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/filtering/WildcardMatcher.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/filtering/WildcardMatcher.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/filtering/WildcardMatcher.java
diff --git a/src/main/java/org/codehaus/mojo/versions/api/DefaultArtifactAssociation.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/impl/DefaultArtifactAssociation.java
similarity index 92%
rename from src/main/java/org/codehaus/mojo/versions/api/DefaultArtifactAssociation.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/impl/DefaultArtifactAssociation.java
index e75ee3525..cf2b2901c 100644
--- a/src/main/java/org/codehaus/mojo/versions/api/DefaultArtifactAssociation.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/impl/DefaultArtifactAssociation.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.versions.api;
+package org.codehaus.mojo.versions.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,7 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.ArtifactUtils;
+import org.codehaus.mojo.versions.api.ArtifactAssociation;
 
 /**
  * Created by IntelliJ IDEA.
@@ -30,14 +31,14 @@
  * @author connollys
  * @since Aug 6, 2009 9:23:13 AM
  */
-final class DefaultArtifactAssociation
-    implements ArtifactAssociation
+public final class DefaultArtifactAssociation
+        implements ArtifactAssociation
 {
     private final Artifact artifact;
 
     private final boolean usePluginRepositories;
 
-    DefaultArtifactAssociation( Artifact artifact, boolean usePluginRepositories )
+    public DefaultArtifactAssociation( Artifact artifact, boolean usePluginRepositories )
     {
         Objects.requireNonNull( artifact );
         this.artifact = artifact;
diff --git a/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/impl/DefaultVersionsHelper.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/impl/DefaultVersionsHelper.java
index 947333b60..0013c1fe1 100644
--- a/src/main/java/org/codehaus/mojo/versions/api/DefaultVersionsHelper.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/impl/DefaultVersionsHelper.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.versions.api;
+package org.codehaus.mojo.versions.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -73,17 +73,22 @@
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.authentication.AuthenticationException;
 import org.apache.maven.wagon.authorization.AuthorizationException;
-import org.codehaus.mojo.versions.PluginUpdatesDetails;
-import org.codehaus.mojo.versions.Property;
+import org.codehaus.mojo.versions.api.ArtifactVersions;
+import org.codehaus.mojo.versions.api.PluginUpdatesDetails;
+import org.codehaus.mojo.versions.api.Property;
+import org.codehaus.mojo.versions.api.PropertyVersions;
+import org.codehaus.mojo.versions.api.VersionsHelper;
 import org.codehaus.mojo.versions.model.IgnoreVersion;
 import org.codehaus.mojo.versions.model.Rule;
 import org.codehaus.mojo.versions.model.RuleSet;
 import org.codehaus.mojo.versions.model.io.xpp3.RuleXpp3Reader;
 import org.codehaus.mojo.versions.ordering.VersionComparator;
 import org.codehaus.mojo.versions.ordering.VersionComparators;
+import org.codehaus.mojo.versions.reporting.util.PropertyVersionsBuilder;
 import org.codehaus.mojo.versions.utils.DependencyBuilder;
 import org.codehaus.mojo.versions.utils.DependencyComparator;
 import org.codehaus.mojo.versions.utils.PluginComparator;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.utils.RegexUtils;
 import org.codehaus.mojo.versions.utils.VersionsExpressionEvaluator;
 import org.codehaus.mojo.versions.utils.WagonUtils;
@@ -99,7 +104,7 @@
  * @since 1.0-alpha-3
  */
 public class DefaultVersionsHelper
-    implements VersionsHelper
+        implements VersionsHelper
 {
     private static final String CLASSPATH_PROTOCOL = "classpath";
 
diff --git a/src/main/java/org/codehaus/mojo/versions/recording/ChangeRecorder.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/recording/ChangeRecorder.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/recording/ChangeRecorder.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/recording/ChangeRecorder.java
diff --git a/src/main/java/org/codehaus/mojo/versions/recording/ChangeRecorderNull.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/recording/ChangeRecorderNull.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/recording/ChangeRecorderNull.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/recording/ChangeRecorderNull.java
diff --git a/src/main/java/org/codehaus/mojo/versions/recording/ChangeRecorderXML.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/recording/ChangeRecorderXML.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/recording/ChangeRecorderXML.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/recording/ChangeRecorderXML.java
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/AbstractVersionsReportRenderer.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/AbstractVersionsReportRenderer.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/reporting/AbstractVersionsReportRenderer.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/AbstractVersionsReportRenderer.java
index 2193ddef1..3debc90a4 100644
--- a/src/main/java/org/codehaus/mojo/versions/reporting/AbstractVersionsReportRenderer.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/AbstractVersionsReportRenderer.java
@@ -30,8 +30,8 @@
 import org.apache.maven.model.Dependency;
 import org.codehaus.mojo.versions.api.AbstractVersionDetails;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.ArtifactVersionsCache;
 import org.codehaus.mojo.versions.api.ReportRenderer;
+import org.codehaus.mojo.versions.reporting.util.ArtifactVersionsCache;
 import org.codehaus.plexus.i18n.I18N;
 
 import static java.util.Optional.empty;
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/DependencyUpdatesReportRenderer.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/DependencyUpdatesReportRenderer.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/reporting/DependencyUpdatesReportRenderer.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/DependencyUpdatesReportRenderer.java
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/OverviewStats.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/OverviewStats.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/reporting/OverviewStats.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/OverviewStats.java
index 998a2b0f5..a5d96bebd 100644
--- a/src/main/java/org/codehaus/mojo/versions/reporting/OverviewStats.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/OverviewStats.java
@@ -25,8 +25,8 @@
 
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.ArtifactVersionsCache;
 import org.codehaus.mojo.versions.api.Segment;
+import org.codehaus.mojo.versions.reporting.util.ArtifactVersionsCache;
 
 import static java.util.Optional.of;
 import static org.codehaus.mojo.versions.api.Segment.INCREMENTAL;
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/ParentUpdatesReportRenderer.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/ParentUpdatesReportRenderer.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/reporting/ParentUpdatesReportRenderer.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/ParentUpdatesReportRenderer.java
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/PluginOverviewStats.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/PluginOverviewStats.java
similarity index 94%
rename from src/main/java/org/codehaus/mojo/versions/reporting/PluginOverviewStats.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/PluginOverviewStats.java
index 2d215b75c..583adb248 100644
--- a/src/main/java/org/codehaus/mojo/versions/reporting/PluginOverviewStats.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/PluginOverviewStats.java
@@ -21,10 +21,10 @@
 import java.util.Collection;
 import java.util.Optional;
 
-import org.codehaus.mojo.versions.PluginUpdatesDetails;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.ArtifactVersionsCache;
+import org.codehaus.mojo.versions.api.PluginUpdatesDetails;
 import org.codehaus.mojo.versions.reporting.model.PluginUpdatesModel;
+import org.codehaus.mojo.versions.reporting.util.ArtifactVersionsCache;
 
 import static java.util.Optional.of;
 import static org.codehaus.mojo.versions.api.Segment.INCREMENTAL;
@@ -86,7 +86,7 @@ else if ( getNewestUpdate( cache, details, of( MAJOR ) ) != null )
             {
                 stats.incrementUpToDate();
             }
-            if ( ( ( PluginUpdatesDetails ) details ).isDependencyUpdateAvailable() )
+            if ( ( (PluginUpdatesDetails) details ).isDependencyUpdateAvailable() )
             {
                 stats.incrementDependencies();
             }
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/PluginUpdatesReportRenderer.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/PluginUpdatesReportRenderer.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/reporting/PluginUpdatesReportRenderer.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/PluginUpdatesReportRenderer.java
index 6d0713cd4..c878110a8 100644
--- a/src/main/java/org/codehaus/mojo/versions/reporting/PluginUpdatesReportRenderer.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/PluginUpdatesReportRenderer.java
@@ -29,8 +29,8 @@
 import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
 import org.apache.maven.model.Dependency;
-import org.codehaus.mojo.versions.PluginUpdatesDetails;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
+import org.codehaus.mojo.versions.api.PluginUpdatesDetails;
 import org.codehaus.mojo.versions.reporting.model.PluginUpdatesModel;
 import org.codehaus.plexus.i18n.I18N;
 
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/PropertyUpdatesReportRenderer.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/PropertyUpdatesReportRenderer.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/reporting/PropertyUpdatesReportRenderer.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/PropertyUpdatesReportRenderer.java
index ddb7287e8..357dbe02b 100644
--- a/src/main/java/org/codehaus/mojo/versions/reporting/PropertyUpdatesReportRenderer.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/PropertyUpdatesReportRenderer.java
@@ -31,8 +31,8 @@
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
-import org.codehaus.mojo.versions.Property;
 import org.codehaus.mojo.versions.api.ArtifactAssociation;
+import org.codehaus.mojo.versions.api.Property;
 import org.codehaus.mojo.versions.api.PropertyVersions;
 import org.codehaus.mojo.versions.reporting.model.PropertyUpdatesModel;
 import org.codehaus.plexus.i18n.I18N;
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/ReportRendererFactory.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/ReportRendererFactory.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/reporting/ReportRendererFactory.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/ReportRendererFactory.java
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/ReportRendererFactoryImpl.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/ReportRendererFactoryImpl.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/reporting/ReportRendererFactoryImpl.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/ReportRendererFactoryImpl.java
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/VersionsReportRendererBase.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/VersionsReportRendererBase.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/reporting/VersionsReportRendererBase.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/VersionsReportRendererBase.java
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/model/AbstractUpdatesModel.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/model/AbstractUpdatesModel.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/reporting/model/AbstractUpdatesModel.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/model/AbstractUpdatesModel.java
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/model/DependencyUpdatesModel.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/model/DependencyUpdatesModel.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/reporting/model/DependencyUpdatesModel.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/model/DependencyUpdatesModel.java
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/model/ParentUpdatesModel.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/model/ParentUpdatesModel.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/reporting/model/ParentUpdatesModel.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/model/ParentUpdatesModel.java
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/model/PluginUpdatesModel.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/model/PluginUpdatesModel.java
similarity index 96%
rename from src/main/java/org/codehaus/mojo/versions/reporting/model/PluginUpdatesModel.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/model/PluginUpdatesModel.java
index 1846624a5..db6c6a605 100644
--- a/src/main/java/org/codehaus/mojo/versions/reporting/model/PluginUpdatesModel.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/model/PluginUpdatesModel.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import org.apache.maven.model.Plugin;
-import org.codehaus.mojo.versions.PluginUpdatesDetails;
+import org.codehaus.mojo.versions.api.PluginUpdatesDetails;
 import org.codehaus.mojo.versions.utils.DependencyBuilder;
 
 /**
diff --git a/src/main/java/org/codehaus/mojo/versions/reporting/model/PropertyUpdatesModel.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/model/PropertyUpdatesModel.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/reporting/model/PropertyUpdatesModel.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/model/PropertyUpdatesModel.java
index 9a5d36cfc..c2a6aa460 100644
--- a/src/main/java/org/codehaus/mojo/versions/reporting/model/PropertyUpdatesModel.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/model/PropertyUpdatesModel.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.codehaus.mojo.versions.Property;
+import org.codehaus.mojo.versions.api.Property;
 import org.codehaus.mojo.versions.api.PropertyVersions;
 import org.codehaus.mojo.versions.utils.PropertyComparator;
 
diff --git a/src/main/java/org/codehaus/mojo/versions/api/ArtifactVersionsCache.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/util/ArtifactVersionsCache.java
similarity index 92%
rename from src/main/java/org/codehaus/mojo/versions/api/ArtifactVersionsCache.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/util/ArtifactVersionsCache.java
index e5aa2e384..6ea8864a2 100644
--- a/src/main/java/org/codehaus/mojo/versions/api/ArtifactVersionsCache.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/util/ArtifactVersionsCache.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.versions.api;
+package org.codehaus.mojo.versions.reporting.util;
 
 
 /*
@@ -26,6 +26,9 @@
 import java.util.function.BiFunction;
 
 import org.apache.commons.lang3.tuple.Pair;
+import org.codehaus.mojo.versions.api.AbstractVersionDetails;
+import org.codehaus.mojo.versions.api.ArtifactVersions;
+import org.codehaus.mojo.versions.api.Segment;
 
 /**
  * Utility providing a cached {@link ArtifactVersions#getNewestUpdate(Optional)} API
diff --git a/src/main/java/org/codehaus/mojo/versions/api/PropertyVersionsBuilder.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/util/PropertyVersionsBuilder.java
similarity index 93%
rename from src/main/java/org/codehaus/mojo/versions/api/PropertyVersionsBuilder.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/util/PropertyVersionsBuilder.java
index 2e3c7a731..ca7c6eef4 100644
--- a/src/main/java/org/codehaus/mojo/versions/api/PropertyVersionsBuilder.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/reporting/util/PropertyVersionsBuilder.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.versions.api;
+package org.codehaus.mojo.versions.reporting.util;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,6 +28,11 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.codehaus.mojo.versions.api.ArtifactAssociation;
+import org.codehaus.mojo.versions.api.PropertyVersions;
+import org.codehaus.mojo.versions.api.VersionsHelper;
+import org.codehaus.mojo.versions.impl.DefaultArtifactAssociation;
+import org.codehaus.mojo.versions.impl.DefaultVersionsHelper;
 import org.codehaus.mojo.versions.ordering.VersionComparator;
 
 /**
@@ -36,7 +41,7 @@
  * @author Stephen Connolly
  * @since 1.0-beta-1
  */
-class PropertyVersionsBuilder
+public class PropertyVersionsBuilder
 {
     private final String name;
 
@@ -55,9 +60,9 @@ class PropertyVersionsBuilder
      *
      * @param profileId The profileId.
      * @param name The property name.
-     * @param helper The {@link org.codehaus.mojo.versions.api.DefaultVersionsHelper}.
+     * @param helper The {@link DefaultVersionsHelper}.
      */
-    PropertyVersionsBuilder( String profileId, String name, VersionsHelper helper )
+    public PropertyVersionsBuilder( String profileId, String name, VersionsHelper helper )
     {
         this.profileId = profileId;
         this.name = name;
diff --git a/src/main/java/org/codehaus/mojo/versions/rewriting/ModifiedPomXMLEventReader.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/rewriting/ModifiedPomXMLEventReader.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/rewriting/ModifiedPomXMLEventReader.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/rewriting/ModifiedPomXMLEventReader.java
diff --git a/src/main/java/org/codehaus/mojo/versions/utils/ContextualLog.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/ContextualLog.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/utils/ContextualLog.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/ContextualLog.java
diff --git a/src/main/java/org/codehaus/mojo/versions/utils/DelegatingContextualLog.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/DelegatingContextualLog.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/utils/DelegatingContextualLog.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/DelegatingContextualLog.java
diff --git a/src/main/java/org/codehaus/mojo/versions/utils/DependencyBuilder.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/DependencyBuilder.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/utils/DependencyBuilder.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/DependencyBuilder.java
diff --git a/src/main/java/org/codehaus/mojo/versions/utils/DependencyComparator.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/DependencyComparator.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/utils/DependencyComparator.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/DependencyComparator.java
diff --git a/src/main/java/org/codehaus/mojo/versions/utils/MiscUtils.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/MiscUtils.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/utils/MiscUtils.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/MiscUtils.java
diff --git a/src/main/java/org/codehaus/mojo/versions/utils/PluginComparator.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/PluginComparator.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/utils/PluginComparator.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/PluginComparator.java
diff --git a/src/main/java/org/codehaus/mojo/versions/api/PomHelper.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/PomHelper.java
similarity index 99%
rename from src/main/java/org/codehaus/mojo/versions/api/PomHelper.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/PomHelper.java
index 40bb3cac0..dbc801e6e 100644
--- a/src/main/java/org/codehaus/mojo/versions/api/PomHelper.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/PomHelper.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.versions.api;
+package org.codehaus.mojo.versions.utils;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -62,9 +62,9 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
+import org.codehaus.mojo.versions.api.VersionsHelper;
+import org.codehaus.mojo.versions.reporting.util.PropertyVersionsBuilder;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
-import org.codehaus.mojo.versions.utils.DependencyBuilder;
-import org.codehaus.mojo.versions.utils.RegexUtils;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
 import org.codehaus.plexus.util.IOUtil;
@@ -1150,7 +1150,7 @@ public static PropertyVersionsBuilder[] getPropertyVersionsBuilders( VersionsHel
      *
      * @param helper              Our helper.
      * @param expressionEvaluator Our expression evaluator.
-     * @param result              The map of {@link org.codehaus.mojo.versions.api.PropertyVersionsBuilder} keyed by
+     * @param result              The map of {@link PropertyVersionsBuilder} keyed by
      *                            property name.
      * @param plugins             The list of {@link org.apache.maven.model.Plugin}.
      * @throws ExpressionEvaluationException if an expression cannot be evaluated.
diff --git a/src/main/java/org/codehaus/mojo/versions/utils/PropertiesVersionsFileReader.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/PropertiesVersionsFileReader.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/utils/PropertiesVersionsFileReader.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/PropertiesVersionsFileReader.java
index 98fcaa40a..bfce47ab9 100644
--- a/src/main/java/org/codehaus/mojo/versions/utils/PropertiesVersionsFileReader.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/PropertiesVersionsFileReader.java
@@ -9,7 +9,7 @@
 import java.util.Properties;
 import java.util.stream.Collectors;
 
-import org.codehaus.mojo.versions.Property;
+import org.codehaus.mojo.versions.api.Property;
 
 public class PropertiesVersionsFileReader
 {
diff --git a/src/main/java/org/codehaus/mojo/versions/utils/PropertyComparator.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/PropertyComparator.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/utils/PropertyComparator.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/PropertyComparator.java
index 676df8249..845995015 100644
--- a/src/main/java/org/codehaus/mojo/versions/utils/PropertyComparator.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/PropertyComparator.java
@@ -22,7 +22,7 @@
 import java.util.Comparator;
 
 import org.apache.commons.lang3.StringUtils;
-import org.codehaus.mojo.versions.Property;
+import org.codehaus.mojo.versions.api.Property;
 
 /**
  * A comparator used to sort {@link Property} instances.
diff --git a/src/main/java/org/codehaus/mojo/versions/utils/RegexUtils.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/RegexUtils.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/utils/RegexUtils.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/RegexUtils.java
diff --git a/src/main/java/org/codehaus/mojo/versions/utils/SegmentUtils.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/SegmentUtils.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/utils/SegmentUtils.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/SegmentUtils.java
diff --git a/src/main/java/org/codehaus/mojo/versions/utils/VersionsExpressionEvaluator.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/VersionsExpressionEvaluator.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/utils/VersionsExpressionEvaluator.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/VersionsExpressionEvaluator.java
diff --git a/src/main/java/org/codehaus/mojo/versions/utils/WagonUtils.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/WagonUtils.java
similarity index 100%
rename from src/main/java/org/codehaus/mojo/versions/utils/WagonUtils.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/utils/WagonUtils.java
diff --git a/src/main/java/org/codehaus/mojo/versions/xml/DependencyUpdatesXmlReportRenderer.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/xml/DependencyUpdatesXmlReportRenderer.java
similarity index 98%
rename from src/main/java/org/codehaus/mojo/versions/xml/DependencyUpdatesXmlReportRenderer.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/xml/DependencyUpdatesXmlReportRenderer.java
index dee099f59..bd1224b50 100644
--- a/src/main/java/org/codehaus/mojo/versions/xml/DependencyUpdatesXmlReportRenderer.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/xml/DependencyUpdatesXmlReportRenderer.java
@@ -34,7 +34,6 @@
 import org.apache.maven.model.Dependency;
 import org.codehaus.mojo.versions.api.AbstractVersionDetails;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.ArtifactVersionsCache;
 import org.codehaus.mojo.versions.api.ReportRenderer;
 import org.codehaus.mojo.versions.api.Segment;
 import org.codehaus.mojo.versions.reporting.OverviewStats;
@@ -43,6 +42,7 @@
 import org.codehaus.mojo.versions.reporting.model.DependencyUpdatesModel;
 import org.codehaus.mojo.versions.reporting.model.DependencyUpdatesReport;
 import org.codehaus.mojo.versions.reporting.model.io.xpp3.DependencyUpdatesReportXpp3Writer;
+import org.codehaus.mojo.versions.reporting.util.ArtifactVersionsCache;
 
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
diff --git a/src/main/java/org/codehaus/mojo/versions/xml/PluginUpdatesXmlReportRenderer.java b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/xml/PluginUpdatesXmlReportRenderer.java
similarity index 97%
rename from src/main/java/org/codehaus/mojo/versions/xml/PluginUpdatesXmlReportRenderer.java
rename to versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/xml/PluginUpdatesXmlReportRenderer.java
index e26618e36..7143ca0ab 100644
--- a/src/main/java/org/codehaus/mojo/versions/xml/PluginUpdatesXmlReportRenderer.java
+++ b/versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/xml/PluginUpdatesXmlReportRenderer.java
@@ -32,10 +32,9 @@
 
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.model.Dependency;
-import org.codehaus.mojo.versions.PluginUpdatesDetails;
 import org.codehaus.mojo.versions.api.AbstractVersionDetails;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
-import org.codehaus.mojo.versions.api.ArtifactVersionsCache;
+import org.codehaus.mojo.versions.api.PluginUpdatesDetails;
 import org.codehaus.mojo.versions.api.ReportRenderer;
 import org.codehaus.mojo.versions.api.Segment;
 import org.codehaus.mojo.versions.reporting.PluginOverviewStats;
@@ -44,6 +43,7 @@
 import org.codehaus.mojo.versions.reporting.model.PluginUpdatesModel;
 import org.codehaus.mojo.versions.reporting.model.PluginUpdatesReport;
 import org.codehaus.mojo.versions.reporting.model.io.xpp3.PluginUpdatesReportXpp3Writer;
+import org.codehaus.mojo.versions.reporting.util.ArtifactVersionsCache;
 
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
diff --git a/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/versions-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
similarity index 100%
rename from src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
rename to versions-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
diff --git a/src/main/resources/dependency-updates-report.properties b/versions-maven-plugin/src/main/resources/dependency-updates-report.properties
similarity index 100%
rename from src/main/resources/dependency-updates-report.properties
rename to versions-maven-plugin/src/main/resources/dependency-updates-report.properties
diff --git a/src/main/resources/org/codehaus/mojo/versions/recording/schema-1.0.xsd b/versions-maven-plugin/src/main/resources/org/codehaus/mojo/versions/recording/schema-1.0.xsd
similarity index 100%
rename from src/main/resources/org/codehaus/mojo/versions/recording/schema-1.0.xsd
rename to versions-maven-plugin/src/main/resources/org/codehaus/mojo/versions/recording/schema-1.0.xsd
diff --git a/src/main/resources/parent-updates-report.properties b/versions-maven-plugin/src/main/resources/parent-updates-report.properties
similarity index 100%
rename from src/main/resources/parent-updates-report.properties
rename to versions-maven-plugin/src/main/resources/parent-updates-report.properties
diff --git a/src/main/resources/plugin-updates-report.properties b/versions-maven-plugin/src/main/resources/plugin-updates-report.properties
similarity index 100%
rename from src/main/resources/plugin-updates-report.properties
rename to versions-maven-plugin/src/main/resources/plugin-updates-report.properties
diff --git a/src/main/resources/property-updates-report.properties b/versions-maven-plugin/src/main/resources/property-updates-report.properties
similarity index 100%
rename from src/main/resources/property-updates-report.properties
rename to versions-maven-plugin/src/main/resources/property-updates-report.properties
diff --git a/src/site/apt/examples/display-property-updates.apt b/versions-maven-plugin/src/site/apt/examples/display-property-updates.apt
similarity index 100%
rename from src/site/apt/examples/display-property-updates.apt
rename to versions-maven-plugin/src/site/apt/examples/display-property-updates.apt
diff --git a/src/site/apt/examples/lock-snapshots.apt b/versions-maven-plugin/src/site/apt/examples/lock-snapshots.apt
similarity index 100%
rename from src/site/apt/examples/lock-snapshots.apt
rename to versions-maven-plugin/src/site/apt/examples/lock-snapshots.apt
diff --git a/src/site/apt/examples/recording-changes.apt b/versions-maven-plugin/src/site/apt/examples/recording-changes.apt
similarity index 100%
rename from src/site/apt/examples/recording-changes.apt
rename to versions-maven-plugin/src/site/apt/examples/recording-changes.apt
diff --git a/src/site/apt/examples/resolve-ranges.apt b/versions-maven-plugin/src/site/apt/examples/resolve-ranges.apt
similarity index 100%
rename from src/site/apt/examples/resolve-ranges.apt
rename to versions-maven-plugin/src/site/apt/examples/resolve-ranges.apt
diff --git a/src/site/apt/examples/set.apt b/versions-maven-plugin/src/site/apt/examples/set.apt
similarity index 100%
rename from src/site/apt/examples/set.apt
rename to versions-maven-plugin/src/site/apt/examples/set.apt
diff --git a/src/site/apt/examples/setaggregator.apt b/versions-maven-plugin/src/site/apt/examples/setaggregator.apt
similarity index 100%
rename from src/site/apt/examples/setaggregator.apt
rename to versions-maven-plugin/src/site/apt/examples/setaggregator.apt
diff --git a/src/site/apt/examples/unlock-snapshots.apt b/versions-maven-plugin/src/site/apt/examples/unlock-snapshots.apt
similarity index 100%
rename from src/site/apt/examples/unlock-snapshots.apt
rename to versions-maven-plugin/src/site/apt/examples/unlock-snapshots.apt
diff --git a/src/site/apt/examples/update-child-modules.apt b/versions-maven-plugin/src/site/apt/examples/update-child-modules.apt
similarity index 100%
rename from src/site/apt/examples/update-child-modules.apt
rename to versions-maven-plugin/src/site/apt/examples/update-child-modules.apt
diff --git a/src/site/apt/examples/update-parent.apt b/versions-maven-plugin/src/site/apt/examples/update-parent.apt
similarity index 100%
rename from src/site/apt/examples/update-parent.apt
rename to versions-maven-plugin/src/site/apt/examples/update-parent.apt
diff --git a/src/site/apt/examples/update-properties.apt.vm b/versions-maven-plugin/src/site/apt/examples/update-properties.apt.vm
similarity index 100%
rename from src/site/apt/examples/update-properties.apt.vm
rename to versions-maven-plugin/src/site/apt/examples/update-properties.apt.vm
diff --git a/src/site/apt/examples/use-releases.apt b/versions-maven-plugin/src/site/apt/examples/use-releases.apt
similarity index 100%
rename from src/site/apt/examples/use-releases.apt
rename to versions-maven-plugin/src/site/apt/examples/use-releases.apt
diff --git a/src/site/markdown/examples/advancing-dependency-versions.md.vm b/versions-maven-plugin/src/site/markdown/examples/advancing-dependency-versions.md.vm
similarity index 100%
rename from src/site/markdown/examples/advancing-dependency-versions.md.vm
rename to versions-maven-plugin/src/site/markdown/examples/advancing-dependency-versions.md.vm
diff --git a/src/site/markdown/examples/compare-dependencies.md b/versions-maven-plugin/src/site/markdown/examples/compare-dependencies.md
similarity index 100%
rename from src/site/markdown/examples/compare-dependencies.md
rename to versions-maven-plugin/src/site/markdown/examples/compare-dependencies.md
diff --git a/src/site/markdown/examples/display-dependency-updates.md b/versions-maven-plugin/src/site/markdown/examples/display-dependency-updates.md
similarity index 100%
rename from src/site/markdown/examples/display-dependency-updates.md
rename to versions-maven-plugin/src/site/markdown/examples/display-dependency-updates.md
diff --git a/src/site/markdown/examples/display-plugin-updates.md b/versions-maven-plugin/src/site/markdown/examples/display-plugin-updates.md
similarity index 100%
rename from src/site/markdown/examples/display-plugin-updates.md
rename to versions-maven-plugin/src/site/markdown/examples/display-plugin-updates.md
diff --git a/src/site/markdown/faq.md b/versions-maven-plugin/src/site/markdown/faq.md
similarity index 100%
rename from src/site/markdown/faq.md
rename to versions-maven-plugin/src/site/markdown/faq.md
diff --git a/src/site/markdown/index.md b/versions-maven-plugin/src/site/markdown/index.md
similarity index 100%
rename from src/site/markdown/index.md
rename to versions-maven-plugin/src/site/markdown/index.md
diff --git a/src/site/markdown/usage.md.vm b/versions-maven-plugin/src/site/markdown/usage.md.vm
similarity index 100%
rename from src/site/markdown/usage.md.vm
rename to versions-maven-plugin/src/site/markdown/usage.md.vm
diff --git a/src/site/markdown/version-rules.md.vm b/versions-maven-plugin/src/site/markdown/version-rules.md.vm
similarity index 100%
rename from src/site/markdown/version-rules.md.vm
rename to versions-maven-plugin/src/site/markdown/version-rules.md.vm
diff --git a/src/site/site.xml b/versions-maven-plugin/src/site/site.xml
similarity index 100%
rename from src/site/site.xml
rename to versions-maven-plugin/src/site/site.xml
diff --git a/src/test/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/AbstractVersionsUpdaterMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesReportMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesXmlRendererTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesXmlRendererTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/DependencyUpdatesXmlRendererTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DependencyUpdatesXmlRendererTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DisplayDependencyUpdatesMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/DisplayPropertyUpdatesMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/HasGAVMatcher.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/HasGAVMatcher.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/HasGAVMatcher.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/HasGAVMatcher.java
diff --git a/src/test/java/org/codehaus/mojo/versions/MinimalMavenBuildVersionFinderTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/MinimalMavenBuildVersionFinderTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/MinimalMavenBuildVersionFinderTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/MinimalMavenBuildVersionFinderTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/ParentUpdatesReportMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ParentUpdatesReportMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/ParentUpdatesReportMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/ParentUpdatesReportMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/PluginUpdatesReportMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/PluginUpdatesReportMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/PluginUpdatesReportMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/PluginUpdatesReportMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/PluginUpdatesXmlRendererTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/PluginUpdatesXmlRendererTest.java
similarity index 98%
rename from src/test/java/org/codehaus/mojo/versions/PluginUpdatesXmlRendererTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/PluginUpdatesXmlRendererTest.java
index f39a880cc..a0b9cb2e1 100644
--- a/src/test/java/org/codehaus/mojo/versions/PluginUpdatesXmlRendererTest.java
+++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/PluginUpdatesXmlRendererTest.java
@@ -29,6 +29,7 @@
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.model.Plugin;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
+import org.codehaus.mojo.versions.api.PluginUpdatesDetails;
 import org.codehaus.mojo.versions.ordering.MavenVersionComparator;
 import org.codehaus.mojo.versions.reporting.model.PluginUpdatesModel;
 import org.codehaus.mojo.versions.utils.DependencyBuilder;
diff --git a/src/test/java/org/codehaus/mojo/versions/RevertMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/RevertMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/RevertMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/RevertMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/RewriteWithStAXTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/RewriteWithStAXTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/RewriteWithStAXTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/RewriteWithStAXTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/SeparatePatternsForIncludesAnExcludesTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SeparatePatternsForIncludesAnExcludesTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/SeparatePatternsForIncludesAnExcludesTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SeparatePatternsForIncludesAnExcludesTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/SetMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SetMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/SetMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SetMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/SetPropertyMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SetPropertyMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/SetPropertyMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SetPropertyMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/SetScmTagMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SetScmTagMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/SetScmTagMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/SetScmTagMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/UpdateParentMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdateParentMojoTest.java
similarity index 99%
rename from src/test/java/org/codehaus/mojo/versions/UpdateParentMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdateParentMojoTest.java
index 0350f8c68..fe66f67d6 100644
--- a/src/test/java/org/codehaus/mojo/versions/UpdateParentMojoTest.java
+++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdateParentMojoTest.java
@@ -19,7 +19,7 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.change.VersionChange;
 import org.codehaus.mojo.versions.ordering.InvalidSegmentException;
 import org.codehaus.mojo.versions.utils.TestChangeRecorder;
diff --git a/src/test/java/org/codehaus/mojo/versions/UpdatePropertiesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdatePropertiesMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/UpdatePropertiesMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdatePropertiesMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/UpdatePropertiesMojoTestBase.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdatePropertiesMojoTestBase.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/UpdatePropertiesMojoTestBase.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdatePropertiesMojoTestBase.java
diff --git a/src/test/java/org/codehaus/mojo/versions/UpdatePropertyMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdatePropertyMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/UpdatePropertyMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UpdatePropertyMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/UseDepVersionMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseDepVersionMojoTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/UseDepVersionMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseDepVersionMojoTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java
similarity index 98%
rename from src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java
index beb93a2b8..5b21ed1b7 100644
--- a/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java
+++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestReleasesMojoTest.java
@@ -12,7 +12,7 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.utils.DependencyBuilder;
 import org.codehaus.mojo.versions.utils.TestChangeRecorder;
 import org.hamcrest.Matchers;
diff --git a/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java
similarity index 99%
rename from src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java
index e5b0ac4e1..f986c0c44 100644
--- a/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java
+++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/UseLatestVersionsMojoTest.java
@@ -15,7 +15,7 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.mojo.versions.api.PomHelper;
+import org.codehaus.mojo.versions.utils.PomHelper;
 import org.codehaus.mojo.versions.change.VersionChange;
 import org.codehaus.mojo.versions.utils.DependencyBuilder;
 import org.codehaus.mojo.versions.utils.TestChangeRecorder;
diff --git a/src/test/java/org/codehaus/mojo/versions/filtering/DependencyFilterTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/filtering/DependencyFilterTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/filtering/DependencyFilterTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/filtering/DependencyFilterTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/filtering/TokenizedMatcherTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/filtering/TokenizedMatcherTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/filtering/TokenizedMatcherTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/filtering/TokenizedMatcherTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/filtering/WildcardMatcherTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/filtering/WildcardMatcherTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/filtering/WildcardMatcherTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/filtering/WildcardMatcherTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/impl/DefaultVersionsHelperTest.java
similarity index 98%
rename from src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/impl/DefaultVersionsHelperTest.java
index 89fcc92b4..40479bf30 100644
--- a/src/test/java/org/codehaus/mojo/versions/api/DefaultVersionsHelperTest.java
+++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/impl/DefaultVersionsHelperTest.java
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.versions.api;
+package org.codehaus.mojo.versions.impl;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -44,7 +44,10 @@
 import org.apache.maven.project.artifact.MavenMetadataSource;
 import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.settings.Settings;
-import org.codehaus.mojo.versions.Property;
+import org.codehaus.mojo.versions.api.ArtifactVersions;
+import org.codehaus.mojo.versions.api.Property;
+import org.codehaus.mojo.versions.api.PropertyVersions;
+import org.codehaus.mojo.versions.api.VersionsHelper;
 import org.codehaus.mojo.versions.model.IgnoreVersion;
 import org.codehaus.mojo.versions.model.Rule;
 import org.codehaus.mojo.versions.model.RuleSet;
diff --git a/src/test/java/org/codehaus/mojo/versions/model/TestIgnoreVersions.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/model/TestIgnoreVersions.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/model/TestIgnoreVersions.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/model/TestIgnoreVersions.java
diff --git a/src/test/java/org/codehaus/mojo/versions/recording/ChangeRecorderXMLTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/recording/ChangeRecorderXMLTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/recording/ChangeRecorderXMLTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/recording/ChangeRecorderXMLTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/rewriting/ModifiedPomXMLEventReaderTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/rewriting/ModifiedPomXMLEventReaderTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/rewriting/ModifiedPomXMLEventReaderTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/rewriting/ModifiedPomXMLEventReaderTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/utils/MockUtils.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/MockUtils.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/utils/MockUtils.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/MockUtils.java
diff --git a/src/test/java/org/codehaus/mojo/versions/utils/ModifiedPomXMLEventReaderUtils.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/ModifiedPomXMLEventReaderUtils.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/utils/ModifiedPomXMLEventReaderUtils.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/ModifiedPomXMLEventReaderUtils.java
diff --git a/src/test/java/org/codehaus/mojo/versions/api/PomHelperTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/PomHelperTest.java
similarity index 91%
rename from src/test/java/org/codehaus/mojo/versions/api/PomHelperTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/PomHelperTest.java
index e447355b3..c38df33ca 100644
--- a/src/test/java/org/codehaus/mojo/versions/api/PomHelperTest.java
+++ b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/PomHelperTest.java
@@ -1,4 +1,24 @@
-package org.codehaus.mojo.versions.api;
+package org.codehaus.mojo.versions.utils;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
diff --git a/src/test/java/org/codehaus/mojo/versions/utils/PropertiesVersionsFileReaderTest.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/PropertiesVersionsFileReaderTest.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/utils/PropertiesVersionsFileReaderTest.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/PropertiesVersionsFileReaderTest.java
diff --git a/src/test/java/org/codehaus/mojo/versions/utils/TestChangeRecorder.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/TestChangeRecorder.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/utils/TestChangeRecorder.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/TestChangeRecorder.java
diff --git a/src/test/java/org/codehaus/mojo/versions/utils/TestUtils.java b/versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/TestUtils.java
similarity index 100%
rename from src/test/java/org/codehaus/mojo/versions/utils/TestUtils.java
rename to versions-maven-plugin/src/test/java/org/codehaus/mojo/versions/utils/TestUtils.java
diff --git a/src/test/resources/org/codehaus/mojo/display-dependency-updates/ruleset/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/display-dependency-updates/ruleset/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/display-dependency-updates/ruleset/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/display-dependency-updates/ruleset/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/display-plugin-updates/ruleset/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/display-plugin-updates/ruleset/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/display-plugin-updates/ruleset/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/display-plugin-updates/ruleset/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/display-property-updates/issue-367/child/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/display-property-updates/issue-367/child/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/display-property-updates/issue-367/child/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/display-property-updates/issue-367/child/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/display-property-updates/issue-367/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/display-property-updates/issue-367/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/display-property-updates/issue-367/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/display-property-updates/issue-367/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/revert/issue-265/aggregate/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/revert/issue-265/aggregate/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/revert/issue-265/aggregate/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/revert/issue-265/aggregate/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/revert/issue-265/aggregate/pom.xml.versionsBackup b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/revert/issue-265/aggregate/pom.xml.versionsBackup
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/revert/issue-265/aggregate/pom.xml.versionsBackup
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/revert/issue-265/aggregate/pom.xml.versionsBackup
diff --git a/src/test/resources/org/codehaus/mojo/revert/issue-265/module-a/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/revert/issue-265/module-a/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/revert/issue-265/module-a/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/revert/issue-265/module-a/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/revert/issue-265/module-a/pom.xml.versionsBackup b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/revert/issue-265/module-a/pom.xml.versionsBackup
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/revert/issue-265/module-a/pom.xml.versionsBackup
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/revert/issue-265/module-a/pom.xml.versionsBackup
diff --git a/src/test/resources/org/codehaus/mojo/revert/issue-265/module-b/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/revert/issue-265/module-b/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/revert/issue-265/module-b/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/revert/issue-265/module-b/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/revert/issue-265/module-b/pom.xml.versionsBackup b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/revert/issue-265/module-b/pom.xml.versionsBackup
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/revert/issue-265/module-b/pom.xml.versionsBackup
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/revert/issue-265/module-b/pom.xml.versionsBackup
diff --git a/src/test/resources/org/codehaus/mojo/set-property/null-new-version/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/set-property/null-new-version/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/set-property/null-new-version/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/set-property/null-new-version/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/set-property/null-property/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/set-property/null-property/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/set-property/null-property/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/set-property/null-property/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/set-scm-tag/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/set-scm-tag/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/set-scm-tag/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/set-scm-tag/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/set/remove-snapshot/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/set/remove-snapshot/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/set/remove-snapshot/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/set/remove-snapshot/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/set/versionless-01/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/set/versionless-01/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/set/versionless-01/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/set/versionless-01/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/update-properties/issue-454-pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/update-properties/issue-454-pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/update-properties/issue-454-pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/update-properties/issue-454-pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/use-dep-version/issue-637/pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/use-dep-version/issue-637/pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/use-dep-version/issue-637/pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/use-dep-version/issue-637/pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/versions/api/rules.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/versions/impl/rules.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/versions/api/rules.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/versions/impl/rules.xml
diff --git a/src/test/resources/org/codehaus/mojo/versions/recording/expectedFile.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/versions/recording/expectedFile.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/versions/recording/expectedFile.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/versions/recording/expectedFile.xml
diff --git a/src/test/resources/org/codehaus/mojo/versions/api/PomHelperTest.dependencyManagementBOMs.pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/versions/utils/PomHelperTest.dependencyManagementBOMs.pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/versions/api/PomHelperTest.dependencyManagementBOMs.pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/versions/utils/PomHelperTest.dependencyManagementBOMs.pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/versions/api/PomHelperTest.noGroupIdOnChild.pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/versions/utils/PomHelperTest.noGroupIdOnChild.pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/versions/api/PomHelperTest.noGroupIdOnChild.pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/versions/utils/PomHelperTest.noGroupIdOnChild.pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/versions/api/PomHelperTest.testLongProperties.pom.xml b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/versions/utils/PomHelperTest.testLongProperties.pom.xml
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/versions/api/PomHelperTest.testLongProperties.pom.xml
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/versions/utils/PomHelperTest.testLongProperties.pom.xml
diff --git a/src/test/resources/org/codehaus/mojo/versions/utils/testPropertiesVersionsFile.properties b/versions-maven-plugin/src/test/resources/org/codehaus/mojo/versions/utils/testPropertiesVersionsFile.properties
similarity index 100%
rename from src/test/resources/org/codehaus/mojo/versions/utils/testPropertiesVersionsFile.properties
rename to versions-maven-plugin/src/test/resources/org/codehaus/mojo/versions/utils/testPropertiesVersionsFile.properties
diff --git a/versions-model/pom.xml b/versions-model/pom.xml
new file mode 100644
index 000000000..4ffa9873a
--- /dev/null
+++ b/versions-model/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>versions-parent</artifactId>
+        <version>2.13.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>versions-model</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.modello</groupId>
+                <artifactId>modello-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-rule</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <!-- Generate the xpp3 reader code -->
+                            <goal>xpp3-reader</goal>
+                            <!-- Generate the xpp3 writer code -->
+                            <goal>xpp3-writer</goal>
+                            <!-- Generate the Java sources for the model itself -->
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <models>
+                                <model>src/main/mdo/rule.mdo</model>
+                            </models>
+                            <version>2.0.0</version>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>generate-reporting</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <!-- Generate the writer code -->
+                            <goal>xpp3-writer</goal>
+                            <!-- Generate the Java sources for the model itself -->
+                            <goal>java</goal>
+                        </goals>
+                        <configuration>
+                            <models>
+                                <model>src/main/mdo/dependency-updates-report.mdo</model>
+                                <model>src/main/mdo/plugin-updates-report.mdo</model>
+                            </models>
+                            <version>2.0.0</version>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>site-doc</id>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>xdoc</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>site-xsd</id>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>xsd</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/generated-site/resources/xsd</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <models>
+                        <model>src/main/mdo/rule.mdo</model>
+                        <model>src/main/mdo/dependency-updates-report.mdo</model>
+                        <model>src/main/mdo/plugin-updates-report.mdo</model>
+                    </models>
+                    <version>2.0.0</version>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <!-- Exclude packages generated by Modello in JavaDocs -->
+                    <excludePackageNames>
+                        org.codehaus.mojo.versions.model,
+                        org.codehaus.mojo.versions.model.io.xpp3
+                        org.codehaus.mojo.versions.reporting.model,
+                        org.codehaus.mojo.versions.reporting.model.io.xpp3,
+                    </excludePackageNames>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/src/main/mdo/dependency-updates-report.mdo b/versions-model/src/main/mdo/dependency-updates-report.mdo
similarity index 100%
rename from src/main/mdo/dependency-updates-report.mdo
rename to versions-model/src/main/mdo/dependency-updates-report.mdo
diff --git a/src/main/mdo/plugin-updates-report.mdo b/versions-model/src/main/mdo/plugin-updates-report.mdo
similarity index 100%
rename from src/main/mdo/plugin-updates-report.mdo
rename to versions-model/src/main/mdo/plugin-updates-report.mdo
diff --git a/src/main/mdo/rule.mdo b/versions-model/src/main/mdo/rule.mdo
similarity index 100%
rename from src/main/mdo/rule.mdo
rename to versions-model/src/main/mdo/rule.mdo