diff --git a/README.md b/README.md
index c55dfc32..42aac33a 100644
--- a/README.md
+++ b/README.md
@@ -286,29 +286,29 @@ client.deleteState(r -> r.activityId("https://example.com/activity/1")
 
 The samples folder in this repository contains [sample applications](samples) that use the xAPI client. 
 
-## xAPI Model Spring Boot Autoconfigure
+## xAPI Model Spring Boot Starter
 
 The xAPI specification has strict rules for API requests/responses formatting. The xAPI Model has inbuilt validation for all of these rules. However, if you plan to use the xAPI Model, you should keep in mind that some activity providers do not fully conform to these rules.
 
 In some cases it may be desirable to turn off some or all of the rules in order to be compatible with a wider range of xAPI activity providers. However, it should be noted that doing this is in violation of the xAPI specification.
 
-The xAPI Model Spring Boot Autoconfigure package provides an easy way to turn on/off these validation rules.
+The xAPI Model Spring Boot Starter package provides an easy way to turn on/off these validation rules.
 
 ### Getting started
 
-To use the xAPI Model Spring Boot Autoconfigure include the appropriate XML in the `dependencies` section of your `pom.xml`, as shown in the following example:
+To use the xAPI Model Spring Boot Starter include the appropriate XML in the `dependencies` section of your `pom.xml`, as shown in the following example:
 
 ```
 <dependency>
   <groupId>dev.learning.xapi</groupId>
-  <artifactId>xapi-model-spring-boot-autoconfigure</artifactId>
+  <artifactId>xapi-model-spring-boot-starter</artifactId>
   <version>1.1.5</version>
 </dependency>
 ```
 
 ### Configuration
 
-The xAPI Model Spring Boot Autoconfigure has a Spring AutoConfiguration bean which picks up the following properties: 
+The xAPI Model Spring Boot Starter has a Spring AutoConfiguration bean which picks up the following properties: 
 
 | Property                                  | Description                                                                |
 | ----------------------------------------- | -------------------------------------------------------------------------- |
diff --git a/pom.xml b/pom.xml
index 07918958..257b88ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
     <module>xapi-model</module>
     <module>xapi-client</module>
     <module>samples</module>
-    <module>xapi-model-spring-boot-autoconfigure</module>
+    <module>xapi-model-spring-boot-starter</module>
   </modules>
   <build>
     <pluginManagement>
@@ -266,7 +266,7 @@
       </dependency>
       <dependency>
         <groupId>dev.learning.xapi</groupId>
-        <artifactId>xapi-model-spring-boot-autoconfigure</artifactId>
+        <artifactId>xapi-model-spring-boot-starter</artifactId>
         <version>1.1.5-SNAPSHOT</version>
       </dependency>
       <dependency>
diff --git a/samples/xapi-server/pom.xml b/samples/xapi-server/pom.xml
index 62941fa9..b2b87972 100644
--- a/samples/xapi-server/pom.xml
+++ b/samples/xapi-server/pom.xml
@@ -11,26 +11,13 @@
   <description>Basic xAPI Statement Resource implementation</description>
   <dependencies>
     <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <!-- If the hibernate validator is on the class path the model will be validated -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-validation</artifactId>
+      <groupId>dev.learning.xapi</groupId>
+      <artifactId>xapi-model-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
-    <dependency>
-      <groupId>dev.learning.xapi</groupId>
-      <artifactId>xapi-model</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>dev.learning.xapi</groupId>
-      <artifactId>xapi-model-spring-boot-autoconfigure</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
diff --git a/xapi-model-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/xapi-model-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 5c3edec2..00000000
--- a/xapi-model-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-dev.learning.xapi.XapiModelAutoConfiguration
diff --git a/xapi-model-spring-boot-autoconfigure/pom.xml b/xapi-model-spring-boot-starter/pom.xml
similarity index 69%
rename from xapi-model-spring-boot-autoconfigure/pom.xml
rename to xapi-model-spring-boot-starter/pom.xml
index 17acb448..a1080a81 100644
--- a/xapi-model-spring-boot-autoconfigure/pom.xml
+++ b/xapi-model-spring-boot-starter/pom.xml
@@ -6,14 +6,18 @@
     <artifactId>xapi-build</artifactId>
     <version>1.1.5-SNAPSHOT</version>
   </parent>
-  <artifactId>xapi-model-spring-boot-autoconfigure</artifactId>
-  <name>xAPI Spring Boot Autoconfigure</name>
-  <description>learning.dev Spring Boot Autoconfigure</description>
+  <artifactId>xapi-model-spring-boot-starter</artifactId>
+  <name>xAPI Spring Boot Starter</name>
+  <description>learning.dev Spring Boot Starter</description>
 
   <dependencies>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-validation</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/xapi-model-spring-boot-autoconfigure/src/main/java/dev/learning/xapi/XapiModelAutoConfiguration.java b/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java
similarity index 99%
rename from xapi-model-spring-boot-autoconfigure/src/main/java/dev/learning/xapi/XapiModelAutoConfiguration.java
rename to xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java
index 5b2fd924..7b3e5bdc 100644
--- a/xapi-model-spring-boot-autoconfigure/src/main/java/dev/learning/xapi/XapiModelAutoConfiguration.java
+++ b/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java
@@ -2,7 +2,7 @@
  * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved.
  */
 
-package dev.learning.xapi;
+package dev.learning.xapi.autoconfigure.model;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.cfg.CoercionAction;
diff --git a/xapi-model-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/xapi-model-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..5bb0e7e1
--- /dev/null
+++ b/xapi-model-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+dev.learning.xapi.autoconfigure.model.XapiModelAutoConfiguration