From f1cb59f812f905c69ddd4c5a9be9c80ee42420be Mon Sep 17 00:00:00 2001
From: alexmond <alexmond@gmail.com>
Date: Sat, 27 Sep 2025 22:23:41 -0400
Subject: [PATCH] Restructured multiple modules: introduced
 `spring-boot-ai-samples` and `spring-boot-config-server`, updated package
 names across modules for consistency, adjusted Java version to `17` in all
 `pom.xml` files, added missing licenses and developer info, and enhanced
 configurations with additional profiles and dependencies.

---
 .github/workflows/maven.yml                   |   4 +-
 .../SpringBootOpenapiApplication.xml          |   2 +-
 TODO                                          |   7 +-
 docs/antora.yml                               |   6 +
 docs/modules/ROOT/nav.adoc                    |   1 +
 docs/modules/ROOT/pages/index.adoc            | 187 +++++++++++
 docs/modules/ROOT/partials/_hconfigprops.adoc |  18 +
 docs/modules/ROOT/partials/_sconfigprops.adoc |  28 ++
 pom.xml                                       |  19 +-
 .../openapi/src/main/AndroidManifest.xml      |   2 +-
 spring-boot-admin-server/pom.xml              |  76 +++++
 .../cloud/HttpExchangeConfiguration.java      |  16 +
 .../SimpleBootAdminSampleApplication.java     |  15 +
 .../src/main/resources/application.yaml       |  44 +++
 spring-boot-ai-samples/pom.xml                |  32 ++
 .../spring-boot-ai-sample/pom.xml             | 111 +++++++
 .../alexmond/ai/SpringBootAiApplication.java  |  12 +
 .../java/org/alexmond/ai/config/AiConfig.java |  14 +
 .../org/alexmond/ai/config/DataLoader.java    |  41 +++
 .../ai/controller/ChatController.java         |  67 ++++
 .../java/org/alexmond/ai/dto/ChatRequest.java |  13 +
 .../org/alexmond/ai/dto/ChatResponse.java     |  16 +
 .../org/alexmond/ai/entity/ChatMessage.java   |  39 +++
 .../ai/repository/ChatMessageRepository.java  |  15 +
 .../alexmond/ai/service/AiChatService.java    |  86 +++++
 .../src/main/resources/application.yaml       |  43 +++
 .../src/main/resources/templates/chat.html    | 308 ++++++++++++++++++
 spring-boot-config-sample/pom.xml             |   3 +-
 .../SpringBootConfigSampleApplication.java    |   2 +-
 .../config/{ => config}/ConfigSample.java     |   7 +-
 .../{ => config}/ConfigSampleNested.java      |   2 +-
 .../controller/ConfigPrintRest.java           |   4 +-
 ...impleBootConfigSampleApplicationTests.java |   2 +-
 .../local-config/application.yaml             |  14 +
 .../local-config/bootstrap.yaml               |   2 +
 .../local-config/config-repo/application.yaml |  45 +++
 .../config-repo/default-spring-service.yaml   |  27 ++
 .../config-repo/default-spring-service2.yaml  |  35 ++
 .../config-repo/spring-boot-admin-server.yaml |   0
 .../config-repo/spring-boot-gateway.yaml      |   0
 .../local-config/gateway.yaml                 |  77 +++++
 spring-boot-config-server/pom.xml             |  51 +++
 .../cloud/HttpExchangeConfiguration.java      |  16 +
 .../SpringBootConfigServerApplication.java    |  15 +
 .../src/main/resources/application.yaml       |  39 +++
 spring-boot-data-jpa-flyway/.gitattributes    |   2 -
 spring-boot-data-jpa-flyway/.gitignore        |  33 --
 spring-boot-data-jpa-flyway/pom.xml           |  26 +-
 .../SimpleBootRestSampleApplicationTests.java |   2 +
 spring-boot-openapi-root/pom.xml              |  15 +-
 .../spring-boot-openapi-client/pom.xml        |   2 +-
 .../spring-boot-openapi/pom.xml               |  13 +-
 .../openapi}/HelloWorldRest.java              |   2 +-
 .../SpringBootOpenapiApplication.java         |   2 +-
 .../auth/controller/UserController.java       |   6 +-
 .../sample/{ => openapi}/auth/model/User.java |   4 +-
 .../repository/UserRepository.java            |   4 +-
 .../SimpleBootRestSampleApplicationTests.java |   2 +-
 spring-boot-rest-sample/pom.xml               |  27 +-
 .../rest}/HelloWorldRest.java                 |   2 +-
 .../SimpleBootRestSampleApplication.java      |   2 +-
 .../SimpleBootRestSampleApplicationTests.java |   2 +-
 spring-boot-security-root/pom.xml             |  16 +-
 .../simple-boot-auth-client/pom.xml           |   3 +-
 .../spring-boot-custom-auth-server/pom.xml    |   2 +-
 spring-boot-thymeleaf/pom.xml                 |  15 +-
 .../spring-boot-thymeleaf-layout/pom.xml      |   2 +-
 .../thymeleaf/layout}/MainController.java     |   8 +-
 ...gBootThymeleafLayoutSampleApplication.java |   2 +-
 .../SimpleBootRestSampleApplicationTests.java |  12 +
 .../spring-boot-thymeleaf-sample/pom.xml      |   2 +-
 .../SpringBootThymeleafSampleApplication.java |   2 +-
 .../auth/controller/FormController.java       |   2 +-
 .../auth/controller/HomeController.java       |   2 +-
 .../auth/controller/ProductController.java    |   6 +-
 .../auth/controller/UserController.java       |   8 +-
 .../{ => thymeleaf}/auth/model/Address.java   |   2 +-
 .../{ => thymeleaf}/auth/model/Product.java   |   2 +-
 .../{ => thymeleaf}/auth/model/User.java      |   2 +-
 .../{ => thymeleaf}/auth/model/UserRole.java  |   2 +-
 .../auth/service/ProductService.java          |   4 +-
 .../auth/service/UserService.java             |   8 +-
 82 files changed, 1685 insertions(+), 126 deletions(-)
 create mode 100644 docs/antora.yml
 create mode 100644 docs/modules/ROOT/nav.adoc
 create mode 100644 docs/modules/ROOT/pages/index.adoc
 create mode 100644 docs/modules/ROOT/partials/_hconfigprops.adoc
 create mode 100644 docs/modules/ROOT/partials/_sconfigprops.adoc
 create mode 100644 spring-boot-admin-server/pom.xml
 create mode 100644 spring-boot-admin-server/src/main/java/org/alexmond/sample/cloud/HttpExchangeConfiguration.java
 create mode 100644 spring-boot-admin-server/src/main/java/org/alexmond/sample/cloud/SimpleBootAdminSampleApplication.java
 create mode 100644 spring-boot-admin-server/src/main/resources/application.yaml
 create mode 100644 spring-boot-ai-samples/pom.xml
 create mode 100644 spring-boot-ai-samples/spring-boot-ai-sample/pom.xml
 create mode 100644 spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/SpringBootAiApplication.java
 create mode 100644 spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/config/AiConfig.java
 create mode 100644 spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/config/DataLoader.java
 create mode 100644 spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/controller/ChatController.java
 create mode 100644 spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/dto/ChatRequest.java
 create mode 100644 spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/dto/ChatResponse.java
 create mode 100644 spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/entity/ChatMessage.java
 create mode 100644 spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/repository/ChatMessageRepository.java
 create mode 100644 spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/service/AiChatService.java
 create mode 100644 spring-boot-ai-samples/spring-boot-ai-sample/src/main/resources/application.yaml
 create mode 100644 spring-boot-ai-samples/spring-boot-ai-sample/src/main/resources/templates/chat.html
 rename spring-boot-config-sample/src/main/java/org/alexmond/sample/{ => config}/SpringBootConfigSampleApplication.java (90%)
 rename spring-boot-config-sample/src/main/java/org/alexmond/sample/config/{ => config}/ConfigSample.java (89%)
 rename spring-boot-config-sample/src/main/java/org/alexmond/sample/config/{ => config}/ConfigSampleNested.java (76%)
 rename spring-boot-config-sample/src/main/java/org/alexmond/sample/{ => config}/controller/ConfigPrintRest.java (78%)
 rename spring-boot-config-sample/src/test/java/org/alexmond/sample/{ => config}/SimpleBootConfigSampleApplicationTests.java (85%)
 create mode 100644 spring-boot-config-server/local-config/application.yaml
 create mode 100644 spring-boot-config-server/local-config/bootstrap.yaml
 create mode 100644 spring-boot-config-server/local-config/config-repo/application.yaml
 create mode 100644 spring-boot-config-server/local-config/config-repo/default-spring-service.yaml
 create mode 100644 spring-boot-config-server/local-config/config-repo/default-spring-service2.yaml
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/test/java/org/alexmond/simplebootconfigsample/SpringBootThymeleafLayoutSampleApplicationTests.java => spring-boot-config-server/local-config/config-repo/spring-boot-admin-server.yaml (100%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/test/java/org/alexmond/simplebootconfigsample/SpringBootThymeleafLayoutSampleApplicationTests.java => spring-boot-config-server/local-config/config-repo/spring-boot-gateway.yaml (100%)
 create mode 100644 spring-boot-config-server/local-config/gateway.yaml
 create mode 100644 spring-boot-config-server/pom.xml
 create mode 100644 spring-boot-config-server/src/main/java/org/alexmond/sample/cloud/HttpExchangeConfiguration.java
 create mode 100644 spring-boot-config-server/src/main/java/org/alexmond/sample/cloud/SpringBootConfigServerApplication.java
 create mode 100644 spring-boot-config-server/src/main/resources/application.yaml
 delete mode 100644 spring-boot-data-jpa-flyway/.gitattributes
 delete mode 100644 spring-boot-data-jpa-flyway/.gitignore
 rename spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/{simplebootconfigsample => sample/openapi}/HelloWorldRest.java (85%)
 rename spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/{simplebootconfigsample => sample/openapi}/SpringBootOpenapiApplication.java (87%)
 rename spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/{ => openapi}/auth/controller/UserController.java (94%)
 rename spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/{ => openapi}/auth/model/User.java (95%)
 rename spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/{jpa => openapi}/repository/UserRepository.java (88%)
 rename spring-boot-openapi-root/spring-boot-openapi/src/test/java/org/alexmond/{simplebootconfigsample => sample/openapi}/SimpleBootRestSampleApplicationTests.java (96%)
 rename spring-boot-rest-sample/src/main/java/org/alexmond/{simplebootconfigsample => sample/rest}/HelloWorldRest.java (85%)
 rename spring-boot-rest-sample/src/main/java/org/alexmond/{simplebootconfigsample => sample/rest}/SimpleBootRestSampleApplication.java (87%)
 rename spring-boot-rest-sample/src/test/java/org/alexmond/{simplebootconfigsample => sample/rest}/SimpleBootRestSampleApplicationTests.java (82%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/{simplebootconfigsample => sample/thymeleaf/layout}/MainController.java (93%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/{simplebootconfigsample => sample/thymeleaf/layout}/SpringBootThymeleafLayoutSampleApplication.java (88%)
 create mode 100644 spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/test/java/org/alexmond/sample/thymeleaf/layout/SimpleBootRestSampleApplicationTests.java
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/{simplebootconfigsample => sample/thymeleaf}/SpringBootThymeleafSampleApplication.java (88%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/{ => thymeleaf}/auth/controller/FormController.java (96%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/{ => thymeleaf}/auth/controller/HomeController.java (88%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/{ => thymeleaf}/auth/controller/ProductController.java (88%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/{ => thymeleaf}/auth/controller/UserController.java (89%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/{ => thymeleaf}/auth/model/Address.java (85%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/{ => thymeleaf}/auth/model/Product.java (91%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/{ => thymeleaf}/auth/model/User.java (91%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/{ => thymeleaf}/auth/model/UserRole.java (86%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/{ => thymeleaf}/auth/service/ProductService.java (95%)
 rename spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/{ => thymeleaf}/auth/service/UserService.java (90%)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index c284cd5..eece949 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,10 +21,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 21
+    - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '21'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
diff --git a/.idea/runConfigurations/SpringBootOpenapiApplication.xml b/.idea/runConfigurations/SpringBootOpenapiApplication.xml
index 68ed81f..b83b031 100644
--- a/.idea/runConfigurations/SpringBootOpenapiApplication.xml
+++ b/.idea/runConfigurations/SpringBootOpenapiApplication.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="SpringBootOpenapiApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
     <module name="spring-boot-openapi" />
-    <option name="SPRING_BOOT_MAIN_CLASS" value="org.alexmond.simplebootconfigsample.SpringBootOpenapiApplication" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="org.alexmond.sample.openapi.SpringBootOpenapiApplication" />
     <extension name="software.aws.toolkits.jetbrains.core.execution.JavaAwsConnectionExtension">
       <option name="credential" />
       <option name="region" />
diff --git a/TODO b/TODO
index 7170266..8241449 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,8 @@
 Spring batch samples
 k8s samples
-start multiple boot processes (supervisord rewrite in spring boot )
-actuator sanitanization library
-HTML/ASCII doc/yaml schema generator
+HTML/ASCII doc generator
 Multiple datasources sample
 rabbitmq sample
 redis sample
 config server static file download
-http/tcp configurable health check
 k8s scaling sample
-web page
-decide one domain
diff --git a/docs/antora.yml b/docs/antora.yml
new file mode 100644
index 0000000..fbc6f36
--- /dev/null
+++ b/docs/antora.yml
@@ -0,0 +1,6 @@
+name: extensions
+title: Actuator extensions
+version: 1.0.0
+nav:
+- modules/ROOT/nav.adoc
+
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..2b930f6
--- /dev/null
+++ b/docs/modules/ROOT/nav.adoc
@@ -0,0 +1 @@
+* xref:index.adoc[Spring boot examples]
diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc
new file mode 100644
index 0000000..63ff0ee
--- /dev/null
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -0,0 +1,187 @@
+= Spring Boot Playground Modules
+:toc: left
+:sectnums:
+
+This project is a multi-module Spring Boot playground showcasing REST APIs, configuration, security, OpenAPI, JPA + Flyway, Thymeleaf MVC, Admin monitoring, and AI integrations.
+
+== Module Map
+
+- spring-boot-rest-sample — REST API basics
+- spring-boot-config-sample — Externalized configuration patterns
+- spring-boot-admin-server — Admin UI for monitoring apps
+- spring-boot-config-server — Centralized configuration service
+- spring-boot-data-jpa-flyway — Persistence + migrations
+- spring-boot-openapi-root — Parent for OpenAPI samples
+- spring-boot-thymeleaf — Server-side MVC with Thymeleaf
+- spring-boot-security-root — Parent for security samples
+- spring-boot-security-basic — Basic auth demo
+- spring-boot-security-jwt — JWT-based security demo
+- spring-boot-ai-samples — Spring AI integrations
+- openapi-sample (under spring-boot-openapi-root) — Concrete OpenAPI demo
+
+== spring-boot-rest-sample
+
+A reference REST service demonstrating:
+- CRUD endpoints with JSON payloads
+- Bean validation and error handling
+- Controller advice for exceptions
+- Meaningful HTTP status codes
+
+How to run:
+- mvn spring-boot:run
+- Explore endpoints under /api
+
+Learning goals:
+- Build clean REST controllers
+- Structure DTOs/validation
+- Centralize error responses
+
+== spring-boot-config-sample
+
+Externalized configuration patterns:
+- application.yaml + profiles
+- @ConfigurationProperties with validation
+- Metadata via configuration processor
+
+How to run:
+- Use -Dspring.profiles.active=dev|prod to switch environments
+
+Learning goals:
+- Safe, typed configuration binding
+- Profile-specific settings
+- Documenting configuration
+
+== spring-boot-admin-server
+
+Admin console to monitor Spring Boot apps:
+- Health, metrics, environment, logs
+- JVM info and endpoints overview
+
+How to run:
+- Start this server, then register client apps with admin client starter
+
+Learning goals:
+- Observability with minimal setup
+- Operational visibility for teams
+
+== spring-boot-config-server
+
+Centralized configuration with Spring Cloud Config:
+- Git-backed properties
+- Environment-specific files
+- Encryption/decryption support
+
+How to run:
+- Point spring.cloud.config.server.git.uri to a repo
+- Clients fetch configuration at bootstrap
+
+Learning goals:
+- Central config management
+- Safe secret handling and refresh
+
+== spring-boot-data-jpa-flyway
+
+Persistence + migrations:
+- Spring Data JPA repositories
+- Transactions and entity mapping
+- Flyway versioned migrations
+
+How to run:
+- mvn spring-boot:run (Flyway runs at startup)
+
+Learning goals:
+- Reliable schema evolution
+- Clean repository design
+- Testing data layers
+
+== spring-boot-openapi-root
+
+Parent for OpenAPI samples providing:
+- Dependency and plugin alignment
+- Shared conventions for documentation
+
+Learning goals:
+- Organizing API documentation across modules
+
+=== openapi-sample
+
+Concrete OpenAPI demo:
+- springdoc-openapi integration
+- Swagger UI
+- Schemas and validation annotations
+
+How to run:
+- mvn spring-boot:run
+- Visit /swagger-ui.html
+
+Learning goals:
+- API-first documentation
+- Accurate schemas and examples
+
+== spring-boot-thymeleaf
+
+Server-side MVC with Thymeleaf:
+- Templates, fragments, and layouts
+- Form binding and validation
+- I18n support
+
+How to run:
+- mvn spring-boot:run
+- Visit web UI routes
+
+Learning goals:
+- Productive SSR development
+- Clean template composition
+
+== spring-boot-security-root
+
+Parent for security samples:
+- Baseline dependencies
+- Shared configuration practices
+
+Learning goals:
+- Consistent security setup across modules
+
+=== spring-boot-security-basic
+
+Basic authentication:
+- In-memory users/roles
+- Form login and protected routes
+
+How to run:
+- mvn spring-boot:run
+- Access a protected endpoint to see login flow
+
+Learning goals:
+- Security filter chain basics
+- Method and URL-based authorization
+
+=== spring-boot-security-jwt
+
+JWT-based security:
+- Token issuance/validation
+- Stateless sessions
+- Role-based access
+
+How to run:
+- Obtain token via auth endpoint
+- Call protected APIs with Authorization: Bearer <token>
+
+Learning goals:
+- API security at scale
+- Token lifecycle and best practices
+
+== spring-boot-ai-samples
+
+AI integrations with Spring AI:
+- Chat/completions flows
+- Prompt engineering patterns
+- Retry and observability
+
+How to run:
+- Configure AI provider credentials via env/properties
+- mvn spring-boot:run
+
+Learning goals:
+- Safely integrate AI services
+- Reusable abstractions for AI features
diff --git a/docs/modules/ROOT/partials/_hconfigprops.adoc b/docs/modules/ROOT/partials/_hconfigprops.adoc
new file mode 100644
index 0000000..4dfff44
--- /dev/null
+++ b/docs/modules/ROOT/partials/_hconfigprops.adoc
@@ -0,0 +1,18 @@
+.Configuration Properties
+|===
+|Name |Default Value |Description
+
+|management.health.actuator.sites
+|{}
+|Map of site configurations where key is site identifier and value contains site-specific settings for actuator health checks.
+
+|management.health.http.sites
+|{}
+|Map of site configurations where key is site identifier and value contains site-specific settings for HTTP health checks.
+
+|management.health.port.sites
+|{}
+|Map of site configurations where key is site identifier and value contains port availability check settings.
+
+|===
+
diff --git a/docs/modules/ROOT/partials/_sconfigprops.adoc b/docs/modules/ROOT/partials/_sconfigprops.adoc
new file mode 100644
index 0000000..841ee9b
--- /dev/null
+++ b/docs/modules/ROOT/partials/_sconfigprops.adoc
@@ -0,0 +1,28 @@
+.Configuration Properties
+|===
+|Name |Default Value |Description
+
+|management.endpoint.sanitizing.enabled
+|`true`
+|Whether to enable custom sanitization (if false, uses Spring Boot defaults).
+
+|management.endpoint.sanitizing.key-patterns
+|`[".*password.*", ".*secret.*", ".*token.*", ".*key.*", ".*credential.*"]`
+|List of regex patterns to match property keys for sanitization.
+
+|management.endpoint.sanitizing.keys
+|`["password", "secret", "token", "key", "credential", "private"]`
+|List of exact property keys to sanitize (case-insensitive).
+
+|management.endpoint.sanitizing.mask-value
+|`\******`
+|The masked value to show instead of the actual value.
+
+|management.endpoint.sanitizing.sanitize-values
+|`true`
+|Whether to sanitize values.
+
+|management.endpoint.sanitizing.value-patterns
+|`["^[A-Za-z0-9+/=]{20,}$", "^[A-Fa-f0-9]{32,}$", "^Bearer .*", "^Basic .*"]`
+|List of regex patterns to match values for sanitization. Includes patterns for Base64-encoded strings (20+ chars), hex-encoded hashes/keys (32+ chars), and common Authorization headers (Bearer, Basic).
+|===
diff --git a/pom.xml b/pom.xml
index 519bf0b..99ed2ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,18 +10,33 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.3</version>
+        <version>3.5.6</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <properties>
-        <spring-boot-admin.version>3.2.3</spring-boot-admin.version>
+        <spring-boot-admin.version>3.5.5</spring-boot-admin.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
     </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <modules>
         <module>spring-boot-rest-sample</module>
         <module>spring-boot-config-sample</module>
+        <module>spring-boot-admin-server</module>
+        <module>spring-boot-config-server</module>
         <module>spring-boot-data-jpa-flyway</module>
         <module>spring-boot-openapi-root</module>
         <module>spring-boot-thymeleaf</module>
         <module>spring-boot-security-root</module>
+        <module>spring-boot-ai-samples</module>
     </modules>
 </project>
diff --git a/refrenece/openapi/src/main/AndroidManifest.xml b/refrenece/openapi/src/main/AndroidManifest.xml
index 54fbcb3..5b70191 100644
--- a/refrenece/openapi/src/main/AndroidManifest.xml
+++ b/refrenece/openapi/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
-<manifest package="org.openapitools.client" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest package="org.openapitools.client">
     <application />
 </manifest>
diff --git a/spring-boot-admin-server/pom.xml b/spring-boot-admin-server/pom.xml
new file mode 100644
index 0000000..e83db47
--- /dev/null
+++ b/spring-boot-admin-server/pom.xml
@@ -0,0 +1,76 @@
+<?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>
+    <parent>
+        <groupId>org.alexmond</groupId>
+        <artifactId>boot-sample-root</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <artifactId>spring-boot-admin-server</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>Spring Boot Admin Server</name>
+    <description>Admin UI for monitoring Spring Boot apps: health, metrics, logs, environment, and JVM details. Useful for local demos and production-ready observability patterns.</description>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Alex Mondshain</name>
+            <email>alex.mondshain@gmail.com</email>
+        </developer>
+    </developers>
+    <properties>
+        <java.version>17</java.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-server</artifactId>
+            <version>${spring-boot-admin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring-boot-admin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/spring-boot-admin-server/src/main/java/org/alexmond/sample/cloud/HttpExchangeConfiguration.java b/spring-boot-admin-server/src/main/java/org/alexmond/sample/cloud/HttpExchangeConfiguration.java
new file mode 100644
index 0000000..c1255f4
--- /dev/null
+++ b/spring-boot-admin-server/src/main/java/org/alexmond/sample/cloud/HttpExchangeConfiguration.java
@@ -0,0 +1,16 @@
+package org.alexmond.sample.cloud;
+
+import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class HttpExchangeConfiguration {
+
+    @Bean
+    public InMemoryHttpExchangeRepository createTraceRepository() {
+        InMemoryHttpExchangeRepository inMemoryHttpExchangeRepository = new InMemoryHttpExchangeRepository();
+        inMemoryHttpExchangeRepository.setCapacity(200);
+        return  inMemoryHttpExchangeRepository;
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-admin-server/src/main/java/org/alexmond/sample/cloud/SimpleBootAdminSampleApplication.java b/spring-boot-admin-server/src/main/java/org/alexmond/sample/cloud/SimpleBootAdminSampleApplication.java
new file mode 100644
index 0000000..c0352e7
--- /dev/null
+++ b/spring-boot-admin-server/src/main/java/org/alexmond/sample/cloud/SimpleBootAdminSampleApplication.java
@@ -0,0 +1,15 @@
+package org.alexmond.sample.cloud;
+
+import de.codecentric.boot.admin.server.config.EnableAdminServer;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+@EnableAdminServer
+public class SimpleBootAdminSampleApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SimpleBootAdminSampleApplication.class, args);
+    }
+
+}
diff --git a/spring-boot-admin-server/src/main/resources/application.yaml b/spring-boot-admin-server/src/main/resources/application.yaml
new file mode 100644
index 0000000..d370ca8
--- /dev/null
+++ b/spring-boot-admin-server/src/main/resources/application.yaml
@@ -0,0 +1,44 @@
+server:
+  port: 8090
+
+spring:
+  application:
+    name: spring-boot-admin-server
+  boot.admin.client.url: http://localhost:8090
+
+management:
+  httpexchanges:
+    recording:
+      enabled: true
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+    jmx:
+      exposure:
+        include: "*"
+  info:
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+  endpoint:
+    health:
+      show-details: always
+    env:
+      show-values: always
+    configprops:
+      show-values: always
+    httpexchanges:
+      access: unrestricted
+      cache:
+        time-to-live: 100000
+
+info:
+  tags:
+    environment: OPS
+
diff --git a/spring-boot-ai-samples/pom.xml b/spring-boot-ai-samples/pom.xml
new file mode 100644
index 0000000..f9b0463
--- /dev/null
+++ b/spring-boot-ai-samples/pom.xml
@@ -0,0 +1,32 @@
+<?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>
+    <parent>
+        <groupId>org.alexmond</groupId>
+        <artifactId>boot-sample-root</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>spring-boot-ai-samples</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-boot-ai-root</name>
+    <packaging>pom</packaging>
+    <description>Examples integrating Spring AI/OpenAI with Spring Boot: chat workflows, prompt engineering, retries, and configuration for AI-backed features.</description>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Alex Mondshain</name>
+            <email>alex.mondshain@gmail.com</email>
+        </developer>
+    </developers>
+<modules>
+    <module>spring-boot-ai-sample</module>
+</modules>
+</project>
diff --git a/spring-boot-ai-samples/spring-boot-ai-sample/pom.xml b/spring-boot-ai-samples/spring-boot-ai-sample/pom.xml
new file mode 100644
index 0000000..0719221
--- /dev/null
+++ b/spring-boot-ai-samples/spring-boot-ai-sample/pom.xml
@@ -0,0 +1,111 @@
+<?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>
+    
+    <parent>
+        <groupId>org.alexmond</groupId>
+        <artifactId>spring-boot-ai-samples</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>spring-boot-ai-sample</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>spring-boot-ai-samples</name>
+    <description>Spring Boot AI Application with Web Interface</description>
+    
+    <properties>
+        <java.version>17</java.version>
+        <spring-ai.version>1.0.0-M3</spring-ai.version>
+    </properties>
+    
+    <dependencies>
+        <!-- Spring Boot Starters -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        
+        <!-- Spring AI -->
+        <dependency>
+            <groupId>org.springframework.ai</groupId>
+            <artifactId>spring-ai-openai-spring-boot-starter</artifactId>
+        </dependency>
+        
+        <!-- Database -->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <!-- Lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.ai</groupId>
+                <artifactId>spring-ai-bom</artifactId>
+                <version>${spring-ai.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <repositories>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+</project>
diff --git a/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/SpringBootAiApplication.java b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/SpringBootAiApplication.java
new file mode 100644
index 0000000..8bfe164
--- /dev/null
+++ b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/SpringBootAiApplication.java
@@ -0,0 +1,12 @@
+package org.alexmond.ai;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringBootAiApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootAiApplication.class, args);
+    }
+}
diff --git a/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/config/AiConfig.java b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/config/AiConfig.java
new file mode 100644
index 0000000..a2f8cf3
--- /dev/null
+++ b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/config/AiConfig.java
@@ -0,0 +1,14 @@
+package org.alexmond.ai.config;
+
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AiConfig {
+
+    @Bean
+    public ChatClient chatClient(ChatClient.Builder builder) {
+        return builder.build();
+    }
+}
diff --git a/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/config/DataLoader.java b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/config/DataLoader.java
new file mode 100644
index 0000000..20b00be
--- /dev/null
+++ b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/config/DataLoader.java
@@ -0,0 +1,41 @@
+package org.alexmond.ai.config;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.alexmond.ai.entity.ChatMessage;
+import org.alexmond.ai.repository.ChatMessageRepository;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class DataLoader implements CommandLineRunner {
+
+    private final ChatMessageRepository chatMessageRepository;
+
+    @Override
+    public void run(String... args) throws Exception {
+        if (chatMessageRepository.count() == 0) {
+            log.info("Loading sample data...");
+            
+            // Add some sample chat messages
+            ChatMessage sample1 = new ChatMessage(
+                "Hello, how are you?",
+                "Hello! I'm doing great, thank you for asking. How can I help you today?",
+                "sample-session-1"
+            );
+            
+            ChatMessage sample2 = new ChatMessage(
+                "What can you do?",
+                "I'm an AI assistant that can help you with various tasks like answering questions, providing information, helping with analysis, and having conversations. What would you like to know?",
+                "sample-session-2"
+            );
+            
+            chatMessageRepository.save(sample1);
+            chatMessageRepository.save(sample2);
+            
+            log.info("Sample data loaded successfully");
+        }
+    }
+}
diff --git a/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/controller/ChatController.java b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/controller/ChatController.java
new file mode 100644
index 0000000..29640b7
--- /dev/null
+++ b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/controller/ChatController.java
@@ -0,0 +1,67 @@
+package org.alexmond.ai.controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.alexmond.ai.dto.ChatRequest;
+import org.alexmond.ai.dto.ChatResponse;
+import org.alexmond.ai.service.AiChatService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Controller
+@RequiredArgsConstructor
+@Slf4j
+@Validated
+public class ChatController {
+
+    private final AiChatService aiChatService;
+
+    @GetMapping("/")
+    public String index(Model model) {
+        model.addAttribute("chatRequest", new ChatRequest());
+        return "chat";
+    }
+
+    @PostMapping("/api/chat")
+    @ResponseBody
+    public ResponseEntity<ChatResponse> sendMessage(@Valid @RequestBody ChatRequest request) {
+        try {
+            log.info("Received chat request: {}", request.getMessage());
+            ChatResponse response = aiChatService.sendMessage(request);
+            return ResponseEntity.ok(response);
+        } catch (Exception e) {
+            log.error("Error processing chat request", e);
+            return ResponseEntity.internalServerError().build();
+        }
+    }
+
+    @GetMapping("/api/chat/history/{sessionId}")
+    @ResponseBody
+    public ResponseEntity<List<ChatResponse>> getChatHistory(@PathVariable String sessionId) {
+        try {
+            List<ChatResponse> history = aiChatService.getChatHistory(sessionId);
+            return ResponseEntity.ok(history);
+        } catch (Exception e) {
+            log.error("Error retrieving chat history", e);
+            return ResponseEntity.internalServerError().build();
+        }
+    }
+
+    @GetMapping("/api/chat/recent")
+    @ResponseBody
+    public ResponseEntity<List<ChatResponse>> getRecentChats() {
+        try {
+            List<ChatResponse> recentChats = aiChatService.getRecentChats();
+            return ResponseEntity.ok(recentChats);
+        } catch (Exception e) {
+            log.error("Error retrieving recent chats", e);
+            return ResponseEntity.internalServerError().build();
+        }
+    }
+}
diff --git a/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/dto/ChatRequest.java b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/dto/ChatRequest.java
new file mode 100644
index 0000000..2b4eb11
--- /dev/null
+++ b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/dto/ChatRequest.java
@@ -0,0 +1,13 @@
+package org.alexmond.ai.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+public class ChatRequest {
+    
+    @NotBlank(message = "Message cannot be empty")
+    private String message;
+    
+    private String sessionId;
+}
diff --git a/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/dto/ChatResponse.java b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/dto/ChatResponse.java
new file mode 100644
index 0000000..243139b
--- /dev/null
+++ b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/dto/ChatResponse.java
@@ -0,0 +1,16 @@
+package org.alexmond.ai.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+public class ChatResponse {
+    
+    private String userMessage;
+    private String aiResponse;
+    private LocalDateTime timestamp;
+    private String sessionId;
+}
diff --git a/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/entity/ChatMessage.java b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/entity/ChatMessage.java
new file mode 100644
index 0000000..b404c29
--- /dev/null
+++ b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/entity/ChatMessage.java
@@ -0,0 +1,39 @@
+package org.alexmond.ai.entity;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "chat_messages")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChatMessage {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false, length = 4000)
+    private String userMessage;
+
+    @Column(nullable = false, length = 4000)
+    private String aiResponse;
+
+    @Column(nullable = false)
+    private LocalDateTime timestamp;
+
+    @Column(name = "session_id")
+    private String sessionId;
+
+    public ChatMessage(String userMessage, String aiResponse, String sessionId) {
+        this.userMessage = userMessage;
+        this.aiResponse = aiResponse;
+        this.sessionId = sessionId;
+        this.timestamp = LocalDateTime.now();
+    }
+}
diff --git a/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/repository/ChatMessageRepository.java b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/repository/ChatMessageRepository.java
new file mode 100644
index 0000000..e51931b
--- /dev/null
+++ b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/repository/ChatMessageRepository.java
@@ -0,0 +1,15 @@
+package org.alexmond.ai.repository;
+
+import org.alexmond.ai.entity.ChatMessage;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ChatMessageRepository extends JpaRepository<ChatMessage, Long> {
+    
+    List<ChatMessage> findBySessionIdOrderByTimestampAsc(String sessionId);
+    
+    List<ChatMessage> findTop10ByOrderByTimestampDesc();
+}
diff --git a/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/service/AiChatService.java b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/service/AiChatService.java
new file mode 100644
index 0000000..0b07985
--- /dev/null
+++ b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/java/org/alexmond/ai/service/AiChatService.java
@@ -0,0 +1,86 @@
+package org.alexmond.ai.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.alexmond.ai.dto.ChatRequest;
+import org.alexmond.ai.dto.ChatResponse;
+import org.alexmond.ai.entity.ChatMessage;
+import org.alexmond.ai.repository.ChatMessageRepository;
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class AiChatService {
+
+    private final ChatClient chatClient;
+    private final ChatMessageRepository chatMessageRepository;
+
+    public ChatResponse sendMessage(ChatRequest request) {
+        try {
+            // Generate session ID if not provided
+            String sessionId = request.getSessionId();
+            if (sessionId == null || sessionId.isEmpty()) {
+                sessionId = UUID.randomUUID().toString();
+            }
+
+            log.info("Processing chat message for session: {}", sessionId);
+
+            // Get AI response
+            String aiResponse = chatClient.prompt()
+                    .user(request.getMessage())
+                    .call()
+                    .content();
+
+            // Save conversation to database
+            ChatMessage chatMessage = new ChatMessage(
+                    request.getMessage(),
+                    aiResponse,
+                    sessionId
+            );
+            chatMessageRepository.save(chatMessage);
+
+            log.info("Chat message saved successfully");
+
+            return new ChatResponse(
+                    request.getMessage(),
+                    aiResponse,
+                    chatMessage.getTimestamp(),
+                    sessionId
+            );
+
+        } catch (Exception e) {
+            log.error("Error processing chat message", e);
+            throw new RuntimeException("Failed to process chat message", e);
+        }
+    }
+
+    public List<ChatResponse> getChatHistory(String sessionId) {
+        List<ChatMessage> messages = chatMessageRepository.findBySessionIdOrderByTimestampAsc(sessionId);
+        return messages.stream()
+                .map(msg -> new ChatResponse(
+                        msg.getUserMessage(),
+                        msg.getAiResponse(),
+                        msg.getTimestamp(),
+                        msg.getSessionId()
+                ))
+                .collect(Collectors.toList());
+    }
+
+    public List<ChatResponse> getRecentChats() {
+        List<ChatMessage> messages = chatMessageRepository.findTop10ByOrderByTimestampDesc();
+        return messages.stream()
+                .map(msg -> new ChatResponse(
+                        msg.getUserMessage(),
+                        msg.getAiResponse(),
+                        msg.getTimestamp(),
+                        msg.getSessionId()
+                ))
+                .collect(Collectors.toList());
+    }
+}
diff --git a/spring-boot-ai-samples/spring-boot-ai-sample/src/main/resources/application.yaml b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/resources/application.yaml
new file mode 100644
index 0000000..f9e18c3
--- /dev/null
+++ b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/resources/application.yaml
@@ -0,0 +1,43 @@
+
+spring:
+  application:
+    name: spring-boot-ai-samples
+  
+  # Database configuration
+  datasource:
+    url: jdbc:h2:mem:testdb
+    driverClassName: org.h2.Driver
+    username: sa
+    password: password
+
+  jpa:
+    database-platform: org.hibernate.dialect.H2Dialect
+    hibernate:
+      ddl-auto: create-drop
+    show-sql: true
+    
+  h2:
+    console:
+      enabled: true
+      path: /h2-console
+  
+  # AI Configuration (OpenAI)
+  ai:
+    openai:
+      chat:
+        options:
+          model: grok-4
+      base-url: https://api.x.ai/
+#      base-url: https://api.groq.com/openai
+
+# Server configuration
+server:
+  port: 8080
+
+# Logging
+logging:
+  level:
+    org.alexmond.ai: DEBUG
+    org.springframework.ai: DEBUG
+  pattern:
+    console: '%d{yyyy-MM-dd HH:mm:ss} - %msg%n'
diff --git a/spring-boot-ai-samples/spring-boot-ai-sample/src/main/resources/templates/chat.html b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/resources/templates/chat.html
new file mode 100644
index 0000000..cfaaf88
--- /dev/null
+++ b/spring-boot-ai-samples/spring-boot-ai-sample/src/main/resources/templates/chat.html
@@ -0,0 +1,308 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Spring Boot AI Chat</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css" rel="stylesheet">
+    <style>
+        .chat-container {
+            height: 500px;
+            overflow-y: auto;
+            border: 1px solid #dee2e6;
+            border-radius: 0.375rem;
+            background-color: #f8f9fa;
+        }
+        
+        .message {
+            margin-bottom: 1rem;
+            padding: 0.75rem;
+            border-radius: 0.5rem;
+        }
+        
+        .user-message {
+            background-color: #007bff;
+            color: white;
+            margin-left: 20%;
+            text-align: right;
+        }
+        
+        .ai-message {
+            background-color: white;
+            border: 1px solid #dee2e6;
+            margin-right: 20%;
+        }
+        
+        .typing-indicator {
+            display: none;
+            margin-right: 20%;
+        }
+        
+        .typing-indicator .message {
+            background-color: #e9ecef;
+            border: 1px solid #dee2e6;
+        }
+        
+        .session-info {
+            font-size: 0.875rem;
+            color: #6c757d;
+        }
+        
+        .recent-chats {
+            max-height: 300px;
+            overflow-y: auto;
+        }
+    </style>
+</head>
+<body>
+    <div class="container-fluid py-4">
+        <div class="row">
+            <div class="col-lg-8">
+                <div class="card">
+                    <div class="card-header bg-primary text-white">
+                        <h4 class="mb-0">
+                            <i class="bi bi-robot"></i> AI Chat Assistant
+                        </h4>
+                        <small id="sessionInfo" class="session-info">Session: Not started</small>
+                    </div>
+                    <div class="card-body">
+                        <!-- Chat Messages Container -->
+                        <div id="chatContainer" class="chat-container p-3 mb-3">
+                            <div class="text-center text-muted">
+                                <i class="bi bi-chat-dots fs-1"></i>
+                                <p>Start a conversation with the AI assistant!</p>
+                            </div>
+                        </div>
+                        
+                        <!-- Typing Indicator -->
+                        <div id="typingIndicator" class="typing-indicator">
+                            <div class="message">
+                                <div class="spinner-border spinner-border-sm me-2" role="status">
+                                    <span class="visually-hidden">Loading...</span>
+                                </div>
+                                AI is typing...
+                            </div>
+                        </div>
+                        
+                        <!-- Message Input Form -->
+                        <form id="chatForm">
+                            <div class="input-group">
+                                <input type="text" 
+                                       id="messageInput" 
+                                       class="form-control" 
+                                       placeholder="Type your message here..." 
+                                       required>
+                                <button type="submit" class="btn btn-primary">
+                                    <i class="bi bi-send"></i> Send
+                                </button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+            
+            <div class="col-lg-4">
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="mb-0">
+                            <i class="bi bi-clock-history"></i> Recent Chats
+                        </h5>
+                    </div>
+                    <div class="card-body">
+                        <div id="recentChats" class="recent-chats">
+                            <div class="text-center text-muted">
+                                <p>No recent chats</p>
+                            </div>
+                        </div>
+                        <button id="refreshRecent" class="btn btn-outline-secondary btn-sm w-100 mt-2">
+                            <i class="bi bi-arrow-clockwise"></i> Refresh
+                        </button>
+                    </div>
+                </div>
+                
+                <div class="card mt-3">
+                    <div class="card-header">
+                        <h5 class="mb-0">
+                            <i class="bi bi-gear"></i> Actions
+                        </h5>
+                    </div>
+                    <div class="card-body">
+                        <button id="newChatBtn" class="btn btn-success w-100 mb-2">
+                            <i class="bi bi-plus-circle"></i> New Chat
+                        </button>
+                        <button id="clearChatBtn" class="btn btn-warning w-100">
+                            <i class="bi bi-trash"></i> Clear Current Chat
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
+    <script>
+        class ChatApp {
+            constructor() {
+                this.sessionId = this.generateSessionId();
+                this.initializeElements();
+                this.bindEvents();
+                this.updateSessionInfo();
+                this.loadRecentChats();
+            }
+            
+            initializeElements() {
+                this.chatContainer = document.getElementById('chatContainer');
+                this.messageInput = document.getElementById('messageInput');
+                this.chatForm = document.getElementById('chatForm');
+                this.typingIndicator = document.getElementById('typingIndicator');
+                this.sessionInfo = document.getElementById('sessionInfo');
+                this.recentChats = document.getElementById('recentChats');
+                this.refreshRecentBtn = document.getElementById('refreshRecent');
+                this.newChatBtn = document.getElementById('newChatBtn');
+                this.clearChatBtn = document.getElementById('clearChatBtn');
+            }
+            
+            bindEvents() {
+                this.chatForm.addEventListener('submit', (e) => this.handleSubmit(e));
+                this.refreshRecentBtn.addEventListener('click', () => this.loadRecentChats());
+                this.newChatBtn.addEventListener('click', () => this.startNewChat());
+                this.clearChatBtn.addEventListener('click', () => this.clearCurrentChat());
+            }
+            
+            generateSessionId() {
+                return 'session_' + Math.random().toString(36).substr(2, 9) + '_' + Date.now();
+            }
+            
+            updateSessionInfo() {
+                this.sessionInfo.textContent = `Session: ${this.sessionId}`;
+            }
+            
+            async handleSubmit(e) {
+                e.preventDefault();
+                
+                const message = this.messageInput.value.trim();
+                if (!message) return;
+                
+                this.addMessage(message, 'user');
+                this.messageInput.value = '';
+                this.showTypingIndicator();
+                
+                try {
+                    const response = await fetch('/api/chat', {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json',
+                        },
+                        body: JSON.stringify({
+                            message: message,
+                            sessionId: this.sessionId
+                        })
+                    });
+                    
+                    if (response.ok) {
+                        const chatResponse = await response.json();
+                        this.hideTypingIndicator();
+                        this.addMessage(chatResponse.aiResponse, 'ai');
+                        this.loadRecentChats();
+                    } else {
+                        throw new Error('Failed to get response');
+                    }
+                } catch (error) {
+                    console.error('Error:', error);
+                    this.hideTypingIndicator();
+                    this.addMessage('Sorry, there was an error processing your request.', 'ai', true);
+                }
+            }
+            
+            addMessage(content, sender, isError = false) {
+                const messageDiv = document.createElement('div');
+                messageDiv.className = `message ${sender}-message`;
+                if (isError) {
+                    messageDiv.className += ' text-danger';
+                }
+                
+                if (this.chatContainer.querySelector('.text-center')) {
+                    this.chatContainer.innerHTML = '';
+                }
+                
+                messageDiv.innerHTML = `
+                    <div class="mb-1">${this.escapeHtml(content)}</div>
+                    <small class="opacity-75">${new Date().toLocaleTimeString()}</small>
+                `;
+                
+                this.chatContainer.appendChild(messageDiv);
+                this.chatContainer.scrollTop = this.chatContainer.scrollHeight;
+            }
+            
+            showTypingIndicator() {
+                this.typingIndicator.style.display = 'block';
+                this.chatContainer.scrollTop = this.chatContainer.scrollHeight;
+            }
+            
+            hideTypingIndicator() {
+                this.typingIndicator.style.display = 'none';
+            }
+            
+            async loadRecentChats() {
+                try {
+                    const response = await fetch('/api/chat/recent');
+                    if (response.ok) {
+                        const recentChats = await response.json();
+                        this.displayRecentChats(recentChats);
+                    }
+                } catch (error) {
+                    console.error('Error loading recent chats:', error);
+                }
+            }
+            
+            displayRecentChats(chats) {
+                if (chats.length === 0) {
+                    this.recentChats.innerHTML = '<div class="text-center text-muted"><p>No recent chats</p></div>';
+                    return;
+                }
+                
+                this.recentChats.innerHTML = chats.map(chat => `
+                    <div class="border-bottom pb-2 mb-2">
+                        <div class="fw-bold text-truncate" title="${this.escapeHtml(chat.userMessage)}">
+                            ${this.escapeHtml(chat.userMessage.substring(0, 50))}${chat.userMessage.length > 50 ? '...' : ''}
+                        </div>
+                        <div class="small text-muted text-truncate" title="${this.escapeHtml(chat.aiResponse)}">
+                            ${this.escapeHtml(chat.aiResponse.substring(0, 60))}${chat.aiResponse.length > 60 ? '...' : ''}
+                        </div>
+                        <div class="small text-muted">
+                            ${new Date(chat.timestamp).toLocaleString()}
+                        </div>
+                    </div>
+                `).join('');
+            }
+            
+            startNewChat() {
+                this.sessionId = this.generateSessionId();
+                this.updateSessionInfo();
+                this.clearCurrentChat();
+            }
+            
+            clearCurrentChat() {
+                this.chatContainer.innerHTML = `
+                    <div class="text-center text-muted">
+                        <i class="bi bi-chat-dots fs-1"></i>
+                        <p>Start a conversation with the AI assistant!</p>
+                    </div>
+                `;
+            }
+            
+            escapeHtml(text) {
+                const div = document.createElement('div');
+                div.textContent = text;
+                return div.innerHTML;
+            }
+        }
+        
+        // Initialize the chat app when the page loads
+        document.addEventListener('DOMContentLoaded', () => {
+            new ChatApp();
+        });
+    </script>
+</body>
+</html>
diff --git a/spring-boot-config-sample/pom.xml b/spring-boot-config-sample/pom.xml
index 86e92a8..de571aa 100644
--- a/spring-boot-config-sample/pom.xml
+++ b/spring-boot-config-sample/pom.xml
@@ -7,7 +7,6 @@
         <artifactId>boot-sample-root</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <groupId>org.alexmond</groupId>
     <artifactId>spring-boot-config-sample</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>simple-boot-config-sample</name>
@@ -26,7 +25,7 @@
         <url/>
     </scm>
     <properties>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/spring-boot-config-sample/src/main/java/org/alexmond/sample/SpringBootConfigSampleApplication.java b/spring-boot-config-sample/src/main/java/org/alexmond/sample/config/SpringBootConfigSampleApplication.java
similarity index 90%
rename from spring-boot-config-sample/src/main/java/org/alexmond/sample/SpringBootConfigSampleApplication.java
rename to spring-boot-config-sample/src/main/java/org/alexmond/sample/config/SpringBootConfigSampleApplication.java
index d5445b2..2273687 100644
--- a/spring-boot-config-sample/src/main/java/org/alexmond/sample/SpringBootConfigSampleApplication.java
+++ b/spring-boot-config-sample/src/main/java/org/alexmond/sample/config/SpringBootConfigSampleApplication.java
@@ -1,4 +1,4 @@
-package org.alexmond.sample;
+package org.alexmond.sample.config;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-boot-config-sample/src/main/java/org/alexmond/sample/config/ConfigSample.java b/spring-boot-config-sample/src/main/java/org/alexmond/sample/config/config/ConfigSample.java
similarity index 89%
rename from spring-boot-config-sample/src/main/java/org/alexmond/sample/config/ConfigSample.java
rename to spring-boot-config-sample/src/main/java/org/alexmond/sample/config/config/ConfigSample.java
index 81e9fd6..d4229ee 100644
--- a/spring-boot-config-sample/src/main/java/org/alexmond/sample/config/ConfigSample.java
+++ b/spring-boot-config-sample/src/main/java/org/alexmond/sample/config/config/ConfigSample.java
@@ -1,4 +1,4 @@
-package org.alexmond.sample.config;
+package org.alexmond.sample.config.config;
 
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
@@ -8,7 +8,10 @@
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 enum EnumSample {EN1, EN2, EN3}
diff --git a/spring-boot-config-sample/src/main/java/org/alexmond/sample/config/ConfigSampleNested.java b/spring-boot-config-sample/src/main/java/org/alexmond/sample/config/config/ConfigSampleNested.java
similarity index 76%
rename from spring-boot-config-sample/src/main/java/org/alexmond/sample/config/ConfigSampleNested.java
rename to spring-boot-config-sample/src/main/java/org/alexmond/sample/config/config/ConfigSampleNested.java
index 3f2bad4..de694fd 100644
--- a/spring-boot-config-sample/src/main/java/org/alexmond/sample/config/ConfigSampleNested.java
+++ b/spring-boot-config-sample/src/main/java/org/alexmond/sample/config/config/ConfigSampleNested.java
@@ -1,4 +1,4 @@
-package org.alexmond.sample.config;
+package org.alexmond.sample.config.config;
 
 import lombok.Data;
 
diff --git a/spring-boot-config-sample/src/main/java/org/alexmond/sample/controller/ConfigPrintRest.java b/spring-boot-config-sample/src/main/java/org/alexmond/sample/config/controller/ConfigPrintRest.java
similarity index 78%
rename from spring-boot-config-sample/src/main/java/org/alexmond/sample/controller/ConfigPrintRest.java
rename to spring-boot-config-sample/src/main/java/org/alexmond/sample/config/controller/ConfigPrintRest.java
index 48a57fb..18b7996 100644
--- a/spring-boot-config-sample/src/main/java/org/alexmond/sample/controller/ConfigPrintRest.java
+++ b/spring-boot-config-sample/src/main/java/org/alexmond/sample/config/controller/ConfigPrintRest.java
@@ -1,6 +1,6 @@
-package org.alexmond.sample.controller;
+package org.alexmond.sample.config.controller;
 
-import org.alexmond.sample.config.ConfigSample;
+import org.alexmond.sample.config.config.ConfigSample;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/spring-boot-config-sample/src/test/java/org/alexmond/sample/SimpleBootConfigSampleApplicationTests.java b/spring-boot-config-sample/src/test/java/org/alexmond/sample/config/SimpleBootConfigSampleApplicationTests.java
similarity index 85%
rename from spring-boot-config-sample/src/test/java/org/alexmond/sample/SimpleBootConfigSampleApplicationTests.java
rename to spring-boot-config-sample/src/test/java/org/alexmond/sample/config/SimpleBootConfigSampleApplicationTests.java
index c094f6d..592dbe5 100644
--- a/spring-boot-config-sample/src/test/java/org/alexmond/sample/SimpleBootConfigSampleApplicationTests.java
+++ b/spring-boot-config-sample/src/test/java/org/alexmond/sample/config/SimpleBootConfigSampleApplicationTests.java
@@ -1,4 +1,4 @@
-package org.alexmond.sample;
+package org.alexmond.sample.config;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-boot-config-server/local-config/application.yaml b/spring-boot-config-server/local-config/application.yaml
new file mode 100644
index 0000000..7e27cbc
--- /dev/null
+++ b/spring-boot-config-server/local-config/application.yaml
@@ -0,0 +1,14 @@
+spring:
+  profiles:
+    active: native
+    include:
+      - consolelog
+  cloud:
+    config:
+      server:
+        native:
+          search-locations:
+            - file:./config-repo
+logging:
+  level:
+    root: info
diff --git a/spring-boot-config-server/local-config/bootstrap.yaml b/spring-boot-config-server/local-config/bootstrap.yaml
new file mode 100644
index 0000000..979fac3
--- /dev/null
+++ b/spring-boot-config-server/local-config/bootstrap.yaml
@@ -0,0 +1,2 @@
+encrypt:
+  key: ABCDABDdddddddd1412mdsklfgjsdfk
diff --git a/spring-boot-config-server/local-config/config-repo/application.yaml b/spring-boot-config-server/local-config/config-repo/application.yaml
new file mode 100644
index 0000000..27e2ef9
--- /dev/null
+++ b/spring-boot-config-server/local-config/config-repo/application.yaml
@@ -0,0 +1,45 @@
+spring:
+  boot:
+    admin:
+      client:
+        url: http://localhost:8090
+sample:
+  config1: "common config"
+
+management:
+  httpexchanges:
+    recording:
+      enabled: true
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+    jmx:
+      exposure:
+        include: "*"
+  info:
+    env:
+      enabled: true
+    java:
+      enabled: true
+    os:
+      enabled: true
+    process:
+      enabled: true
+    tags:
+      enabled: true
+  endpoint:
+    health:
+      show-details: always
+    env:
+      show-values: always
+    configprops:
+      show-values: always
+    httpexchanges:
+      access: unrestricted
+      cache:
+        time-to-live: 100000
+
+logging:
+  file:
+    name: logs/server.log
\ No newline at end of file
diff --git a/spring-boot-config-server/local-config/config-repo/default-spring-service.yaml b/spring-boot-config-server/local-config/config-repo/default-spring-service.yaml
new file mode 100644
index 0000000..50f3cc9
--- /dev/null
+++ b/spring-boot-config-server/local-config/config-repo/default-spring-service.yaml
@@ -0,0 +1,27 @@
+sample:
+  config1: "common config"
+
+info:
+  tags:
+    environment: QA
+    location: NY
+
+---
+spring:
+  config:
+    activate:
+      on-profile: srv1
+server:
+  port: 8081
+sample:
+  config2: "service srv1 config"
+
+---
+spring:
+  config:
+    activate:
+      on-profile: srv2
+server:
+  port: 8082
+sample:
+  config2: "service srv1 config"
\ No newline at end of file
diff --git a/spring-boot-config-server/local-config/config-repo/default-spring-service2.yaml b/spring-boot-config-server/local-config/config-repo/default-spring-service2.yaml
new file mode 100644
index 0000000..f4a0da2
--- /dev/null
+++ b/spring-boot-config-server/local-config/config-repo/default-spring-service2.yaml
@@ -0,0 +1,35 @@
+sample:
+  config1: "common config"
+
+info:
+  tags:
+    environment: PROD
+---
+spring:
+  config:
+    activate:
+      on-profile: srv1
+  boot:
+    admin:
+      client:
+        enabled: false
+server:
+  port: 8083
+management:
+  server:
+    port: 9083
+sample:
+  config2: "service srv1 config"
+
+---
+spring:
+  config:
+    activate:
+      on-profile: srv2
+server:
+  port: 8084
+management:
+  server:
+    port: 9084
+sample:
+  config2: "service srv1 config"
\ No newline at end of file
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/test/java/org/alexmond/simplebootconfigsample/SpringBootThymeleafLayoutSampleApplicationTests.java b/spring-boot-config-server/local-config/config-repo/spring-boot-admin-server.yaml
similarity index 100%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/test/java/org/alexmond/simplebootconfigsample/SpringBootThymeleafLayoutSampleApplicationTests.java
rename to spring-boot-config-server/local-config/config-repo/spring-boot-admin-server.yaml
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/test/java/org/alexmond/simplebootconfigsample/SpringBootThymeleafLayoutSampleApplicationTests.java b/spring-boot-config-server/local-config/config-repo/spring-boot-gateway.yaml
similarity index 100%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/test/java/org/alexmond/simplebootconfigsample/SpringBootThymeleafLayoutSampleApplicationTests.java
rename to spring-boot-config-server/local-config/config-repo/spring-boot-gateway.yaml
diff --git a/spring-boot-config-server/local-config/gateway.yaml b/spring-boot-config-server/local-config/gateway.yaml
new file mode 100644
index 0000000..4b4084d
--- /dev/null
+++ b/spring-boot-config-server/local-config/gateway.yaml
@@ -0,0 +1,77 @@
+
+cloud:
+  loadbalancer:
+    ribbon:
+      enabled: false
+    health-check:
+      initial-delay: 5
+      interval: 5
+  gateway:
+    discovery:
+      locator:
+        enabled: true
+    loadbalancer:
+      use404: true
+    metrics:
+      enabled: true
+    httpclient:
+      ssl:
+        useInsecureTrustManager: true
+      pool:
+        max-connections: 200
+    routes:
+      - id: PRD-EP-BROKER-INTERAC
+        uri: lb://PRD-EP-BROKER
+        predicates:
+          - Host=ep.signin.interac-id.ca
+        filters:
+          - PreserveHostHeader
+          - ExchangeGateway=/saml/SSO/alias/services.securekeyconcierge.com,/cbs,/cbs,/cbs
+          - name: CircuitBreaker
+            args:
+              name: exchange
+              fallbackUri: forward:/error
+      - id: PRD-GC-BROKER-INTERAC
+        uri: lb://PRD-GC-BROKER
+        predicates:
+          - Host=services.signin.interac-id.ca
+        filters:
+          - PreserveHostHeader
+          - ExchangeGateway=/saml/SSO/alias/services.securekeyconcierge.com,/cbs,/cbs,/cbs
+          - name: CircuitBreaker
+            args:
+              name: exchange
+              fallbackUri: forward:/error
+      - id: PRD-NT-BROKER-INTERAC
+        uri: lb://PRD-NT-BROKER
+        predicates:
+          - Host=nt.signin.interac-id.ca
+        filters:
+          - PreserveHostHeader
+          - ExchangeGateway=/saml/SSO/alias/services.securekeyconcierge.com,/cbs,/cbs,/cbs
+          - name: CircuitBreaker
+            args:
+              name: exchange
+              fallbackUri: forward:/error
+      - id: PRD-ON-BROKER-INTERAC
+        uri: lb://PRD-ON-BROKER
+        predicates:
+          - Host=on.signin.interac-id.ca
+        filters:
+          - PreserveHostHeader
+          - ExchangeGateway=/saml/SSO/alias/services.securekeyconcierge.com,/cbs,/cbs,/cbs
+          - name: CircuitBreaker
+            args:
+              name: exchange
+              fallbackUri: forward:/error
+      - id: PRD-QC-BROKER-INTERAC
+        uri: lb://PRD-QC-BROKER
+        predicates:
+          - Host=qc.signin.interac-id.ca
+        filters:
+          - PreserveHostHeader
+          - ExchangeGateway=/saml/SSO/alias/services.securekeyconcierge.com,/cbs,/cbs,/cbs
+          - name: CircuitBreaker
+            args:
+              name: exchange
+              fallbackUri: forward:/error
diff --git a/spring-boot-config-server/pom.xml b/spring-boot-config-server/pom.xml
new file mode 100644
index 0000000..9d78044
--- /dev/null
+++ b/spring-boot-config-server/pom.xml
@@ -0,0 +1,51 @@
+<?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>
+    <parent>
+        <groupId>org.alexmond</groupId>
+        <artifactId>boot-sample-root</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <artifactId>spring-boot-config-server</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>Spring Boot Config Server</name>
+    <description>Centralized configuration service using Spring Cloud Config (Git-backed). Supports environment-specific properties, encryption, and runtime refresh for distributed systems.</description>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Alex Mondshain</name>
+            <email>alex.mondshain@gmail.com</email>
+        </developer>
+    </developers>
+    <properties>
+        <java.version>17</java.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-config-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring-boot-admin.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/spring-boot-config-server/src/main/java/org/alexmond/sample/cloud/HttpExchangeConfiguration.java b/spring-boot-config-server/src/main/java/org/alexmond/sample/cloud/HttpExchangeConfiguration.java
new file mode 100644
index 0000000..c1255f4
--- /dev/null
+++ b/spring-boot-config-server/src/main/java/org/alexmond/sample/cloud/HttpExchangeConfiguration.java
@@ -0,0 +1,16 @@
+package org.alexmond.sample.cloud;
+
+import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class HttpExchangeConfiguration {
+
+    @Bean
+    public InMemoryHttpExchangeRepository createTraceRepository() {
+        InMemoryHttpExchangeRepository inMemoryHttpExchangeRepository = new InMemoryHttpExchangeRepository();
+        inMemoryHttpExchangeRepository.setCapacity(200);
+        return  inMemoryHttpExchangeRepository;
+    }
+}
\ No newline at end of file
diff --git a/spring-boot-config-server/src/main/java/org/alexmond/sample/cloud/SpringBootConfigServerApplication.java b/spring-boot-config-server/src/main/java/org/alexmond/sample/cloud/SpringBootConfigServerApplication.java
new file mode 100644
index 0000000..1847cc1
--- /dev/null
+++ b/spring-boot-config-server/src/main/java/org/alexmond/sample/cloud/SpringBootConfigServerApplication.java
@@ -0,0 +1,15 @@
+package org.alexmond.sample.cloud;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.config.server.EnableConfigServer;
+
+@SpringBootApplication
+@EnableConfigServer
+public class SpringBootConfigServerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootConfigServerApplication.class, args);
+    }
+
+}
diff --git a/spring-boot-config-server/src/main/resources/application.yaml b/spring-boot-config-server/src/main/resources/application.yaml
new file mode 100644
index 0000000..6bc8748
--- /dev/null
+++ b/spring-boot-config-server/src/main/resources/application.yaml
@@ -0,0 +1,39 @@
+server:
+  port: 8888
+  tomcat:
+    accesslog:
+      enabled: true
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+    jmx:
+      exposure:
+        include: "*"
+  info:
+    env:
+      enabled: true
+  endpoint:
+    env:
+      show-values: always
+    configprops:
+      show-values: always
+
+spring:
+  application:
+    name: spring-boot-config-server
+  boot:
+    admin:
+      client:
+        url: http://localhost:8090
+
+
+info:
+  tags:
+    environment: OPS
+
+
+
+
diff --git a/spring-boot-data-jpa-flyway/.gitattributes b/spring-boot-data-jpa-flyway/.gitattributes
deleted file mode 100644
index 3b41682..0000000
--- a/spring-boot-data-jpa-flyway/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-/mvnw text eol=lf
-*.cmd text eol=crlf
diff --git a/spring-boot-data-jpa-flyway/.gitignore b/spring-boot-data-jpa-flyway/.gitignore
deleted file mode 100644
index 667aaef..0000000
--- a/spring-boot-data-jpa-flyway/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-HELP.md
-target/
-.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/spring-boot-data-jpa-flyway/pom.xml b/spring-boot-data-jpa-flyway/pom.xml
index a9f3f6c..46a0c4f 100644
--- a/spring-boot-data-jpa-flyway/pom.xml
+++ b/spring-boot-data-jpa-flyway/pom.xml
@@ -7,13 +7,25 @@
         <artifactId>boot-sample-root</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <groupId>org.alexmond</groupId>
     <artifactId>spring-boot-data-jpa-flyway</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>spring-boot-data-jpa-flyway</name>
-    <description>spring-boot-data-jpa-flyway</description>
+    <name>Spring Boot Data JPA with Flyway</name>
+    <description>Sample showing persistence with Spring Data JPA/Hibernate and database migrations with Flyway. Covers entities, repositories, transactions, CRUD, and schema versioning.</description>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Alex Mondshain</name>
+            <email>alex.mondshain@gmail.com</email>
+        </developer>
+    </developers>
     <properties>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
     </properties>
     <dependencies>
         <dependency>
@@ -48,6 +60,12 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.alexmond</groupId>
+            <artifactId>spring-boot-config-json-schema-starter</artifactId>
+            <version>0.0.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring-boot-data-jpa-flyway/src/test/java/org/alexmond/sample/jpa/SimpleBootRestSampleApplicationTests.java b/spring-boot-data-jpa-flyway/src/test/java/org/alexmond/sample/jpa/SimpleBootRestSampleApplicationTests.java
index 219d667..e9d7c2b 100644
--- a/spring-boot-data-jpa-flyway/src/test/java/org/alexmond/sample/jpa/SimpleBootRestSampleApplicationTests.java
+++ b/spring-boot-data-jpa-flyway/src/test/java/org/alexmond/sample/jpa/SimpleBootRestSampleApplicationTests.java
@@ -1,9 +1,11 @@
 package org.alexmond.sample.jpa;
 
+import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
+@Slf4j
 class SimpleBootRestSampleApplicationTests {
 
     @Test
diff --git a/spring-boot-openapi-root/pom.xml b/spring-boot-openapi-root/pom.xml
index dffaee1..4d45005 100644
--- a/spring-boot-openapi-root/pom.xml
+++ b/spring-boot-openapi-root/pom.xml
@@ -12,7 +12,20 @@
     <version>0.0.1-SNAPSHOT</version>
     <name>spring-boot-openapi-root</name>
     <packaging>pom</packaging>
-    <description>spring-boot-openapi-root</description>
+    <description>Parent for OpenAPI samples. Demonstrates SpringDoc integration, Swagger UI, schema generation, and API documentation best practices across modules.</description>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Alex Mondshain</name>
+            <email>alex.mondshain@gmail.com</email>
+        </developer>
+    </developers>
     <modules>
         <module>spring-boot-openapi</module>
 <!--        <module>spring-boot-openapi-client</module>-->
diff --git a/spring-boot-openapi-root/spring-boot-openapi-client/pom.xml b/spring-boot-openapi-root/spring-boot-openapi-client/pom.xml
index 9549006..b75080f 100644
--- a/spring-boot-openapi-root/spring-boot-openapi-client/pom.xml
+++ b/spring-boot-openapi-root/spring-boot-openapi-client/pom.xml
@@ -14,7 +14,7 @@
     <description>spring-boot-openapi-client</description>
 
     <properties>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/spring-boot-openapi-root/spring-boot-openapi/pom.xml b/spring-boot-openapi-root/spring-boot-openapi/pom.xml
index aab251a..7a113e4 100644
--- a/spring-boot-openapi-root/spring-boot-openapi/pom.xml
+++ b/spring-boot-openapi-root/spring-boot-openapi/pom.xml
@@ -7,14 +7,19 @@
         <artifactId>spring-boot-openapi-root</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <groupId>org.alexmond</groupId>
     <artifactId>spring-boot-openapi</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>spring-boot-openapi</name>
-    <description>spring-boot-openapi</description>
+    <description>Spring Boot OpenAPI integration module showcasing API documentation with Swagger UI and API
+        specification generation
+    </description>
     <url/>
     <licenses>
-        <license/>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
     </licenses>
     <developers>
         <developer/>
@@ -26,7 +31,7 @@
         <url/>
     </scm>
     <properties>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/simplebootconfigsample/HelloWorldRest.java b/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/HelloWorldRest.java
similarity index 85%
rename from spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/simplebootconfigsample/HelloWorldRest.java
rename to spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/HelloWorldRest.java
index f2adf12..40383ff 100644
--- a/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/simplebootconfigsample/HelloWorldRest.java
+++ b/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/HelloWorldRest.java
@@ -1,4 +1,4 @@
-package org.alexmond.simplebootconfigsample;
+package org.alexmond.sample.openapi;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/simplebootconfigsample/SpringBootOpenapiApplication.java b/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/SpringBootOpenapiApplication.java
similarity index 87%
rename from spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/simplebootconfigsample/SpringBootOpenapiApplication.java
rename to spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/SpringBootOpenapiApplication.java
index 140990c..4da91d3 100644
--- a/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/simplebootconfigsample/SpringBootOpenapiApplication.java
+++ b/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/SpringBootOpenapiApplication.java
@@ -1,4 +1,4 @@
-package org.alexmond.simplebootconfigsample;
+package org.alexmond.sample.openapi;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/auth/controller/UserController.java b/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/auth/controller/UserController.java
similarity index 94%
rename from spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/auth/controller/UserController.java
rename to spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/auth/controller/UserController.java
index 013cb50..02daf76 100644
--- a/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/auth/controller/UserController.java
+++ b/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/auth/controller/UserController.java
@@ -1,4 +1,4 @@
-package org.alexmond.sample.auth.controller;
+package org.alexmond.sample.openapi.auth.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -6,8 +6,8 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.persistence.EntityNotFoundException;
-import org.alexmond.sample.auth.model.User;
-import org.alexmond.sample.jpa.repository.UserRepository;
+import org.alexmond.sample.openapi.auth.model.User;
+import org.alexmond.sample.openapi.repository.UserRepository;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/auth/model/User.java b/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/auth/model/User.java
similarity index 95%
rename from spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/auth/model/User.java
rename to spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/auth/model/User.java
index de3d760..373cf87 100644
--- a/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/auth/model/User.java
+++ b/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/auth/model/User.java
@@ -1,7 +1,7 @@
-package org.alexmond.sample.auth.model;
+package org.alexmond.sample.openapi.auth.model;
 
-import lombok.Data;
 import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
 
 /**
  * Represents a user entity in the system.
diff --git a/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/jpa/repository/UserRepository.java b/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/repository/UserRepository.java
similarity index 88%
rename from spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/jpa/repository/UserRepository.java
rename to spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/repository/UserRepository.java
index 7c206c3..d52ca02 100644
--- a/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/jpa/repository/UserRepository.java
+++ b/spring-boot-openapi-root/spring-boot-openapi/src/main/java/org/alexmond/sample/openapi/repository/UserRepository.java
@@ -1,6 +1,6 @@
-package org.alexmond.sample.jpa.repository;
+package org.alexmond.sample.openapi.repository;
 
-import org.alexmond.sample.auth.model.User;
+import org.alexmond.sample.openapi.auth.model.User;
 import org.springframework.stereotype.Repository;
 
 import java.util.ArrayList;
diff --git a/spring-boot-openapi-root/spring-boot-openapi/src/test/java/org/alexmond/simplebootconfigsample/SimpleBootRestSampleApplicationTests.java b/spring-boot-openapi-root/spring-boot-openapi/src/test/java/org/alexmond/sample/openapi/SimpleBootRestSampleApplicationTests.java
similarity index 96%
rename from spring-boot-openapi-root/spring-boot-openapi/src/test/java/org/alexmond/simplebootconfigsample/SimpleBootRestSampleApplicationTests.java
rename to spring-boot-openapi-root/spring-boot-openapi/src/test/java/org/alexmond/sample/openapi/SimpleBootRestSampleApplicationTests.java
index be562c4..9abd495 100644
--- a/spring-boot-openapi-root/spring-boot-openapi/src/test/java/org/alexmond/simplebootconfigsample/SimpleBootRestSampleApplicationTests.java
+++ b/spring-boot-openapi-root/spring-boot-openapi/src/test/java/org/alexmond/sample/openapi/SimpleBootRestSampleApplicationTests.java
@@ -1,4 +1,4 @@
-package org.alexmond.simplebootconfigsample;
+package org.alexmond.sample.openapi;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-boot-rest-sample/pom.xml b/spring-boot-rest-sample/pom.xml
index cba661f..9e9a42d 100644
--- a/spring-boot-rest-sample/pom.xml
+++ b/spring-boot-rest-sample/pom.xml
@@ -7,26 +7,25 @@
         <artifactId>boot-sample-root</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <groupId>org.alexmond</groupId>
     <artifactId>spring-boot-rest-sample</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>simple-boot-rest-sample</name>
-    <description>simple-boot-rest-sample</description>
-    <url/>
+    <name>Spring Boot REST API Sample</name>
+    <description>A Spring Boot REST sample showcasing CRUD endpoints, validation, exception handling, and proper HTTP semantics with JSON payloads. Useful as a template for building production-grade RESTful services.</description>
     <licenses>
-        <license/>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
     </licenses>
     <developers>
-        <developer/>
+        <developer>
+            <name>Alex Mondshain</name>
+            <email>alex.mondshain@gmail.com</email>
+        </developer>
     </developers>
-    <scm>
-        <connection/>
-        <developerConnection/>
-        <tag/>
-        <url/>
-    </scm>
     <properties>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
     </properties>
     <dependencies>
         <dependency>
@@ -40,7 +39,6 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -49,5 +47,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/spring-boot-rest-sample/src/main/java/org/alexmond/simplebootconfigsample/HelloWorldRest.java b/spring-boot-rest-sample/src/main/java/org/alexmond/sample/rest/HelloWorldRest.java
similarity index 85%
rename from spring-boot-rest-sample/src/main/java/org/alexmond/simplebootconfigsample/HelloWorldRest.java
rename to spring-boot-rest-sample/src/main/java/org/alexmond/sample/rest/HelloWorldRest.java
index 5b39c84..1182e0b 100644
--- a/spring-boot-rest-sample/src/main/java/org/alexmond/simplebootconfigsample/HelloWorldRest.java
+++ b/spring-boot-rest-sample/src/main/java/org/alexmond/sample/rest/HelloWorldRest.java
@@ -1,4 +1,4 @@
-package org.alexmond.simplebootconfigsample;
+package org.alexmond.sample.rest;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/spring-boot-rest-sample/src/main/java/org/alexmond/simplebootconfigsample/SimpleBootRestSampleApplication.java b/spring-boot-rest-sample/src/main/java/org/alexmond/sample/rest/SimpleBootRestSampleApplication.java
similarity index 87%
rename from spring-boot-rest-sample/src/main/java/org/alexmond/simplebootconfigsample/SimpleBootRestSampleApplication.java
rename to spring-boot-rest-sample/src/main/java/org/alexmond/sample/rest/SimpleBootRestSampleApplication.java
index 7bf9d06..e1bab74 100644
--- a/spring-boot-rest-sample/src/main/java/org/alexmond/simplebootconfigsample/SimpleBootRestSampleApplication.java
+++ b/spring-boot-rest-sample/src/main/java/org/alexmond/sample/rest/SimpleBootRestSampleApplication.java
@@ -1,4 +1,4 @@
-package org.alexmond.simplebootconfigsample;
+package org.alexmond.sample.rest;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-boot-rest-sample/src/test/java/org/alexmond/simplebootconfigsample/SimpleBootRestSampleApplicationTests.java b/spring-boot-rest-sample/src/test/java/org/alexmond/sample/rest/SimpleBootRestSampleApplicationTests.java
similarity index 82%
rename from spring-boot-rest-sample/src/test/java/org/alexmond/simplebootconfigsample/SimpleBootRestSampleApplicationTests.java
rename to spring-boot-rest-sample/src/test/java/org/alexmond/sample/rest/SimpleBootRestSampleApplicationTests.java
index 485cf46..f3a652c 100644
--- a/spring-boot-rest-sample/src/test/java/org/alexmond/simplebootconfigsample/SimpleBootRestSampleApplicationTests.java
+++ b/spring-boot-rest-sample/src/test/java/org/alexmond/sample/rest/SimpleBootRestSampleApplicationTests.java
@@ -1,4 +1,4 @@
-package org.alexmond.simplebootconfigsample;
+package org.alexmond.sample.rest;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-boot-security-root/pom.xml b/spring-boot-security-root/pom.xml
index 820bb96..fff6471 100644
--- a/spring-boot-security-root/pom.xml
+++ b/spring-boot-security-root/pom.xml
@@ -12,8 +12,20 @@
     <version>0.0.1-SNAPSHOT</version>
     <name>spring-boot-security-root</name>
     <packaging>pom</packaging>
-    <description>spring-boot-security-root</description>
-
+    <description>Parent for security samples. Covers Spring Security basics and JWT-based auth, RBAC, CSRF, and method security across submodules.</description>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Alex Mondshain</name>
+            <email>alex.mondshain@gmail.com</email>
+        </developer>
+    </developers>
     <modules>
         <module>spring-boot-custom-auth-server</module>
         <module>simple-boot-auth-client</module>
diff --git a/spring-boot-security-root/simple-boot-auth-client/pom.xml b/spring-boot-security-root/simple-boot-auth-client/pom.xml
index 5ae4a67..6b4c2d2 100644
--- a/spring-boot-security-root/simple-boot-auth-client/pom.xml
+++ b/spring-boot-security-root/simple-boot-auth-client/pom.xml
@@ -7,7 +7,6 @@
         <artifactId>spring-boot-security-root</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <groupId>org.alexmond</groupId>
     <artifactId>simple-boot-auth-client</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>simple-boot-auth-client</name>
@@ -26,7 +25,7 @@
         <url/>
     </scm>
     <properties>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
     </properties>
     <dependencies>
 
diff --git a/spring-boot-security-root/spring-boot-custom-auth-server/pom.xml b/spring-boot-security-root/spring-boot-custom-auth-server/pom.xml
index e2b2775..6398f7f 100644
--- a/spring-boot-security-root/spring-boot-custom-auth-server/pom.xml
+++ b/spring-boot-security-root/spring-boot-custom-auth-server/pom.xml
@@ -13,7 +13,7 @@
     <name>spring-boot-thymeleaf-sample</name>
     <description>spring-boot-thymeleaf-sample</description>
     <properties>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/spring-boot-thymeleaf/pom.xml b/spring-boot-thymeleaf/pom.xml
index 39dc3d3..998485d 100644
--- a/spring-boot-thymeleaf/pom.xml
+++ b/spring-boot-thymeleaf/pom.xml
@@ -12,7 +12,20 @@
     <version>0.0.1-SNAPSHOT</version>
     <name>spring-boot-thymeleaf</name>
     <packaging>pom</packaging>
-    <description>spring-boot-thymeleaf</description>
+    <description>Server-side MVC with Thymeleaf: template rendering, forms, fragments/layouts, i18n, and Bootstrap-based UI examples for classic web apps.</description>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Alex Mondshain</name>
+            <email>alex.mondshain@gmail.com</email>
+        </developer>
+    </developers>
 
     <modules>
         <module>spring-boot-thymeleaf-sample</module>
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/pom.xml b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/pom.xml
index 1d77208..81464c0 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/pom.xml
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/pom.xml
@@ -13,7 +13,7 @@
     <name>spring-boot-thymeleaf-layout</name>
     <description>spring-boot-thymeleaf-layout</description>
     <properties>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/simplebootconfigsample/MainController.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/sample/thymeleaf/layout/MainController.java
similarity index 93%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/simplebootconfigsample/MainController.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/sample/thymeleaf/layout/MainController.java
index b302678..24769ab 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/simplebootconfigsample/MainController.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/sample/thymeleaf/layout/MainController.java
@@ -1,12 +1,14 @@
-package org.alexmond.simplebootconfigsample;
+package org.alexmond.sample.thymeleaf.layout;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
 import java.math.BigDecimal;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 @Controller
 public class MainController {
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/simplebootconfigsample/SpringBootThymeleafLayoutSampleApplication.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/sample/thymeleaf/layout/SpringBootThymeleafLayoutSampleApplication.java
similarity index 88%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/simplebootconfigsample/SpringBootThymeleafLayoutSampleApplication.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/sample/thymeleaf/layout/SpringBootThymeleafLayoutSampleApplication.java
index 3f1746a..03e6081 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/simplebootconfigsample/SpringBootThymeleafLayoutSampleApplication.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/main/java/org/alexmond/sample/thymeleaf/layout/SpringBootThymeleafLayoutSampleApplication.java
@@ -1,4 +1,4 @@
-package org.alexmond.simplebootconfigsample;
+package org.alexmond.sample.thymeleaf.layout;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/test/java/org/alexmond/sample/thymeleaf/layout/SimpleBootRestSampleApplicationTests.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/test/java/org/alexmond/sample/thymeleaf/layout/SimpleBootRestSampleApplicationTests.java
new file mode 100644
index 0000000..9c50e62
--- /dev/null
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-layout/src/test/java/org/alexmond/sample/thymeleaf/layout/SimpleBootRestSampleApplicationTests.java
@@ -0,0 +1,12 @@
+package org.alexmond.sample.thymeleaf.layout;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class SimpleBootRestSampleApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+}
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/pom.xml b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/pom.xml
index 79d54aa..c143d87 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/pom.xml
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/pom.xml
@@ -13,7 +13,7 @@
     <name>spring-boot-thymeleaf-sample</name>
     <description>spring-boot-thymeleaf-sample</description>
     <properties>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/simplebootconfigsample/SpringBootThymeleafSampleApplication.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/SpringBootThymeleafSampleApplication.java
similarity index 88%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/simplebootconfigsample/SpringBootThymeleafSampleApplication.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/SpringBootThymeleafSampleApplication.java
index 36a5379..ec33473 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/simplebootconfigsample/SpringBootThymeleafSampleApplication.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/SpringBootThymeleafSampleApplication.java
@@ -1,4 +1,4 @@
-package org.alexmond.simplebootconfigsample;
+package org.alexmond.sample.thymeleaf;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/controller/FormController.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/controller/FormController.java
similarity index 96%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/controller/FormController.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/controller/FormController.java
index 337407a..45a6f18 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/controller/FormController.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/controller/FormController.java
@@ -1,4 +1,4 @@
-package org.alexmond.sample.auth.controller;
+package org.alexmond.sample.thymeleaf.auth.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/controller/HomeController.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/controller/HomeController.java
similarity index 88%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/controller/HomeController.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/controller/HomeController.java
index 7287960..7838661 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/controller/HomeController.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/controller/HomeController.java
@@ -1,4 +1,4 @@
-package org.alexmond.sample.auth.controller;
+package org.alexmond.sample.thymeleaf.auth.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/controller/ProductController.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/controller/ProductController.java
similarity index 88%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/controller/ProductController.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/controller/ProductController.java
index 1c1823d..ba5b82e 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/controller/ProductController.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/controller/ProductController.java
@@ -1,7 +1,7 @@
-package org.alexmond.sample.auth.controller;
+package org.alexmond.sample.thymeleaf.auth.controller;
 
-import org.alexmond.sample.auth.model.Product;
-import org.alexmond.sample.auth.service.ProductService;
+import org.alexmond.sample.thymeleaf.auth.model.Product;
+import org.alexmond.sample.thymeleaf.auth.service.ProductService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/controller/UserController.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/controller/UserController.java
similarity index 89%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/controller/UserController.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/controller/UserController.java
index 9937f43..54d948e 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/controller/UserController.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/controller/UserController.java
@@ -1,8 +1,8 @@
-package org.alexmond.sample.auth.controller;
+package org.alexmond.sample.thymeleaf.auth.controller;
 
-import org.alexmond.sample.auth.model.User;
-import org.alexmond.sample.auth.model.UserRole;
-import org.alexmond.sample.auth.service.UserService;
+import org.alexmond.sample.thymeleaf.auth.model.User;
+import org.alexmond.sample.thymeleaf.auth.model.UserRole;
+import org.alexmond.sample.thymeleaf.auth.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/model/Address.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/model/Address.java
similarity index 85%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/model/Address.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/model/Address.java
index 95e396a..3737ea9 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/model/Address.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/model/Address.java
@@ -1,4 +1,4 @@
-package org.alexmond.sample.auth.model;
+package org.alexmond.sample.thymeleaf.auth.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/model/Product.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/model/Product.java
similarity index 91%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/model/Product.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/model/Product.java
index a3d21e2..f3d6ad4 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/model/Product.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/model/Product.java
@@ -1,5 +1,5 @@
 
-package org.alexmond.sample.auth.model;
+package org.alexmond.sample.thymeleaf.auth.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/model/User.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/model/User.java
similarity index 91%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/model/User.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/model/User.java
index 751bc81..129d9db 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/model/User.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/model/User.java
@@ -1,4 +1,4 @@
-package org.alexmond.sample.auth.model;
+package org.alexmond.sample.thymeleaf.auth.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/model/UserRole.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/model/UserRole.java
similarity index 86%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/model/UserRole.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/model/UserRole.java
index df31986..b4430af 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/model/UserRole.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/model/UserRole.java
@@ -1,4 +1,4 @@
-package org.alexmond.sample.auth.model;
+package org.alexmond.sample.thymeleaf.auth.model;
 
 public enum UserRole {
     ADMIN("Administrator"),
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/service/ProductService.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/service/ProductService.java
similarity index 95%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/service/ProductService.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/service/ProductService.java
index 97fb7e0..6dbad71 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/service/ProductService.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/service/ProductService.java
@@ -1,6 +1,6 @@
-package org.alexmond.sample.auth.service;
+package org.alexmond.sample.thymeleaf.auth.service;
 
-import org.alexmond.sample.auth.model.Product;
+import org.alexmond.sample.thymeleaf.auth.model.Product;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
diff --git a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/service/UserService.java b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/service/UserService.java
similarity index 90%
rename from spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/service/UserService.java
rename to spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/service/UserService.java
index 42b6e36..3cf4625 100644
--- a/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/auth/service/UserService.java
+++ b/spring-boot-thymeleaf/spring-boot-thymeleaf-sample/src/main/java/org/alexmond/sample/thymeleaf/auth/service/UserService.java
@@ -1,8 +1,8 @@
-package org.alexmond.sample.auth.service;
+package org.alexmond.sample.thymeleaf.auth.service;
 
-import org.alexmond.sample.auth.model.Address;
-import org.alexmond.sample.auth.model.User;
-import org.alexmond.sample.auth.model.UserRole;
+import org.alexmond.sample.thymeleaf.auth.model.Address;
+import org.alexmond.sample.thymeleaf.auth.model.User;
+import org.alexmond.sample.thymeleaf.auth.model.UserRole;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;