diff --git a/spring-geode-docs/src/docs/asciidoc/images/Cluster.png b/spring-geode-docs/src/docs/asciidoc/guides/images/Cluster.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/Cluster.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/Cluster.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/HTTP-Session-Caching.png b/spring-geode-docs/src/docs/asciidoc/guides/images/HTTP-Session-Caching.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/HTTP-Session-Caching.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/HTTP-Session-Caching.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/HttpSessionCachingApplication-ServletContainerSession.png b/spring-geode-docs/src/docs/asciidoc/guides/images/HttpSessionCachingApplication-ServletContainerSession.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/HttpSessionCachingApplication-ServletContainerSession.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/HttpSessionCachingApplication-ServletContainerSession.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/HttpSessionCachingApplication-ServletContainerSessionExpiration.png b/spring-geode-docs/src/docs/asciidoc/guides/images/HttpSessionCachingApplication-ServletContainerSessionExpiration.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/HttpSessionCachingApplication-ServletContainerSessionExpiration.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/HttpSessionCachingApplication-ServletContainerSessionExpiration.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/HttpSessionCachingApplication-SpringSession.png b/spring-geode-docs/src/docs/asciidoc/guides/images/HttpSessionCachingApplication-SpringSession.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/HttpSessionCachingApplication-SpringSession.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/HttpSessionCachingApplication-SpringSession.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/HttpSessionCachingApplication.png b/spring-geode-docs/src/docs/asciidoc/guides/images/HttpSessionCachingApplication.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/HttpSessionCachingApplication.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/HttpSessionCachingApplication.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/Inline-Caching-Pattern.png b/spring-geode-docs/src/docs/asciidoc/guides/images/Inline-Caching-Pattern.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/Inline-Caching-Pattern.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/Inline-Caching-Pattern.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/Look-Aside-Caching-Pattern.png b/spring-geode-docs/src/docs/asciidoc/guides/images/Look-Aside-Caching-Pattern.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/Look-Aside-Caching-Pattern.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/Look-Aside-Caching-Pattern.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/LookAsideCachingApplication-Ping.png b/spring-geode-docs/src/docs/asciidoc/guides/images/LookAsideCachingApplication-Ping.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/LookAsideCachingApplication-Ping.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/LookAsideCachingApplication-Ping.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/Near-Caching-Example-Webapp-Create-JonDoe.png b/spring-geode-docs/src/docs/asciidoc/guides/images/Near-Caching-Example-Webapp-Create-JonDoe.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/Near-Caching-Example-Webapp-Create-JonDoe.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/Near-Caching-Example-Webapp-Create-JonDoe.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/Near-Caching-Example-Webapp-Read-JonDoe.png b/spring-geode-docs/src/docs/asciidoc/guides/images/Near-Caching-Example-Webapp-Read-JonDoe.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/Near-Caching-Example-Webapp-Read-JonDoe.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/Near-Caching-Example-Webapp-Read-JonDoe.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/Near-Caching-Example-Webapp-Reload-JonDoe.png b/spring-geode-docs/src/docs/asciidoc/guides/images/Near-Caching-Example-Webapp-Reload-JonDoe.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/Near-Caching-Example-Webapp-Reload-JonDoe.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/Near-Caching-Example-Webapp-Reload-JonDoe.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/Near-Caching-Example-Webapp-Update-JonDoe.png b/spring-geode-docs/src/docs/asciidoc/guides/images/Near-Caching-Example-Webapp-Update-JonDoe.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/Near-Caching-Example-Webapp-Update-JonDoe.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/Near-Caching-Example-Webapp-Update-JonDoe.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/Near-Caching-Example-Webapp.png b/spring-geode-docs/src/docs/asciidoc/guides/images/Near-Caching-Example-Webapp.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/Near-Caching-Example-Webapp.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/Near-Caching-Example-Webapp.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/Near-Caching-Pattern.png b/spring-geode-docs/src/docs/asciidoc/guides/images/Near-Caching-Pattern.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/Near-Caching-Pattern.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/Near-Caching-Pattern.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/Small-Database-To-Big-Database.png b/spring-geode-docs/src/docs/asciidoc/guides/images/Small-Database-To-Big-Database.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/Small-Database-To-Big-Database.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/Small-Database-To-Big-Database.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/Spring-Session-Framework-Architecture.png b/spring-geode-docs/src/docs/asciidoc/guides/images/Spring-Session-Framework-Architecture.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/Spring-Session-Framework-Architecture.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/Spring-Session-Framework-Architecture.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/client-actuator-health-cq-endpoint.png b/spring-geode-docs/src/docs/asciidoc/guides/images/client-actuator-health-cq-endpoint.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/client-actuator-health-cq-endpoint.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/client-actuator-health-cq-endpoint.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/client-actuator-health-endpoints.png b/spring-geode-docs/src/docs/asciidoc/guides/images/client-actuator-health-endpoints.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/client-actuator-health-endpoints.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/client-actuator-health-endpoints.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/client-actuator-health-region-endpoint.png b/spring-geode-docs/src/docs/asciidoc/guides/images/client-actuator-health-region-endpoint.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/client-actuator-health-region-endpoint.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/client-actuator-health-region-endpoint.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/customer-service-application-jondoe.png b/spring-geode-docs/src/docs/asciidoc/guides/images/customer-service-application-jondoe.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/customer-service-application-jondoe.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/customer-service-application-jondoe.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/factorial-of-five-after.png b/spring-geode-docs/src/docs/asciidoc/guides/images/factorial-of-five-after.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/factorial-of-five-after.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/factorial-of-five-after.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/factorial-of-five-before.png b/spring-geode-docs/src/docs/asciidoc/guides/images/factorial-of-five-before.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/factorial-of-five-before.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/factorial-of-five-before.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/factorial-of-four-after.png b/spring-geode-docs/src/docs/asciidoc/guides/images/factorial-of-four-after.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/factorial-of-four-after.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/factorial-of-four-after.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/factorial-of-four-before.png b/spring-geode-docs/src/docs/asciidoc/guides/images/factorial-of-four-before.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/factorial-of-four-before.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/factorial-of-four-before.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/getting-started-crm-app-getallcustomers.png b/spring-geode-docs/src/docs/asciidoc/guides/images/getting-started-crm-app-getallcustomers.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/getting-started-crm-app-getallcustomers.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/getting-started-crm-app-getallcustomers.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/getting-started-crm-app-homepage.png b/spring-geode-docs/src/docs/asciidoc/guides/images/getting-started-crm-app-homepage.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/getting-started-crm-app-homepage.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/getting-started-crm-app-homepage.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/pvtl-appsmanager-org-space-apps-crm-app-logs-output.png b/spring-geode-docs/src/docs/asciidoc/guides/images/pvtl-appsmanager-org-space-apps-crm-app-logs-output.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/pvtl-appsmanager-org-space-apps-crm-app-logs-output.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/pvtl-appsmanager-org-space-apps-crm-app-logs-output.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/pvtl-appsmanager-org-space-apps-crm-app-overview.png b/spring-geode-docs/src/docs/asciidoc/guides/images/pvtl-appsmanager-org-space-apps-crm-app-overview.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/pvtl-appsmanager-org-space-apps-crm-app-overview.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/pvtl-appsmanager-org-space-apps-crm-app-overview.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/pvtl-appsmanager-org-space-apps-crm-app-service.png b/spring-geode-docs/src/docs/asciidoc/guides/images/pvtl-appsmanager-org-space-apps-crm-app-service.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/pvtl-appsmanager-org-space-apps-crm-app-service.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/pvtl-appsmanager-org-space-apps-crm-app-service.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/pvtl-appsmanager-org-space-apps-crm-app-settings.png b/spring-geode-docs/src/docs/asciidoc/guides/images/pvtl-appsmanager-org-space-apps-crm-app-settings.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/pvtl-appsmanager-org-space-apps-crm-app-settings.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/pvtl-appsmanager-org-space-apps-crm-app-settings.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/pvtl-appsmanager-org-space-apps-crm-app-start.png b/spring-geode-docs/src/docs/asciidoc/guides/images/pvtl-appsmanager-org-space-apps-crm-app-start.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/pvtl-appsmanager-org-space-apps-crm-app-start.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/pvtl-appsmanager-org-space-apps-crm-app-start.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/pvtl-appsmanager-org-space-apps.png b/spring-geode-docs/src/docs/asciidoc/guides/images/pvtl-appsmanager-org-space-apps.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/pvtl-appsmanager-org-space-apps.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/pvtl-appsmanager-org-space-apps.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/server-actuator-health-cacheserver-endpoint.png b/spring-geode-docs/src/docs/asciidoc/guides/images/server-actuator-health-cacheserver-endpoint.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/server-actuator-health-cacheserver-endpoint.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/server-actuator-health-cacheserver-endpoint.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/server-actuator-health-endpoints.png b/spring-geode-docs/src/docs/asciidoc/guides/images/server-actuator-health-endpoints.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/server-actuator-health-endpoints.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/server-actuator-health-endpoints.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/server-actuator-health-indexes-endpoint.png b/spring-geode-docs/src/docs/asciidoc/guides/images/server-actuator-health-indexes-endpoint.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/server-actuator-health-indexes-endpoint.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/server-actuator-health-indexes-endpoint.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/server-actuator-health-region-endpoint.png b/spring-geode-docs/src/docs/asciidoc/guides/images/server-actuator-health-region-endpoint.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/server-actuator-health-region-endpoint.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/server-actuator-health-region-endpoint.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/spring-initializer-explore-project-screenshot.png b/spring-geode-docs/src/docs/asciidoc/guides/images/spring-initializer-explore-project-screenshot.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/spring-initializer-explore-project-screenshot.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/spring-initializer-explore-project-screenshot.png
diff --git a/spring-geode-docs/src/docs/asciidoc/images/spring-initializer-screenshot.png b/spring-geode-docs/src/docs/asciidoc/guides/images/spring-initializer-screenshot.png
similarity index 100%
rename from spring-geode-docs/src/docs/asciidoc/images/spring-initializer-screenshot.png
rename to spring-geode-docs/src/docs/asciidoc/guides/images/spring-initializer-screenshot.png