diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 4d807aac7..ea822bfe2 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Build WFLY
         if: ${{ matrix.profile == '-Pwildfly28'}}
         working-directory: ./wildfly
-        run: mvn -s ../.m2-settings.xml -DskipTests=true '-Denforcer.skip=true' -Prelease clean install
+        run: mvn -DskipTests=true '-Denforcer.skip=true' -Prelease clean install
       - name: Build with Maven Java ${{ matrix.java }} ${{ matrix.profile }}
         run: |
           mvn -s ./.m2-settings.xml -fae ${{ matrix.profile }} clean install
diff --git a/.m2-settings.xml b/.m2-settings.xml
index ded48c0d5..1e02985a6 100644
--- a/.m2-settings.xml
+++ b/.m2-settings.xml
@@ -56,28 +56,6 @@
       </repositories>
 
       <pluginRepositories>
-        <pluginRepository>
-          <id>central</id>
-          <url>http://central</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-          <id>central-maven2</id>
-          <name>Central maven2 repository proxy</name>
-          <url>https://repo1.maven.org/maven2</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </snapshots>
-        </pluginRepository>
         <pluginRepository>
           <id>jboss-public-repository-group</id>
           <name>JBoss Public Maven Repository Group</name>
diff --git a/modules/dist/pom.xml b/modules/dist/pom.xml
index 62dfb8a51..86284c31b 100644
--- a/modules/dist/pom.xml
+++ b/modules/dist/pom.xml
@@ -17,67 +17,20 @@
 
   <dependencies>
       <dependency>
-         <groupId>org.jboss.ws.cxf</groupId>
-         <artifactId>jbossws-cxf-client</artifactId> 
-         <version>${project.version}</version>          
-         <scope>provided</scope>
+          <groupId>org.wildfly</groupId>
+          <artifactId>wildfly-ee-galleon-pack</artifactId>
+          <version>${jboss.version}</version>
+          <type>zip</type>
+          <scope>provided</scope>
       </dependency>
-
-      <dependency>
-         <groupId>org.jboss.ws.cxf</groupId>
-         <artifactId>jbossws-cxf-transports-undertow</artifactId>
-         <version>${project.version}</version>     
-         <scope>provided</scope>
-      </dependency>
-
       <dependency>
-         <groupId>org.jboss.ws.cxf</groupId>
-         <artifactId>jbossws-cxf-transports-udp</artifactId>
-         <version>${project.version}</version>     
-         <scope>provided</scope>
+          <groupId>org.jboss.ws.cxf</groupId>
+          <artifactId>jbossws-cxf-feature-pack</artifactId>
+          <version>${project.version}</version>
+          <type>zip</type>
+          <scope>provided</scope>
       </dependency>
 
-      <dependency>
-         <groupId>org.jboss.ws.cxf</groupId>
-         <artifactId>jbossws-cxf-server</artifactId>
-         <version>${project.version}</version>     
-         <scope>provided</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>org.jboss.ws</groupId>
-         <artifactId>jbossws-common-tools</artifactId>
-         <scope>provided</scope>
-      </dependency>
-
-      <!-- OpenSAML -->
-      <dependency>
-        <groupId>org.opensaml</groupId>
-        <artifactId>opensaml-saml-impl</artifactId>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opensaml</groupId>
-        <artifactId>opensaml-xacml-impl</artifactId>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opensaml</groupId>
-        <artifactId>opensaml-xacml-saml-impl</artifactId>
-        <scope>provided</scope>
-      </dependency>
-      <!--junit-->
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.jboss.shrinkwrap</groupId>
-        <artifactId>shrinkwrap-depchain</artifactId>
-        <type>pom</type>
-         <scope>provided</scope>
-      </dependency>
   </dependencies>
  
     <build>
@@ -124,6 +77,12 @@
                                       <groupId>org.wildfly</groupId>
                                       <artifactId>wildfly-ee-galleon-pack</artifactId>
                                       <version>${jboss.version}</version>
+                                      <inherit-configs>true</inherit-configs>
+                                  </feature-pack>
+                                  <feature-pack>
+                                      <groupId>org.jboss.ws.cxf</groupId>
+                                      <artifactId>jbossws-cxf-feature-pack</artifactId>
+                                      <version>${project.version}</version>
                                       <inherit-configs>false</inherit-configs>
                                   </feature-pack>
                               </feature-packs>
@@ -158,62 +117,6 @@
         <jboss.home>${project.build.directory}/wildfly-${jboss.version}</jboss.home>
       </properties>
     </profile>
-    <!--
-    Name:  deploy
-    Descr: Deploy stack on WildFly instance
-    -->
-    <profile>
-      <id>deploy</id>
-      <activation>
-        <property>
-          <name>!nodeploy</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-assembly-plugin</artifactId>
-              <executions>
-                  <execution>
-                      <id>distribution-package</id>
-                      <phase>prepare-package</phase>
-                      <goals>
-                          <goal>single</goal>
-                      </goals>
-                      <configuration>
-                          <finalName>assembly</finalName>
-                          <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
-                          <appendAssemblyId>false</appendAssemblyId>
-                          <descriptors>
-                              <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
-                          </descriptors>
-                          <tarLongFileMode>gnu</tarLongFileMode>
-                      </configuration>
-                  </execution>
-              </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <target>
-                    <property name="jboss.home" value="${jboss.home}" />
-                    <ant antfile="src/main/scripts/build-deploy.xml" />
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     
     <!-- 
     Name:  echo
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/sts/main/module.xml b/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/sts/main/module.xml
deleted file mode 100644
index cf1a991f3..000000000
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/sts/main/module.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2016, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<module name="org.jboss.ws.cxf.sts" xmlns="urn:jboss:module:1.9">
-    
-    <resources/>
-
-    <dependencies>
-        <module name="org.apache.cxf.ws-security" services="export" export="true">
-          <imports>
-            <include path="META-INF/cxf"/>
-            <include path="META-INF"/>
-          </imports>
-          <exports>
-            <include path="META-INF/cxf"/>
-            <include path="META-INF"/>
-          </exports>
-        </module>
-        <module name="org.apache.cxf.services-sts" services="export" export="true">
-          <imports>
-            <include path="META-INF/cxf"/>
-            <include path="META-INF"/>
-          </imports>
-          <exports>
-            <include path="META-INF/cxf"/>
-            <include path="META-INF"/>
-          </exports>
-        </module>
-    </dependencies>
-</module>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/tools/wsconsume/main/module.xml b/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/tools/wsconsume/main/module.xml
deleted file mode 100644
index 804a3ad48..000000000
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/tools/wsconsume/main/module.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2011, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<module name="org.jboss.ws.tools.wsconsume" xmlns="urn:jboss:module:1.9">
-
-    <properties>
-        <property name="jboss.api" value="private"/>
-        <property name="jboss.require-java-version" value="1.7"/>
-    </properties>
-
-    <main-class name="org.jboss.ws.tools.cmd.WSConsume"/>
-
-    <dependencies>
-        <module name="org.jboss.logmanager" services="import"/>
-        <module name="org.jboss.ws.tools.common"/>
-        <module name="org.wildfly.security.elytron-private" services="import"/>
-    </dependencies>
-</module>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/tools/wsprovide/main/module.xml b/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/tools/wsprovide/main/module.xml
deleted file mode 100644
index 652d1ec71..000000000
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/tools/wsprovide/main/module.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2011, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<module name="org.jboss.ws.tools.wsprovide" xmlns="urn:jboss:module:1.9">
-
-    <properties>
-        <property name="jboss.api" value="private"/>
-        <property name="jboss.require-java-version" value="1.7"/>
-    </properties>
-
-    <main-class name="org.jboss.ws.tools.cmd.WSProvide"/>
-
-    <dependencies>
-        <module name="org.jboss.logmanager" services="import"/>
-        <module name="org.jboss.ws.tools.common"/>
-        <module name="org.wildfly.security.elytron-private" services="import"/>
-    </dependencies>
-</module>
diff --git a/modules/feature-pack/pom.xml b/modules/feature-pack/pom.xml
new file mode 100644
index 000000000..662435772
--- /dev/null
+++ b/modules/feature-pack/pom.xml
@@ -0,0 +1,111 @@
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <name>JBoss Web Services - Stack CXF Feature Pack</name>
+    <artifactId>jbossws-cxf-feature-pack</artifactId>
+
+    <parent>
+        <groupId>org.jboss.ws.cxf</groupId>
+        <artifactId>jbossws-cxf</artifactId>
+        <version>6.2.1-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <properties>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.ws.cxf</groupId>
+            <artifactId>jbossws-cxf-client</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.ws.cxf</groupId>
+            <artifactId>jbossws-cxf-transports-undertow</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.ws.cxf</groupId>
+            <artifactId>jbossws-cxf-transports-udp</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.ws.cxf</groupId>
+            <artifactId>jbossws-cxf-server</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.ws</groupId>
+            <artifactId>jbossws-common-tools</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- OpenSAML -->
+        <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>opensaml-saml-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>opensaml-xacml-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>opensaml-xacml-saml-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!--junit-->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.shrinkwrap</groupId>
+            <artifactId>shrinkwrap-depchain</artifactId>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-ee-galleon-pack</artifactId>
+            <version>${jboss.version}</version>
+            <type>zip</type>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.wildfly.galleon-plugins</groupId>
+                <artifactId>wildfly-galleon-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>jbossws-feature-pack</id>
+                        <goals>
+                            <goal>build-feature-pack</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <fork-embedded>false</fork-embedded>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/jaxbintros/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml
similarity index 96%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/jaxbintros/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml
index 05e51b1e1..3fdff5887 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/jaxbintros/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml
@@ -27,7 +27,7 @@
     </properties>
 
     <resources>
-        <!-- Insert resources here -->
+        <artifact name="${jboss.jaxbintros:jboss-jaxb-intros}"/>
     </resources>
 
     <dependencies>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/api/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml
similarity index 89%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/api/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml
index b2cbef376..5a3bc9ae3 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/api/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2010, Red Hat, Inc., and individual contributors
@@ -20,14 +21,14 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module name="org.jboss.ws.api" xmlns="urn:jboss:module:1.9">
+
+<module xmlns="urn:jboss:module:1.9" name="org.jboss.ws.api">
 
     <resources>
-        <!-- Insert resources here -->
+        <artifact name="${org.jboss.ws:jbossws-api}"/>
     </resources>
 
     <dependencies>
-        <!--WFLY-14219 Remove deprecated <module name="javax.api"/> -->
         <module name="javax.xml.soap.api"/>
         <module name="javax.xml.ws.api"/>
         <module name="org.jboss.logging"/>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/common/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml
similarity index 90%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/common/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml
index 8cad064a1..c248d67fa 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/common/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2010, Red Hat, Inc., and individual contributors
@@ -20,25 +21,25 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module name="org.jboss.ws.common" xmlns="urn:jboss:module:1.9">
+
+<module xmlns="urn:jboss:module:1.9" name="org.jboss.ws.common">
 
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
 
     <resources>
-        <!-- Insert resources here -->
+        <artifact name="${org.jboss.ws:jbossws-common}"/>
     </resources>
 
     <dependencies>
         <module name="java.management"/>
         <module name="java.naming"/>
-        <!--WFLY-14219 Remove deprecated <module name="javax.api"/> -->
         <module name="javax.annotation.api"/>
         <module name="javax.xml.stream.api"/>
         <module name="javax.jws.api"/>
         <module name="javax.servlet.api"/>
-        <module name="javax.wsdl4j.api"/>
+        <module name="javax.wsdl4j.api" />
         <module name="javax.xml.ws.api"/>
         <module name="org.jboss.ws.api"/>
         <module name="org.jboss.ws.spi"/>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
similarity index 81%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
index ea3185b2b..da9f6cf76 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2011, Red Hat, Inc., and individual contributors
@@ -20,31 +21,32 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module name="org.jboss.ws.cxf.jbossws-cxf-client" xmlns="urn:jboss:module:1.9">
+
+<module xmlns="urn:jboss:module:1.9" name="org.jboss.ws.cxf.jbossws-cxf-client">
 
     <dependencies>
         <!-- JAXB API + REF IMPL -->
         <module name="javax.xml.bind.api" export="true"/>
-        <module name="com.sun.xml.bind" export="true" services="export"/>
+        <module name="org.glassfish.jaxb" export="true" services="export"/>
         <module name="javax.xml.ws.api" export="true"/>
         <module name="javax.jws.api" export="true"/>
         <!-- WSDL4J API -->
         <module name="javax.wsdl4j.api" export="true"/>
         <!-- JBossWS API -->
-        <module name="org.jboss.ws.api" export="true"/>
+        <module name="org.jboss.ws.api" export="true" />
         <!--  JBossWS JAXWS client -->
-        <module name="org.jboss.ws.jaxws-client" export="true" services="export"/>
+        <module name="org.jboss.ws.jaxws-client" export="true" services="export" />
         <!--  JBossWS configuration of Apache CXF -->
-        <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export"/>
+        <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" />
         <!-- Apache CXF APIs only -->
-        <module name="org.apache.cxf" export="true"/>
-        <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" export="true" services="export"/>
-        <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true" services="export"/>
+        <module name="org.apache.cxf" export="true" />
+        <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" export="true" services="export" />
+        <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true" services="export" />
         <module name="org.jboss.jaxbintros" export="true"/>
         <module name="javax.security.auth.message.api" export="true"/>
         <module name="org.apache.ws.security" export="true"/>
         <module name="org.eclipse.angus.activation" export="true" services="export"/>
-		<!-- Tools support on JDK 9 and later -->
-		<module name="org.jboss.modules"/>
+        <!-- Tools support on JDK 9 and later -->
+        <module name="org.jboss.modules"/>
     </dependencies>
 </module>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml
similarity index 88%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml
index 9a4f03679..1576e498e 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2011, Red Hat, Inc., and individual contributors
@@ -20,14 +21,15 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module name="org.jboss.ws.cxf.jbossws-cxf-factories" xmlns="urn:jboss:module:1.9">
+
+<module xmlns="urn:jboss:module:1.9" name="org.jboss.ws.cxf.jbossws-cxf-factories">
 
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
 
     <resources>
-        <!-- Insert resources here -->
+        <artifact name="${org.jboss.ws.cxf:jbossws-cxf-factories}"/>
     </resources>
 
     <dependencies/>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
similarity index 74%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
index 188b7e4f4..fc545ab85 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2011, Red Hat, Inc., and individual contributors
@@ -20,31 +21,32 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module name="org.jboss.ws.cxf.jbossws-cxf-server" xmlns="urn:jboss:module:1.9">
+
+<module xmlns="urn:jboss:module:1.9" name="org.jboss.ws.cxf.jbossws-cxf-server">
 
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
 
     <resources>
-       <!-- Insert resources here -->
+        <artifact name="${org.jboss.ws.cxf:jbossws-cxf-server}"/>
     </resources>
 
     <dependencies>
         <module name="java.logging"/>
         <module name="java.management"/>
-        <!--WFLY-14219 Remove deprecated <module name="javax.api"/> -->
         <module name="javax.security.auth.message.api"/>
-        <module name="javax.servlet.api"/>
-        <module name="javax.jws.api"/>
-        <module name="javax.wsdl4j.api"/>
-        <module name="javax.xml.bind.api"/>
-        <module name="javax.xml.stream.api"/>
-        <module name="javax.xml.ws.api"/>
-        <module name="org.jboss.ws.api"/>
-        <module name="org.jboss.ws.spi"/>
-        <module name="org.jboss.ws.common"/>
-        <module name="org.jboss.ws.jaxws-client"/>
+        <module name="javax.servlet.api" />
+        <module name="javax.jws.api" />
+        <module name="javax.wsdl4j.api" />
+        <module name="javax.xml.bind.api" />
+        <module name="javax.xml.stream.api" />
+        <module name="javax.xml.ws.api" />
+        <module name="org.apache.commons.codec" />
+        <module name="org.jboss.ws.api" />
+        <module name="org.jboss.ws.spi" />
+        <module name="org.jboss.ws.common" />
+        <module name="org.jboss.ws.jaxws-client" />
         <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/>
         <!-- do not import services from cxf, those need to come from jbossws -->
         <module name="org.apache.cxf.impl">
@@ -65,10 +67,9 @@
             <include path="META-INF"/>
           </imports>
         </module>
-        <module name="org.jboss.logging"/>
-        <module name="org.apache.ws.security"/>
+        <module name="org.jboss.logging" />
+        <module name="org.apache.ws.security" />
+        <module name="org.wildfly.security.elytron" />
         <module name="java.xml"/>
-        <module name="org.wildfly.security.elytron-base"/>
-        <module name="org.apache.commons.codec"/>
     </dependencies>
 </module>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
similarity index 91%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
index 8becfcc20..f9e8b40e6 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2011, Red Hat, Inc., and individual contributors
@@ -20,14 +21,15 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" xmlns="urn:jboss:module:1.9">
+
+<module xmlns="urn:jboss:module:1.9" name="org.jboss.ws.cxf.jbossws-cxf-transports-udp">
 
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
 
     <resources>
-       <!-- Insert resources here -->
+        <artifact name="${org.jboss.ws.cxf:jbossws-cxf-transports-udp}"/>
     </resources>
 
     <dependencies>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml
similarity index 91%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml
index 2a954d0b8..a10c72272 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2011, Red Hat, Inc., and individual contributors
@@ -20,14 +21,15 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" xmlns="urn:jboss:module:1.9">
+
+<module xmlns="urn:jboss:module:1.9" name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow">
 
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
 
     <resources>
-        <!-- Insert resources here -->
+        <artifact name="${org.jboss.ws.cxf:jbossws-cxf-transports-undertow}"/>
     </resources>
 
     <dependencies>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/jaxws-client/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml
similarity index 80%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/jaxws-client/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml
index 3e190ef53..ddc098a98 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/jaxws-client/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2011, Red Hat, Inc., and individual contributors
@@ -20,29 +21,29 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module name="org.jboss.ws.jaxws-client" xmlns="urn:jboss:module:1.9">
+
+<module xmlns="urn:jboss:module:1.9" name="org.jboss.ws.jaxws-client">
 
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
 
     <resources>
-       <!-- Insert resources here -->
+        <artifact name="${org.jboss.ws.cxf:jbossws-cxf-client}"/>
     </resources>
 
     <dependencies>
         <module name="java.compiler"/>
         <module name="java.management"/>
         <module name="java.naming"/>
-        <!--WFLY-14219 Remove deprecated <module name="javax.api"/> -->
-        <module name="javax.servlet.api"/>
-        <module name="javax.xml.bind.api"/>
+        <module name="javax.servlet.api" />
+        <module name="javax.xml.bind.api" />
         <module name="javax.security.auth.message.api"/>
         <module name="com.sun.xml.bind" services="import"/>
-        <module name="javax.xml.ws.api"/>
-        <module name="org.jboss.ws.api"/>
-        <module name="org.jboss.ws.spi"/>
-        <module name="org.jboss.ws.common"/>
+        <module name="javax.xml.ws.api" />
+        <module name="org.jboss.ws.api" />
+        <module name="org.jboss.ws.spi" />
+        <module name="org.jboss.ws.common" />
         <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/>
         <!-- do not import services from cxf, those need to come from jbossws -->
         <module name="org.apache.cxf.impl">
@@ -63,12 +64,12 @@
             <include path="META-INF"/>
           </imports>
         </module>
-        <module name="org.apache.neethi"/>
-        <module name="org.apache.ws.security"/>
-        <module name="org.jboss.logging"/>
+        <module name="org.apache.neethi" />
+        <module name="org.apache.ws.security" />
+        <module name="org.jboss.logging" />
         <module name="org.apache.commons.beanutils"/>
-        <module name="javax.wsdl4j.api"/>
-        <module name="org.bouncycastle.bcmail"/>
+        <module name="javax.wsdl4j.api" />
+        <module name="org.bouncycastle.bcmail" />
         <module name="org.bouncycastle.bcpkix"/>
         <module name="org.bouncycastle.bcprov"/>
         <module name="org.jboss.modules"/>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml
similarity index 89%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml
index 406ec10ac..124cf8867 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2010, Red Hat, Inc., and individual contributors
@@ -20,14 +21,15 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module name="org.jboss.ws.jaxws-undertow-httpspi" xmlns="urn:jboss:module:1.9">
+
+<module xmlns="urn:jboss:module:1.9" name="org.jboss.ws.jaxws-undertow-httpspi">
 
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
 
     <resources>
-        <!-- Insert resources here -->
+        <artifact name="${org.jboss.ws.projects:jaxws-undertow-httpspi}"/>
     </resources>
 
     <dependencies>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/saaj-impl/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/saaj-impl/main/module.xml
similarity index 95%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/saaj-impl/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/saaj-impl/main/module.xml
index 9fb0b065b..570a4124c 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/saaj-impl/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/saaj-impl/main/module.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2011, Red Hat, Inc., and individual contributors
@@ -19,8 +20,9 @@
   ~ License along with this software; if not, write to the Free
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<module name="org.jboss.ws.saaj-impl" xmlns="urn:jboss:module:1.9">
+  -->
+
+<module xmlns="urn:jboss:module:1.9" name="org.jboss.ws.saaj-impl">
 
     <properties>
         <property name="jboss.api" value="private"/>
@@ -30,4 +32,4 @@
         <module name="org.jboss.ws.jaxws-client" services="import"/> <!-- to pull the jbossws-cxf SOAPConnection impl -->
         <module name="com.sun.xml.messaging.saaj" services="import"/>
     </dependencies>
-</module>
+</module>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/spi/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml
similarity index 90%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/spi/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml
index e65bd82e5..0cb30aa1f 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/spi/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2010, Red Hat, Inc., and individual contributors
@@ -20,19 +21,19 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module name="org.jboss.ws.spi" xmlns="urn:jboss:module:1.9">
+
+<module xmlns="urn:jboss:module:1.9" name="org.jboss.ws.spi">
 
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
 
     <resources>
-        <!-- Insert resources here -->
+        <artifact name="${org.jboss.ws:jbossws-spi}"/>
     </resources>
 
     <dependencies>
         <module name="java.management"/>
-        <!--WFLY-14219 Remove deprecated <module name="javax.api"/> -->
         <module name="javax.servlet.api"/>
         <module name="javax.xml.stream.api"/>
         <module name="javax.xml.ws.api"/>
diff --git a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/tools/common/main/module.xml b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/common/main/module.xml
similarity index 91%
rename from modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/tools/common/main/module.xml
rename to modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/common/main/module.xml
index 5e115681b..c9d862611 100644
--- a/modules/dist/src/main/resources/modules/wildfly/org/jboss/ws/tools/common/main/module.xml
+++ b/modules/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/common/main/module.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ JBoss, Home of Professional Open Source.
   ~ Copyright 2011, Red Hat, Inc., and individual contributors
@@ -20,14 +21,15 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module name="org.jboss.ws.tools.common" xmlns="urn:jboss:module:1.9">
+
+<module xmlns="urn:jboss:module:1.9" name="org.jboss.ws.tools.common">
 
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
 
     <resources>
-       <!-- Insert resources here -->
+        <artifact name="${org.jboss.ws:jbossws-common-tools}"/>
     </resources>
 
     <dependencies>
diff --git a/modules/feature-pack/wildfly-feature-pack-build.xml b/modules/feature-pack/wildfly-feature-pack-build.xml
new file mode 100644
index 000000000..75e0836c6
--- /dev/null
+++ b/modules/feature-pack/wildfly-feature-pack-build.xml
@@ -0,0 +1,8 @@
+<build xmlns="urn:wildfly:feature-pack-build:3.3" producer="org.jboss.ws.cxf:galleon-feature-pack">
+    <dependencies>
+        <dependency group-id="org.wildfly" artifact-id="wildfly-ee-galleon-pack"/>
+    </dependencies>
+    <default-packages>
+        <package name="modules.all"/>
+    </default-packages>
+</build>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 61f1c0ce9..c90b1aa51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
     <module>modules/resources</module>
     <module>modules/addons</module>
     <module>modules/test-utils</module>
+    <module>modules/feature-pack</module>
   </modules>
 
   <!-- Properties -->
@@ -1043,6 +1044,11 @@
         <artifactId>galleon-maven-plugin</artifactId>
         <version>${org.jboss.galleon.version}</version>
       </plugin>
+       <plugin>
+         <groupId>org.wildfly.galleon-plugins</groupId>
+         <artifactId>wildfly-galleon-maven-plugin</artifactId>
+         <version>6.3.1.Final</version>
+       </plugin>
      </plugins>
   </pluginManagement>
   </build>