diff --git a/build.gradle b/cics-java-liberty-springboot-link-app/build.gradle
similarity index 78%
rename from build.gradle
rename to cics-java-liberty-springboot-link-app/build.gradle
index 206adea..873b334 100644
--- a/build.gradle
+++ b/cics-java-liberty-springboot-link-app/build.gradle
@@ -9,8 +9,7 @@ plugins
 }
 
 group = 'com.ibm.cicsdev.springboot'
-archivesBaseName='cics-java-liberty-springboot-link'
-version = '0.1.0'
+version = '1.0.0'
 
 // ============================================================================
 // Java Configuration
@@ -20,6 +19,19 @@ java {
     targetCompatibility = JavaVersion.toVersion(java_version)
 }
 
+// ============================================================================
+// WAR Configuration
+// ============================================================================
+war
+{
+    archiveFileName = "cics-java-liberty-springboot-link-app-${version}.war"
+}
+
+// Two versions of the WAR would be built, one for embedding into servers like Liberty (plain)
+// and a bootWAR which can run standalone and contains all the Tomcat and Spring Boot stuff
+// we don't need bootWAR, so disable it.
+bootWar { enabled = false }
+
 // If in Eclipse, add Javadoc to the local project classpath
 eclipse
 {
diff --git a/cics-java-liberty-springboot-link-app/pom.xml b/cics-java-liberty-springboot-link-app/pom.xml
new file mode 100644
index 0000000..c8f6037
--- /dev/null
+++ b/cics-java-liberty-springboot-link-app/pom.xml
@@ -0,0 +1,115 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <!-- Inherit from parent POM -->
+  <parent>
+    <groupId>com.ibm.cicsdev</groupId>
+    <artifactId>cics-java-liberty-springboot-link</artifactId>
+    <version>1.0.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  
+  <!--  Application module properties -->
+  <artifactId>cics-java-liberty-springboot-link-app</artifactId>
+  <name>com.ibm.cicsdev.springboot.link.app</name>
+  <description>Demo project for Spring Boot with CICS Link - Application</description>
+  
+  <properties>
+    <java.version>17</java.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
+    <maven.compiler.source>${java.version}</maven.compiler.source>    
+    <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
+  </properties>
+  
+  <!-- CICS TS V6.1 BOM (as of Sept 2024) -->
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.ibm.cics</groupId>
+        <artifactId>com.ibm.cics.ts.bom</artifactId>
+        <version>6.1-20250812133513-PH63856</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  
+  <dependencies>
+    <!-- Compile against, but don't include JCICS in the final build (version and scope are from BOM) -->
+    <dependency>
+      <groupId>com.ibm.cics</groupId>
+      <artifactId>com.ibm.cics.server</artifactId>
+    </dependency>
+
+    <!-- CICS Annotations -->
+    <dependency>
+      <groupId>com.ibm.cics</groupId>
+      <artifactId>com.ibm.cics.server.invocation.annotations</artifactId>
+    </dependency>
+
+    <!-- Spring web support -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+
+    <!-- Validation annotation support for validating Web input forms -->
+    <dependency>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+    </dependency>
+
+    <!-- Thymeleaf view -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-thymeleaf</artifactId>
+    </dependency>
+
+    <!-- Don't include TomCat in the runtime build, but put it in lib-provided so it can run standalone as well as embedded  -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-tomcat</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- Add tiles-el dependency if using JSF, see README for more details -->
+    <dependency>
+      <groupId>org.apache.tiles</groupId>
+      <artifactId>tiles-el</artifactId>
+      <version>3.0.8</version>
+    </dependency>
+
+  </dependencies>
+
+  <!-- Package as an executable war (default jar) -->
+  <packaging>war</packaging>
+
+  <!-- Build with Maven and CICS annotation processor -->
+  <build>
+    <plugins>
+      <!-- Spring Boot plugin for Maven -->
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
+
+      <!-- Enable the Link to Liberty annotation processor -->
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.12.1</version>
+        <configuration>
+          <annotationProcessorPaths>
+            <annotationProcessorPath>
+              <groupId>com.ibm.cics</groupId>
+              <artifactId>com.ibm.cics.server.invocation</artifactId>
+            </annotationProcessorPath>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/Application.java b/cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/Application.java
similarity index 100%
rename from src/main/java/com/ibm/cicsdev/springboot/link/app/ui/Application.java
rename to cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/Application.java
diff --git a/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/InMemoryMessageRepository.java b/cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/InMemoryMessageRepository.java
similarity index 100%
rename from src/main/java/com/ibm/cicsdev/springboot/link/app/ui/InMemoryMessageRepository.java
rename to cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/InMemoryMessageRepository.java
diff --git a/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/Message.java b/cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/Message.java
similarity index 100%
rename from src/main/java/com/ibm/cicsdev/springboot/link/app/ui/Message.java
rename to cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/Message.java
diff --git a/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/MessageRepository.java b/cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/MessageRepository.java
similarity index 100%
rename from src/main/java/com/ibm/cicsdev/springboot/link/app/ui/MessageRepository.java
rename to cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/MessageRepository.java
diff --git a/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/ServletInitializer.java b/cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/ServletInitializer.java
similarity index 100%
rename from src/main/java/com/ibm/cicsdev/springboot/link/app/ui/ServletInitializer.java
rename to cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/ServletInitializer.java
diff --git a/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/cics/CICSCallable.java b/cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/cics/CICSCallable.java
similarity index 100%
rename from src/main/java/com/ibm/cicsdev/springboot/link/app/ui/cics/CICSCallable.java
rename to cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/cics/CICSCallable.java
diff --git a/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/mvc/MessageController.java b/cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/mvc/MessageController.java
similarity index 100%
rename from src/main/java/com/ibm/cicsdev/springboot/link/app/ui/mvc/MessageController.java
rename to cics-java-liberty-springboot-link-app/src/main/java/com/ibm/cicsdev/springboot/link/app/ui/mvc/MessageController.java
diff --git a/src/main/resources/application.properties b/cics-java-liberty-springboot-link-app/src/main/resources/application.properties
similarity index 100%
rename from src/main/resources/application.properties
rename to cics-java-liberty-springboot-link-app/src/main/resources/application.properties
diff --git a/src/main/resources/logback.xml b/cics-java-liberty-springboot-link-app/src/main/resources/logback.xml
similarity index 100%
rename from src/main/resources/logback.xml
rename to cics-java-liberty-springboot-link-app/src/main/resources/logback.xml
diff --git a/src/main/resources/messages.properties b/cics-java-liberty-springboot-link-app/src/main/resources/messages.properties
similarity index 100%
rename from src/main/resources/messages.properties
rename to cics-java-liberty-springboot-link-app/src/main/resources/messages.properties
diff --git a/src/main/resources/static/css/bootstrap.min.css b/cics-java-liberty-springboot-link-app/src/main/resources/static/css/bootstrap.min.css
similarity index 100%
rename from src/main/resources/static/css/bootstrap.min.css
rename to cics-java-liberty-springboot-link-app/src/main/resources/static/css/bootstrap.min.css
diff --git a/src/main/resources/static/favicon.ico b/cics-java-liberty-springboot-link-app/src/main/resources/static/favicon.ico
similarity index 100%
rename from src/main/resources/static/favicon.ico
rename to cics-java-liberty-springboot-link-app/src/main/resources/static/favicon.ico
diff --git a/src/main/resources/templates/fragments.html b/cics-java-liberty-springboot-link-app/src/main/resources/templates/fragments.html
similarity index 100%
rename from src/main/resources/templates/fragments.html
rename to cics-java-liberty-springboot-link-app/src/main/resources/templates/fragments.html
diff --git a/src/main/resources/templates/messages/form.html b/cics-java-liberty-springboot-link-app/src/main/resources/templates/messages/form.html
similarity index 100%
rename from src/main/resources/templates/messages/form.html
rename to cics-java-liberty-springboot-link-app/src/main/resources/templates/messages/form.html
diff --git a/src/main/resources/templates/messages/list.html b/cics-java-liberty-springboot-link-app/src/main/resources/templates/messages/list.html
similarity index 100%
rename from src/main/resources/templates/messages/list.html
rename to cics-java-liberty-springboot-link-app/src/main/resources/templates/messages/list.html
diff --git a/src/main/resources/templates/messages/view.html b/cics-java-liberty-springboot-link-app/src/main/resources/templates/messages/view.html
similarity index 100%
rename from src/main/resources/templates/messages/view.html
rename to cics-java-liberty-springboot-link-app/src/main/resources/templates/messages/view.html
diff --git a/cics-java-liberty-springboot-link-cicsbundle/build.gradle b/cics-java-liberty-springboot-link-cicsbundle/build.gradle
new file mode 100644
index 0000000..52dcf00
--- /dev/null
+++ b/cics-java-liberty-springboot-link-cicsbundle/build.gradle
@@ -0,0 +1,33 @@
+// ============================================================================
+// Plugins
+// ============================================================================
+plugins
+{
+    id 'com.ibm.cics.bundle' version '1.0.8'
+}
+
+// ============================================================================
+// Project Information
+// ============================================================================
+description = 'CICS Spring Boot Link Application - CICS Bundle'
+version = '1.0.0'
+
+// ============================================================================
+// Dependencies
+// ============================================================================
+dependencies
+{
+    // Application WAR from sibling project
+    cicsBundlePart project(path: ':cics-java-liberty-springboot-link-app', configuration: 'archives')
+}
+
+// ============================================================================
+// CICS Bundle Configuration
+// ============================================================================
+cicsBundle
+{
+    build
+    {
+        defaultJVMServer = project.findProperty('cics.jvmserver') ?: 'DFHWLP'
+    }
+}
diff --git a/cics-java-liberty-springboot-link-cicsbundle/pom.xml b/cics-java-liberty-springboot-link-cicsbundle/pom.xml
new file mode 100644
index 0000000..ce97854
--- /dev/null
+++ b/cics-java-liberty-springboot-link-cicsbundle/pom.xml
@@ -0,0 +1,57 @@
+<?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 Project                                                   -->
+    <!-- ================================================================ -->
+    <parent>
+        <groupId>com.ibm.cicsdev</groupId>
+        <artifactId>cics-java-liberty-springboot-link</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <!-- ================================================================ -->
+    <!-- Project Coordinates                                              -->
+    <!-- ================================================================ -->
+    <artifactId>cics-java-liberty-springboot-link-cicsbundle</artifactId>
+    <packaging>cics-bundle</packaging>
+    <name>CICS Spring Boot Link - CICS Bundle</name>
+
+    <!-- ================================================================ -->
+    <!-- Dependencies                                                     -->
+    <!-- ================================================================ -->
+    <dependencies>
+        <!-- Application WAR -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>cics-java-liberty-springboot-link-app</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+
+    <!-- ================================================================ -->
+    <!-- Build Configuration                                              -->
+    <!-- ================================================================ -->
+    <build>
+        <plugins>
+            <!-- CICS Bundle Maven Plugin -->
+            <plugin>
+                <groupId>com.ibm.cics</groupId>
+                <artifactId>cics-bundle-maven-plugin</artifactId>
+                <version>1.0.8</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <defaultjvmserver>${cics.jvmserver}</defaultjvmserver>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e48eca5..aaaabb3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/pom.xml b/pom.xml
index a05935d..4797a9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,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">
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
+  
   <!-- Inherit defaults from Spring Boot Parent-->
   <parent>
     <groupId>org.springframework.boot</groupId>
@@ -10,24 +10,28 @@
     <version>3.5.9</version>
     <relativePath/>
   </parent>
-
-  <!--  Application properties -->
-  <groupId>com.ibm.cicsdev.springboot</groupId>
+  
+  <!-- ================================================================ -->
+  <!-- Project Coordinates                                              -->
+  <!-- ================================================================ -->
+  <groupId>com.ibm.cicsdev</groupId>
   <artifactId>cics-java-liberty-springboot-link</artifactId>
-  <version>0.1.0</version>
-  <name>cics-java-liberty-springboot-link</name>
-  <description>Demo project for Spring Boot</description>
+  <version>1.0.0</version>
+  <description>Demo project for Spring Boot with CICS Link</description>
+  <packaging>pom</packaging>
+  
   <properties>
     <java.version>17</java.version>
-
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.compiler.source>${java.version}</maven.compiler.source>
+    <cics.jvmserver>DFHWLP</cics.jvmserver>
   </properties>
-
-  <!-- CICS TS V6.1 BOM (as of Sept 2024) -->
+  
+  <!-- Dependency Management -->
   <dependencyManagement>
     <dependencies>
+      <!-- CICS TS V6.1 BOM (as of Sept 2024) -->
       <dependency>
         <groupId>com.ibm.cics</groupId>
         <artifactId>com.ibm.cics.ts.bom</artifactId>
@@ -37,81 +41,13 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-
-  <dependencies>
-    <!-- Compile against, but don't include JCICS in the final build (version and scope are from
-    BOM) -->
-    <dependency>
-      <groupId>com.ibm.cics</groupId>
-      <artifactId>com.ibm.cics.server</artifactId>
-    </dependency>
-
-    <!-- CICS Annotations -->
-    <dependency>
-      <groupId>com.ibm.cics</groupId>
-      <artifactId>com.ibm.cics.server.invocation.annotations</artifactId>
-    </dependency>
-
-    <!-- Spring web support -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-
-    <!-- Validation annotation support for validating Web input forms -->
-    <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
-    </dependency>
-
-    <!-- Thymeleaf view -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-thymeleaf</artifactId>
-    </dependency>
-
-    <!-- Don't include TomCat in the runtime build, but put it in lib-provided so it can run standalone as well as embedded  -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-tomcat</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Add tiles-el dependency if using JSF, see README for more details -->
-    <dependency>
-      <groupId>org.apache.tiles</groupId>
-      <artifactId>tiles-el</artifactId>
-      <version>3.0.8</version>
-    </dependency>
-
-  </dependencies>
-
-  <!-- Package as an executable war (default jar) -->
-  <packaging>war</packaging>
-
-  <!-- Build with Maven and CICS annotation processor -->
-  <build>
-    <plugins>
-      <!-- Spring Boot plugin for Maven -->
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-      </plugin>
-
-      <!-- Enable the Link to Liberty annotation processor -->
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.12.1</version>
-        <configuration>
-          <annotationProcessorPaths>
-            <annotationProcessorPath>
-              <groupId>com.ibm.cics</groupId>
-              <artifactId>com.ibm.cics.server.invocation</artifactId>
-            </annotationProcessorPath>
-          </annotationProcessorPaths>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  
+  <!-- ================================================================ -->
+  <!-- Modules                                                          -->
+  <!-- ================================================================ -->
+  <modules>
+    <module>cics-java-liberty-springboot-link-app</module>
+    <module>cics-java-liberty-springboot-link-cicsbundle</module>
+  </modules>
 
 </project>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 6d472f9..8662f2c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,10 @@
-rootProject.name = 'com.ibm.cicsdev.springboot.link'
+// ============================================================================
+// Root Project Configuration
+// ============================================================================
+rootProject.name = 'cics-java-liberty-springboot-link'
+
+// ============================================================================
+// Subprojects
+// ============================================================================
+include(':cics-java-liberty-springboot-link-app')
+include(':cics-java-liberty-springboot-link-cicsbundle')