diff --git a/samples/boot/actuator/src/main/resources/application-client.properties b/samples/boot/actuator/src/main/resources/application-client.properties
deleted file mode 100644
index 7df0e21c..00000000
--- a/samples/boot/actuator/src/main/resources/application-client.properties
+++ /dev/null
@@ -1 +0,0 @@
-server.port=9191
diff --git a/samples/boot/actuator/src/main/resources/application-server.properties b/samples/boot/actuator/src/main/resources/application-server.properties
deleted file mode 100644
index d636638d..00000000
--- a/samples/boot/actuator/src/main/resources/application-server.properties
+++ /dev/null
@@ -1 +0,0 @@
-server.port=8181
diff --git a/samples/boot/actuator/spring-geode-sample-boot-actuator.gradle b/spring-geode-samples/boot/actuator/spring-geode-samples-boot-actuator.gradle
similarity index 93%
rename from samples/boot/actuator/spring-geode-sample-boot-actuator.gradle
rename to spring-geode-samples/boot/actuator/spring-geode-samples-boot-actuator.gradle
index 125740a1..b58c1f04 100644
--- a/samples/boot/actuator/spring-geode-sample-boot-actuator.gradle
+++ b/spring-geode-samples/boot/actuator/spring-geode-samples-boot-actuator.gradle
@@ -1,3 +1,7 @@
+plugins {
+	id "io.freefair.lombok" version "3.2.1"
+}
+
 apply plugin: 'io.spring.convention.spring-sample-boot'
 
 description = "Spring Geode Sample demonstrating the use of Spring Boot Actuator with Apache Geode."
diff --git a/samples/boot/actuator/src/main/java/example/app/temp/event/BoilingTemperatureEvent.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/BoilingTemperatureEvent.java
similarity index 100%
rename from samples/boot/actuator/src/main/java/example/app/temp/event/BoilingTemperatureEvent.java
rename to spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/BoilingTemperatureEvent.java
diff --git a/samples/boot/actuator/src/main/java/example/app/temp/event/FreezingTemperatureEvent.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/FreezingTemperatureEvent.java
similarity index 100%
rename from samples/boot/actuator/src/main/java/example/app/temp/event/FreezingTemperatureEvent.java
rename to spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/FreezingTemperatureEvent.java
diff --git a/samples/boot/actuator/src/main/java/example/app/temp/event/TemperatureEvent.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/TemperatureEvent.java
similarity index 99%
rename from samples/boot/actuator/src/main/java/example/app/temp/event/TemperatureEvent.java
rename to spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/TemperatureEvent.java
index 313e29f2..026e584a 100644
--- a/samples/boot/actuator/src/main/java/example/app/temp/event/TemperatureEvent.java
+++ b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/event/TemperatureEvent.java
@@ -16,10 +16,11 @@
 
 package example.app.temp.event;
 
+import lombok.Getter;
+
 import org.springframework.context.ApplicationEvent;
 
 import example.app.temp.model.TemperatureReading;
-import lombok.Getter;
 
 public class TemperatureEvent extends ApplicationEvent {
 
diff --git a/samples/boot/actuator/src/main/java/example/app/temp/geode/client/BootGeodeClientApplication.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/geode/client/BootGeodeClientApplication.java
similarity index 100%
rename from samples/boot/actuator/src/main/java/example/app/temp/geode/client/BootGeodeClientApplication.java
rename to spring-geode-samples/boot/actuator/src/main/java/example/app/temp/geode/client/BootGeodeClientApplication.java
diff --git a/samples/boot/actuator/src/main/java/example/app/temp/geode/server/BootGeodeServerApplication.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/geode/server/BootGeodeServerApplication.java
similarity index 100%
rename from samples/boot/actuator/src/main/java/example/app/temp/geode/server/BootGeodeServerApplication.java
rename to spring-geode-samples/boot/actuator/src/main/java/example/app/temp/geode/server/BootGeodeServerApplication.java
diff --git a/samples/boot/actuator/src/main/java/example/app/temp/model/TemperatureReading.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/model/TemperatureReading.java
similarity index 100%
rename from samples/boot/actuator/src/main/java/example/app/temp/model/TemperatureReading.java
rename to spring-geode-samples/boot/actuator/src/main/java/example/app/temp/model/TemperatureReading.java
index ad54b0d9..3e0b4963 100644
--- a/samples/boot/actuator/src/main/java/example/app/temp/model/TemperatureReading.java
+++ b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/model/TemperatureReading.java
@@ -16,14 +16,14 @@
 
 package example.app.temp.model;
 
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.Transient;
-import org.springframework.data.gemfire.mapping.annotation.Region;
-
 import lombok.Data;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Transient;
+import org.springframework.data.gemfire.mapping.annotation.Region;
+
 @Data
 @Region("TemperatureReadings")
 @RequiredArgsConstructor(staticName = "newTemperatureReading")
diff --git a/samples/boot/actuator/src/main/java/example/app/temp/repo/TemperatureReadingRepository.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/repo/TemperatureReadingRepository.java
similarity index 100%
rename from samples/boot/actuator/src/main/java/example/app/temp/repo/TemperatureReadingRepository.java
rename to spring-geode-samples/boot/actuator/src/main/java/example/app/temp/repo/TemperatureReadingRepository.java
diff --git a/samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java
similarity index 100%
rename from samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java
rename to spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java
diff --git a/samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureSensor.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureSensor.java
similarity index 100%
rename from samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureSensor.java
rename to spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureSensor.java
diff --git a/spring-geode-samples/boot/actuator/src/main/resources/application-client.properties b/spring-geode-samples/boot/actuator/src/main/resources/application-client.properties
new file mode 100644
index 00000000..0f89c4b8
--- /dev/null
+++ b/spring-geode-samples/boot/actuator/src/main/resources/application-client.properties
@@ -0,0 +1,3 @@
+# Temperature Service client application configuration properties
+
+server.port=9191
diff --git a/spring-geode-samples/boot/actuator/src/main/resources/application-server.properties b/spring-geode-samples/boot/actuator/src/main/resources/application-server.properties
new file mode 100644
index 00000000..78823b87
--- /dev/null
+++ b/spring-geode-samples/boot/actuator/src/main/resources/application-server.properties
@@ -0,0 +1,3 @@
+# Temperature Service server application configuration properties
+
+server.port=8181
diff --git a/samples/boot/actuator/src/main/resources/application.properties b/spring-geode-samples/boot/actuator/src/main/resources/application.properties
similarity index 69%
rename from samples/boot/actuator/src/main/resources/application.properties
rename to spring-geode-samples/boot/actuator/src/main/resources/application.properties
index 29c615a7..b7c47fb9 100644
--- a/samples/boot/actuator/src/main/resources/application.properties
+++ b/spring-geode-samples/boot/actuator/src/main/resources/application.properties
@@ -1,3 +1,5 @@
+# Temperature Service application configuration properties
+
 management.endpoint.health.show-details=always
 #management.endpoints.web.exposure.include=env
 spring.data.gemfire.cache.log-level=error