diff --git a/packaging/xtable-aws-bundle/pom.xml b/packaging/xtable-aws-bundle/pom.xml
new file mode 100644
index 000000000..8c08515e6
--- /dev/null
+++ b/packaging/xtable-aws-bundle/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+-->
+<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.apache.xtable</groupId>
+        <artifactId>xtable</artifactId>
+        <version>0.2.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>xtable-aws-bundle</artifactId>
+    <name>XTable AWS Bundle</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.xtable</groupId>
+            <artifactId>xtable-aws</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"> </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                                    <resources>
+                                        <resource>LICENSE</resource>
+                                        <resource>NOTICE</resource>
+                                        <resource>NOTICE.txt</resource>
+                                    </resources>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                                    <resource>META-INF/LICENSE</resource>
+                                    <file>target/classes/META-INF/LICENSE</file>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                                    <resource>META-INF/NOTICE</resource>
+                                    <file>target/classes/META-INF/NOTICE</file>
+                                </transformer>
+                            </transformers>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/packaging/xtable-aws-bundle/src/main/java/org/apache/xtable/aws/bundle/Main.java b/packaging/xtable-aws-bundle/src/main/java/org/apache/xtable/aws/bundle/Main.java
new file mode 100644
index 000000000..d6ef22b44
--- /dev/null
+++ b/packaging/xtable-aws-bundle/src/main/java/org/apache/xtable/aws/bundle/Main.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+ 
+package org.apache.xtable.aws.bundle;
+
+import org.apache.hudi.common.util.ReflectionUtils;
+
+public class Main {
+
+  public static void main(String[] args) {
+    ReflectionUtils.getTopLevelClassesInClasspath(Main.class).forEach(System.out::println);
+  }
+}
diff --git a/xtable-aws/src/main/resources/META-INF/LICENSE b/packaging/xtable-aws-bundle/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from xtable-aws/src/main/resources/META-INF/LICENSE
rename to packaging/xtable-aws-bundle/src/main/resources/META-INF/LICENSE
diff --git a/xtable-aws/src/main/resources/META-INF/licenses/LICENSE-antlr4-runtime b/packaging/xtable-aws-bundle/src/main/resources/META-INF/licenses/LICENSE-antlr4-runtime
similarity index 100%
rename from xtable-aws/src/main/resources/META-INF/licenses/LICENSE-antlr4-runtime
rename to packaging/xtable-aws-bundle/src/main/resources/META-INF/licenses/LICENSE-antlr4-runtime
diff --git a/xtable-aws/src/main/resources/META-INF/licenses/LICENSE-checker-qual b/packaging/xtable-aws-bundle/src/main/resources/META-INF/licenses/LICENSE-checker-qual
similarity index 100%
rename from xtable-aws/src/main/resources/META-INF/licenses/LICENSE-checker-qual
rename to packaging/xtable-aws-bundle/src/main/resources/META-INF/licenses/LICENSE-checker-qual
diff --git a/xtable-aws/src/main/resources/META-INF/licenses/LICENSE-glassfish-java-servlet-jsp b/packaging/xtable-aws-bundle/src/main/resources/META-INF/licenses/LICENSE-glassfish-java-servlet-jsp
similarity index 100%
rename from xtable-aws/src/main/resources/META-INF/licenses/LICENSE-glassfish-java-servlet-jsp
rename to packaging/xtable-aws-bundle/src/main/resources/META-INF/licenses/LICENSE-glassfish-java-servlet-jsp
diff --git a/xtable-aws/src/main/resources/META-INF/licenses/LICENSE-javax-annotation-api b/packaging/xtable-aws-bundle/src/main/resources/META-INF/licenses/LICENSE-javax-annotation-api
similarity index 100%
rename from xtable-aws/src/main/resources/META-INF/licenses/LICENSE-javax-annotation-api
rename to packaging/xtable-aws-bundle/src/main/resources/META-INF/licenses/LICENSE-javax-annotation-api
diff --git a/xtable-aws/src/main/resources/META-INF/licenses/LICENSE-paranamer b/packaging/xtable-aws-bundle/src/main/resources/META-INF/licenses/LICENSE-paranamer
similarity index 100%
rename from xtable-aws/src/main/resources/META-INF/licenses/LICENSE-paranamer
rename to packaging/xtable-aws-bundle/src/main/resources/META-INF/licenses/LICENSE-paranamer
diff --git a/xtable-aws/src/main/resources/META-INF/licenses/LICENSE-slf4j-api b/packaging/xtable-aws-bundle/src/main/resources/META-INF/licenses/LICENSE-slf4j-api
similarity index 100%
rename from xtable-aws/src/main/resources/META-INF/licenses/LICENSE-slf4j-api
rename to packaging/xtable-aws-bundle/src/main/resources/META-INF/licenses/LICENSE-slf4j-api
diff --git a/packaging/xtable-hive-metastore-bundle/pom.xml b/packaging/xtable-hive-metastore-bundle/pom.xml
new file mode 100644
index 000000000..392097b97
--- /dev/null
+++ b/packaging/xtable-hive-metastore-bundle/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+-->
+<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.apache.xtable</groupId>
+        <artifactId>xtable</artifactId>
+        <version>0.2.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>xtable-hive-metastore-bundle</artifactId>
+    <name>XTable HMS Bundle</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.xtable</groupId>
+            <artifactId>xtable-hive-metastore</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"> </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                                    <resources>
+                                        <resource>LICENSE</resource>
+                                        <resource>NOTICE</resource>
+                                        <resource>NOTICE.txt</resource>
+                                    </resources>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                                    <resource>META-INF/LICENSE</resource>
+                                    <file>target/classes/META-INF/LICENSE</file>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                                    <resource>META-INF/NOTICE</resource>
+                                    <file>target/classes/META-INF/NOTICE</file>
+                                </transformer>
+                            </transformers>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
+                            <finalName>${project.artifactId}-${project.version}</finalName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/packaging/xtable-hive-metastore-bundle/src/main/java/org/apache/xtable/hms/bundle/Main.java b/packaging/xtable-hive-metastore-bundle/src/main/java/org/apache/xtable/hms/bundle/Main.java
new file mode 100644
index 000000000..fa62f6e62
--- /dev/null
+++ b/packaging/xtable-hive-metastore-bundle/src/main/java/org/apache/xtable/hms/bundle/Main.java
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+ 
+package org.apache.xtable.hms.bundle;
+
+import org.apache.hudi.common.util.ReflectionUtils;
+
+public class Main {
+
+  public static void main(String[] args) {
+    ReflectionUtils.getTopLevelClassesInClasspath(Main.class).forEach(System.out::println);
+  }
+}
diff --git a/xtable-hive-metastore/src/main/resources/META-INF/LICENSE b/packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from xtable-hive-metastore/src/main/resources/META-INF/LICENSE
rename to packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/LICENSE
diff --git a/xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-antlr4-runtime b/packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-antlr4-runtime
similarity index 100%
rename from xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-antlr4-runtime
rename to packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-antlr4-runtime
diff --git a/xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-checker-qual b/packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-checker-qual
similarity index 100%
rename from xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-checker-qual
rename to packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-checker-qual
diff --git a/xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-glasshfish-javax-servlet b/packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-glasshfish-javax-servlet
similarity index 100%
rename from xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-glasshfish-javax-servlet
rename to packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-glasshfish-javax-servlet
diff --git a/xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-javax-annotation-api b/packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-javax-annotation-api
similarity index 100%
rename from xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-javax-annotation-api
rename to packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-javax-annotation-api
diff --git a/xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-javolution b/packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-javolution
similarity index 100%
rename from xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-javolution
rename to packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-javolution
diff --git a/xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-jersey-core b/packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-jersey-core
similarity index 100%
rename from xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-jersey-core
rename to packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-jersey-core
diff --git a/xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-jruby-jcodings b/packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-jruby-jcodings
similarity index 100%
rename from xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-jruby-jcodings
rename to packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-jruby-jcodings
diff --git a/xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-jruby-joni b/packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-jruby-joni
similarity index 100%
rename from xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-jruby-joni
rename to packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-jruby-joni
diff --git a/xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-leveldbjni b/packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-leveldbjni
similarity index 100%
rename from xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-leveldbjni
rename to packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-leveldbjni
diff --git a/xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-paranamer b/packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-paranamer
similarity index 100%
rename from xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-paranamer
rename to packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-paranamer
diff --git a/xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-slf4j-api b/packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-slf4j-api
similarity index 100%
rename from xtable-hive-metastore/src/main/resources/META-INF/licenses/LICENSE-slf4j-api
rename to packaging/xtable-hive-metastore-bundle/src/main/resources/META-INF/licenses/LICENSE-slf4j-api
diff --git a/pom.xml b/pom.xml
index 9c1b266f2..f1a0353dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,10 +53,14 @@
         <module>xtable-utilities</module>
         <module>xtable-aws</module>
         <module>xtable-hive-metastore</module>
+        <module>packaging/xtable-aws-bundle</module>
+        <module>packaging/xtable-hive-metastore-bundle</module>
     </modules>
 
     <properties>
         <project.version>0.2.0-SNAPSHOT</project.version>
+        <!-- To ensure build content is re-producible -->
+        <project.build.outputTimestamp>2025-01-01T00:00:00Z</project.build.outputTimestamp>
         <maven.compiler.target>8</maven.compiler.target>
         <avro.version>1.11.4</avro.version>
         <log4j.version>2.22.0</log4j.version>
diff --git a/xtable-aws/pom.xml b/xtable-aws/pom.xml
index 2c01ff8d7..6d928c368 100644
--- a/xtable-aws/pom.xml
+++ b/xtable-aws/pom.xml
@@ -94,42 +94,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"> </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
-                                    <resources>
-                                        <resource>LICENSE</resource>
-                                        <resource>NOTICE</resource>
-                                        <resource>NOTICE.txt</resource>
-                                    </resources>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
-                                    <resource>META-INF/LICENSE</resource>
-                                    <file>target/classes/META-INF/LICENSE</file>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
-                                    <resource>META-INF/NOTICE</resource>
-                                    <file>target/classes/META-INF/NOTICE</file>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/xtable-hive-metastore/pom.xml b/xtable-hive-metastore/pom.xml
index c4a1e76af..aca2d81e6 100644
--- a/xtable-hive-metastore/pom.xml
+++ b/xtable-hive-metastore/pom.xml
@@ -187,41 +187,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"> </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
-                                    <resources>
-                                        <resource>LICENSE</resource>
-                                        <resource>NOTICE</resource>
-                                        <resource>NOTICE.txt</resource>
-                                    </resources>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
-                                    <resource>META-INF/LICENSE</resource>
-                                    <file>target/classes/META-INF/LICENSE</file>
-                                </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
-                                    <resource>META-INF/NOTICE</resource>
-                                    <file>target/classes/META-INF/NOTICE</file>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>