diff --git a/engine/config/pom.xml b/engine/config/pom.xml
index f75a57a25c..66a5cc48ec 100644
--- a/engine/config/pom.xml
+++ b/engine/config/pom.xml
@@ -60,12 +60,6 @@
                 <artifactId>config-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.jboss.windup.addon</groupId>
-                <artifactId>config-spi</artifactId>
-                <version>${project.version}</version>
-                <classifier>forge-addon</classifier>
-            </dependency>
             
             <!-- Furnace CDI redefined? -->
             <dependency>
diff --git a/engine/graph/addon/pom.xml b/engine/graph/addon/pom.xml
index 447398402a..bfdc9654b0 100644
--- a/engine/graph/addon/pom.xml
+++ b/engine/graph/addon/pom.xml
@@ -6,6 +6,7 @@
         <artifactId>graph-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
+    
     <artifactId>graph</artifactId>
     
     <name>Windup Engine - Graph addon</name>
@@ -15,32 +16,6 @@
         Most of the time in forge this module just remains empty.
     </description>
     
-    <dependencies>
-        <dependency>
-            <groupId>org.jboss.windup.addon</groupId>
-            <artifactId>utils</artifactId>
-            <classifier>forge-addon</classifier>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- Furnace -->
-        <dependency>
-            <groupId>org.jboss.forge.furnace.container</groupId>
-            <artifactId>cdi</artifactId>
-            <classifier>forge-addon</classifier>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jboss.windup.addon</groupId>
-            <artifactId>graph-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.windup.addon</groupId>
-            <artifactId>graph-impl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
     <build>
         <plugins>
             <plugin>
@@ -66,15 +41,39 @@
                     <execution>
                         <id>create-forge-addon</id>
                         <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>forge-addon</classifier>
-                        </configuration>
+                        <goals> <goal>jar</goal> </goals>
+                        <configuration> <classifier>forge-addon</classifier> </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.windup.addon</groupId>
+            <artifactId>utils</artifactId>
+            <classifier>forge-addon</classifier>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- Furnace -->
+        <dependency>
+            <groupId>org.jboss.forge.furnace.container</groupId>
+            <artifactId>cdi</artifactId>
+            <classifier>forge-addon</classifier>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.windup.addon</groupId>
+            <artifactId>graph-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.windup.addon</groupId>
+            <artifactId>graph-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+    
 </project>
diff --git a/engine/graph/pom.xml b/engine/graph/pom.xml
index 7a7f01ca6f..77455a4ac0 100644
--- a/engine/graph/pom.xml
+++ b/engine/graph/pom.xml
@@ -40,12 +40,6 @@
                 <artifactId>graph-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.jboss.windup.addon</groupId>
-                <artifactId>graph-spi</artifactId>
-                <version>${project.version}</version>
-                <classifier>forge-addon</classifier>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     
diff --git a/engine/graph/tests/pom.xml b/engine/graph/tests/pom.xml
index e43d7c8017..68f5524fb6 100644
--- a/engine/graph/tests/pom.xml
+++ b/engine/graph/tests/pom.xml
@@ -20,6 +20,12 @@
     </build>
     
     <dependencies>
+        <dependency>
+            <groupId>org.jboss.windup.addon</groupId>
+            <artifactId>graph</artifactId>
+            <classifier>forge-addon</classifier>
+        </dependency>
+
         <dependency>
             <groupId>org.jboss.forge.furnace.container</groupId>
             <artifactId>cdi</artifactId>
@@ -36,10 +42,6 @@
             <artifactId>arquillian-furnace-classpath</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.windup.addon</groupId>
-            <artifactId>graph</artifactId>
-            <classifier>forge-addon</classifier>
-        </dependency>
+        
     </dependencies>
 </project>
diff --git a/engine/reporting/addon/pom.xml b/engine/reporting/addon/pom.xml
index b8c80ef1b5..a7da7c6500 100644
--- a/engine/reporting/addon/pom.xml
+++ b/engine/reporting/addon/pom.xml
@@ -1,80 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.jboss.windup.addon.reporting</groupId>
-    <artifactId>reporting-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>reporting</artifactId>
-  <name>Windup Engine - Reporting Addon</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.jboss.windup.addon</groupId>
-      <artifactId>config</artifactId>
-      <version>${project.version}</version>
-      <classifier>forge-addon</classifier>
-    </dependency>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.jboss.windup.addon.reporting</groupId>
+        <artifactId>reporting-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>reporting</artifactId>
+    <name>Windup Engine - Reporting Addon</name>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jboss.forge.furnace</groupId>
+                <artifactId>furnace-maven-plugin</artifactId>
+                <version>${version.furnace}</version>
+                <executions>
+                    <execution>
+                        <id>generate-dot</id>
+                        <phase>prepare-package</phase>
+                        <goals> <goal>generate-dot</goal> </goals>
+                        <configuration> <attach>true</attach> </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>create-forge-addon</id>
+                        <phase>package</phase>
+                        <goals> <goal>jar</goal> </goals>
+                        <configuration> <classifier>forge-addon</classifier> </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.windup.addon</groupId>
+            <artifactId>config</artifactId>
+            <version>${project.version}</version>
+            <classifier>forge-addon</classifier>
+        </dependency>
   
-    <dependency>
-      <groupId>org.jboss.forge.furnace.container</groupId>
-      <artifactId>cdi</artifactId>
-      <classifier>forge-addon</classifier>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.windup.addon.reporting</groupId>
-      <artifactId>reporting-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.windup.addon.reporting</groupId>
-      <artifactId>reporting-impl</artifactId>
-     <version>${project.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.windup.addon.reporting</groupId>
-      <artifactId>reporting-spi</artifactId>
-      <version>${project.version}</version>
-      <classifier>forge-addon</classifier>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.jboss.forge.furnace</groupId>
-        <artifactId>furnace-maven-plugin</artifactId>
-        <version>${version.furnace}</version>
-        <executions>
-          <execution>
-            <id>generate-dot</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>generate-dot</goal>
-            </goals>
-            <configuration>
-              <attach>true</attach>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>create-forge-addon</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <configuration>
-              <classifier>forge-addon</classifier>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+        <dependency>
+            <groupId>org.jboss.forge.furnace.container</groupId>
+            <artifactId>cdi</artifactId>
+            <classifier>forge-addon</classifier>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.windup.addon.reporting</groupId>
+            <artifactId>reporting-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.windup.addon.reporting</groupId>
+            <artifactId>reporting-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+    
 </project>
diff --git a/engine/reporting/impl/pom.xml b/engine/reporting/impl/pom.xml
index 172be8816c..38d88568ba 100644
--- a/engine/reporting/impl/pom.xml
+++ b/engine/reporting/impl/pom.xml
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.jboss.windup.addon.reporting</groupId>
-    <artifactId>reporting-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>reporting-impl</artifactId>
-  <name>Windup Engine - Reporting Impl</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.jboss.forge.furnace.container</groupId>
-      <artifactId>cdi-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.windup.addon.reporting</groupId>
-      <artifactId>reporting-api</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.windup.addon.reporting</groupId>
-      <artifactId>reporting-spi</artifactId>
-      <version>${project.version}</version>
-      <classifier>forge-addon</classifier>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.jboss.windup.addon.reporting</groupId>
+        <artifactId>reporting-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>reporting-impl</artifactId>
+    <name>Windup Engine - Reporting Impl</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.forge.furnace.container</groupId>
+            <artifactId>cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.windup.addon.reporting</groupId>
+            <artifactId>reporting-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
 </project>
diff --git a/engine/reporting/pom.xml b/engine/reporting/pom.xml
index 75ccdc6e13..3ea2fb8eac 100644
--- a/engine/reporting/pom.xml
+++ b/engine/reporting/pom.xml
@@ -1,27 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.jboss.windup.engine</groupId>
-    <artifactId>windup-engine-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.jboss.windup.addon.reporting</groupId>
-  <artifactId>reporting-parent</artifactId>
-  <name>Windup Engine - Reporting</name>
-  <packaging>pom</packaging>
-  <modules>
-    <module>addon</module>
-    <module>api</module>
-    <module>impl</module>
-    <module>spi</module>
-    <module>tests</module>
-  </modules>
-  <properties>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-    </dependencies>
-  </dependencyManagement>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.jboss.windup.engine</groupId>
+        <artifactId>windup-engine-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>org.jboss.windup.addon.reporting</groupId>
+    <artifactId>reporting-parent</artifactId>
+    <packaging>pom</packaging>
+    
+    <name>Windup Engine - Reporting Parent</name>
+    
+    <modules>
+        <module>addon</module>
+        <module>api</module>
+        <module>impl</module>
+        <module>tests</module>
+    </modules>
+    
 </project>
diff --git a/engine/reporting/spi/pom.xml b/engine/reporting/spi/pom.xml
deleted file mode 100644
index 6dfada6c68..0000000000
--- a/engine/reporting/spi/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jboss.windup.addon.reporting</groupId>
-        <artifactId>reporting-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>reporting-spi</artifactId>
-    <name>Windup Engine - Reporting SPI</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.jboss.forge.furnace</groupId>
-            <artifactId>furnace-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jboss.forge.furnace</groupId>
-                <artifactId>furnace-maven-plugin</artifactId>
-                <version>${version.furnace}</version>
-                <executions>
-                    <execution>
-                        <id>generate-dot</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>generate-dot</goal>
-                        </goals>
-                        <configuration>
-                            <attach>true</attach>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>create-forge-addon</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>forge-addon</classifier>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/engine/reporting/spi/src/main/java/org/jboss/windup/addon/reporting/package-info.java b/engine/reporting/spi/src/main/java/org/jboss/windup/addon/reporting/package-info.java
deleted file mode 100644
index 4c8b32ec5c..0000000000
--- a/engine/reporting/spi/src/main/java/org/jboss/windup/addon/reporting/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package org.jboss.windup.addon.reporting;
\ No newline at end of file
diff --git a/engine/rules/addon/pom.xml b/engine/rules/addon/pom.xml
index 0cdd693f6f..0b68debebc 100644
--- a/engine/rules/addon/pom.xml
+++ b/engine/rules/addon/pom.xml
@@ -9,7 +9,36 @@
     <artifactId>rules</artifactId>
     
     <name>Windup Engine - Rules</name>
-    
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jboss.forge.furnace</groupId>
+                <artifactId>furnace-maven-plugin</artifactId>
+                <version>${version.furnace}</version>
+                <executions>
+                    <execution>
+                        <id>generate-dot</id>
+                        <phase>prepare-package</phase>
+                        <goals> <goal>generate-dot</goal> </goals>
+                        <configuration> <attach>true</attach> </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>create-forge-addon</id>
+                        <phase>package</phase>
+                        <goals> <goal>jar</goal> </goals>
+                        <configuration> <classifier>forge-addon</classifier> </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+        
     <dependencies>
         <dependency>
             <groupId>org.jboss.windup.addon</groupId>
@@ -41,46 +70,6 @@
             <artifactId>rules-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.windup.rules</groupId>
-            <artifactId>rules-spi</artifactId>
-            <classifier>forge-addon</classifier>
-        </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jboss.forge.furnace</groupId>
-                <artifactId>furnace-maven-plugin</artifactId>
-                <version>${version.furnace}</version>
-                <executions>
-                    <execution>
-                        <id>generate-dot</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>generate-dot</goal>
-                        </goals>
-                        <configuration>
-                            <attach>true</attach>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>create-forge-addon</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>forge-addon</classifier>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+
 </project>
diff --git a/engine/rules/api/pom.xml b/engine/rules/api/pom.xml
index c45182392f..329952af29 100644
--- a/engine/rules/api/pom.xml
+++ b/engine/rules/api/pom.xml
@@ -1,11 +1,13 @@
 <?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">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.jboss.windup.rules</groupId>
         <artifactId>rules-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
+    
     <artifactId>rules-api</artifactId>
     
     <name>Windup Engine - Rules API</name>
@@ -21,11 +23,6 @@
             <artifactId>cdi</artifactId>
             <classifier>forge-addon</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.windup.rules</groupId>
-            <artifactId>rules-spi</artifactId>
-            <classifier>forge-addon</classifier>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
+
 </project>
diff --git a/engine/rules/impl/pom.xml b/engine/rules/impl/pom.xml
index 15123a976c..958bf7164b 100644
--- a/engine/rules/impl/pom.xml
+++ b/engine/rules/impl/pom.xml
@@ -2,11 +2,13 @@
 <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.jboss.windup.rules</groupId>
         <artifactId>rules-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
+    
     <artifactId>rules-impl</artifactId>
 
     <name>Windup Engine - Rules Impl</name>
@@ -43,12 +45,6 @@
             <artifactId>rules-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.windup.rules</groupId>
-            <artifactId>rules-spi</artifactId>
-            <classifier>forge-addon</classifier>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- EclipseLink persistence -->
         <dependency>
diff --git a/engine/rules/pom.xml b/engine/rules/pom.xml
index 1379915653..69ab65a51d 100644
--- a/engine/rules/pom.xml
+++ b/engine/rules/pom.xml
@@ -18,9 +18,9 @@
         <module>addon</module>
         <module>api</module>
         <module>impl</module>
-        <module>spi</module>
         <module>tests</module>
     </modules>
+    
     <dependencyManagement>
         <dependencies>
             
@@ -66,12 +66,6 @@
                 <artifactId>rules-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.jboss.windup.rules</groupId>
-                <artifactId>rules-spi</artifactId>
-                <version>${project.version}</version>
-                <classifier>forge-addon</classifier>
-            </dependency>
             
             <dependency>
                 <groupId>org.jboss.forge.furnace.container</groupId>
@@ -81,8 +75,5 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <build>
-        <plugins>
-        </plugins>
-    </build>
+
 </project>
diff --git a/engine/rules/spi/pom.xml b/engine/rules/spi/pom.xml
deleted file mode 100644
index 00c29969b7..0000000000
--- a/engine/rules/spi/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jboss.windup.rules</groupId>
-        <artifactId>rules-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>rules-spi</artifactId>
-    
-    <name>Windup Engine - Rules SPI</name>
-    
-    <dependencies>
-    </dependencies>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jboss.forge.furnace</groupId>
-                <artifactId>furnace-maven-plugin</artifactId>
-                <version>${version.furnace}</version>
-                <executions>
-                    <execution>
-                        <id>generate-dot</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>generate-dot</goal>
-                        </goals>
-                        <configuration>
-                            <attach>true</attach>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>create-forge-addon</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>forge-addon</classifier>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/engine/rules/spi/src/main/java/org/jboss/windup/rules/package-info.java b/engine/rules/spi/src/main/java/org/jboss/windup/rules/package-info.java
deleted file mode 100644
index d85218297b..0000000000
--- a/engine/rules/spi/src/main/java/org/jboss/windup/rules/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package org.jboss.windup.rules;
\ No newline at end of file
diff --git a/engine/utils/pom.xml b/engine/utils/pom.xml
index 4e5235262a..cef69312e7 100644
--- a/engine/utils/pom.xml
+++ b/engine/utils/pom.xml
@@ -14,28 +14,6 @@
     
     <name>Windup Engine - Utils</name>
     
-
-    <dependencies>
-        <!-- Moved to root pom. 
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.4</version>
-        </dependency>
-        -->
-
-        <dependency>
-            <groupId>org.jboss.forge.furnace.container</groupId>
-            <artifactId>cdi</artifactId>
-            <classifier>forge-addon</classifier>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
     <build>
         <plugins>
             <plugin>
@@ -46,12 +24,8 @@
                     <execution>
                         <id>generate-dot</id>
                         <phase>prepare-package</phase>
-                        <goals>
-                            <goal>generate-dot</goal>
-                        </goals>
-                        <configuration>
-                            <attach>true</attach>
-                        </configuration>
+                        <goals> <goal>generate-dot</goal> </goals>
+                        <configuration> <attach>true</attach> </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -61,15 +35,34 @@
                     <execution>
                         <id>create-forge-addon</id>
                         <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>forge-addon</classifier>
-                        </configuration>
+                        <goals> <goal>jar</goal> </goals>
+                        <configuration> <classifier>forge-addon</classifier> </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
+
+    <dependencies>
+        <!-- Moved to root pom. 
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        -->
+
+        <dependency>
+            <groupId>org.jboss.forge.furnace.container</groupId>
+            <artifactId>cdi</artifactId>
+            <classifier>forge-addon</classifier>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
 </project>