CAMEL-16011: Remove camel-example- prefix in camel-spring-boot-examples (#30)

remove camel-example prefix from the examples.
diff --git a/README.adoc b/README.adoc
index 82fc938..2482656 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,6 +1,6 @@
-# Welcome to the Apache Camel Spring-Boot Examples
+= Welcome to the Apache Camel Spring-Boot Examples
 
-= Introduction
+== Introduction
 
 This project contains the various examples for working with Apache
 Camel Spring Boot. The examples can be run using Maven. When using the Maven
@@ -8,7 +8,7 @@
 central repository to your local repository.
 View the individual example READMEs for details.
 
-== Executing
+=== Executing
 
 Master branch should only be used for development purposes, which will be pointing
 to the SNAPSHOT version of the next release.
@@ -24,7 +24,7 @@
 After that, you should be able to execute the examples following each example's
 readme's instructions.
 
-== Examples
+=== Examples
 
 // examples: START
 Number of Examples: 47 (0 deprecated)
@@ -33,109 +33,109 @@
 |===
 | Example | Category | Description
 
-| link:camel-example-spring-boot-health-checks/readme.adoc[Spring Boot Health Checks] (camel-example-spring-boot-health-checks) |  | 
+| link:spring-boot-health-checks/readme.adoc[Spring Boot Health Checks] (camel-example-spring-boot-health-checks) |  |
 
-| link:camel-example-spring-boot-undertow-spring-security/readme.adoc[Spring Boot Undertow Spring Security] (camel-example-spring-boot-undertow-spring-security) | Advanced | Example on how to use the Camel Undertow component with spring security and Keycloak
+| link:spring-boot-undertow-spring-security/readme.adoc[Spring Boot Undertow Spring Security] (camel-example-spring-boot-undertow-spring-security) | Advanced | Example on how to use the Camel Undertow component with spring security and Keycloak
 
 | link:camel-example-spring-boot-webhook/readme.adoc[Spring Boot Webhook] (camel-example-spring-boot-webhook) | Advanced | Example on how to use the Camel Webhook component
 
-| link:camel-example-spring-boot/readme.adoc[Spring Boot] (camel-example-spring-boot) | Beginner | An example showing how to work with Camel and Spring Boot
+| link:spring-boot/readme.adoc[Spring Boot] (camel-example-spring-boot) | Beginner | An example showing how to work with Camel and Spring Boot
 
-| link:camel-example-spring-boot-jira/README.adoc[Spring Boot Jira] (camel-example-spring-boot-jira) | Beginner | An example that uses Jira Camel API
+| link:spring-boot-jira/README.adoc[Spring Boot Jira] (camel-example-spring-boot-jira) | Beginner | An example that uses Jira Camel API
 
-| link:camel-example-spring-boot-load-balancer-eip/README.adoc[Spring Boot Load Balancer Eip] (camel-example-spring-boot-load-balancer-eip) | Beginner | An example showing Load Balancer EIP with Camel and Spring Boot
+| link:spring-boot-load-balancer-eip/README.adoc[Spring Boot Load Balancer Eip] (camel-example-spring-boot-load-balancer-eip) | Beginner | An example showing Load Balancer EIP with Camel and Spring Boot
 
-| link:camel-example-spring-boot-pojo/README.adoc[Spring Boot Pojo] (camel-example-spring-boot-pojo) | Beginner | An example showing how to work with Camel POJO routing with Spring Boot
+| link:spring-boot-pojo/README.adoc[Spring Boot Pojo] (camel-example-spring-boot-pojo) | Beginner | An example showing how to work with Camel POJO routing with Spring Boot
 
-| link:camel-example-spring-boot-rest-openapi-simple/README.adoc[REST OpenApi] (camel-example-spring-boot-rest-openapi-simple) | Beginner | This example shows how to call a Rest service defined using OpenApi specification
+| link:spring-boot-rest-openapi-simple/README.adoc[REST OpenApi] (camel-example-spring-boot-rest-openapi-simple) | Beginner | This example shows how to call a Rest service defined using OpenApi specification
 
 | link:camel-example-spring-boot-rest-swagger-simple/README.adoc[REST Swagger] (camel-example-spring-boot-rest-swagger-simple) | Beginner | This example shows how to call a Rest service defined using Swagger specification
 
-| link:camel-example-spring-boot-routetemplate/readme.adoc[Spring Boot Routetemplate] (camel-example-spring-boot-routetemplate) | Beginner | How to use route templates (parameterized routes)
+| link:spring-boot-routetemplate/readme.adoc[Spring Boot Routetemplate] (camel-example-spring-boot-routetemplate) | Beginner | How to use route templates (parameterized routes)
 
-| link:camel-example-spring-boot-splitter-eip/README.adoc[Spring Boot Splitter Eip] (camel-example-spring-boot-splitter-eip) | Beginner | An example showing Splitter EIP with Camel and Spring Boot
+| link:spring-boot-splitter-eip/README.adoc[Spring Boot Splitter Eip] (camel-example-spring-boot-splitter-eip) | Beginner | An example showing Splitter EIP with Camel and Spring Boot
 
-| link:camel-example-spring-boot-type-converter/README.adoc[Spring Boot Type Converter] (camel-example-spring-boot-type-converter) | Beginner | An example showing how to create custom type converter with Camel and Spring Boot
+| link:spring-boot-type-converter/README.adoc[Spring Boot Type Converter] (camel-example-spring-boot-type-converter) | Beginner | An example showing how to create custom type converter with Camel and Spring Boot
 
-| link:camel-example-spring-boot-unit-testing/README.adoc[Spring Boot Unit Testing] (camel-example-spring-boot-unit-testing) | Beginner | An example showing how to write unit tests with Camel and Spring Boot
+| link:spring-boot-unit-testing/README.adoc[Spring Boot Unit Testing] (camel-example-spring-boot-unit-testing) | Beginner | An example showing how to write unit tests with Camel and Spring Boot
 
-| link:camel-example-spring-boot-xml/readme.adoc[Spring Boot XML] (camel-example-spring-boot-xml) | Beginner | An example showing how to work with Camel routes in XML files and Spring Boot
+| link:spring-boot-xml/readme.adoc[Spring Boot XML] (camel-example-spring-boot-xml) | Beginner | An example showing how to work with Camel routes in XML files and Spring Boot
 
-| link:camel-example-spring-boot-aws2-s3/README.adoc[Spring Boot Aws2 S3] (camel-example-spring-boot-aws2-s3) | Cloud | An example showing the Camel AWS2 S3 component with Spring Boot
+| link:spring-boot-aws2-s3/README.adoc[Spring Boot Aws2 S3] (camel-example-spring-boot-aws2-s3) | Cloud | An example showing the Camel AWS2 S3 component with Spring Boot
 
-| link:camel-example-spring-boot-grpc/README.adoc[gRPC Spring Boot] (camel-example-spring-boot-grpc) | Cloud | An example showing the Camel gRPC component with Spring Boot
+| link:spring-boot-grpc/README.adoc[gRPC Spring Boot] (camel-example-spring-boot-grpc) | Cloud | An example showing the Camel gRPC component with Spring Boot
 
 | link:camel-example-spring-boot-grpc-kubernetes/README.adoc[gRPC Kubernetes] (camel-example-spring-boot-grpc-kubernetes) | Cloud | An example showing the Camel gRPC component with Spring Boot running on Kubernetes
 
-| link:camel-example-spring-boot-infinispan/README.adoc[Spring Boot Infinispan] (camel-example-spring-boot-infinispan) | Cloud | An example showing the Camel Infinispan component with Spring Boot
+| link:spring-boot-infinispan/README.adoc[Spring Boot Infinispan] (camel-example-spring-boot-infinispan) | Cloud | An example showing the Camel Infinispan component with Spring Boot
 
-| link:camel-example-spring-boot-servicecall/README.adoc[Spring Boot ServiceCall] (camel-example-spring-boot-servicecall) | Cloud | An example showing how to work with Camel ServiceCall EIP and Spring Boot
+| link:spring-boot-servicecall/README.adoc[Spring Boot ServiceCall] (camel-example-spring-boot-servicecall) | Cloud | An example showing how to work with Camel ServiceCall EIP and Spring Boot
 
-| link:camel-example-spring-boot-clustered-route-controller/readme.adoc[Spring Boot Clustered Route Controller] (camel-example-spring-boot-clustered-route-controller) | Clustering | An example showing how to work with Camel's Clustered Route Controller and Spring Boot
+| link:spring-boot-clustered-route-controller/readme.adoc[Spring Boot Clustered Route Controller] (camel-example-spring-boot-clustered-route-controller) | Clustering | An example showing how to work with Camel's Clustered Route Controller and Spring Boot
 
 | link:camel-example-spring-boot-master/readme.adoc[Spring Boot Master] (camel-example-spring-boot-master) | Clustering | An example showing how to work with Camel's Master component and Spring Boot
 
-| link:camel-example-spring-boot-arangodb/README.adoc[Spring Boot Arangodb] (camel-example-spring-boot-arangodb) | Database | An example showing the Camel ArangoDb component with Spring Boot
+| link:spring-boot-arangodb/README.adoc[Spring Boot Arangodb] (camel-example-spring-boot-arangodb) | Database | An example showing the Camel ArangoDb component with Spring Boot
 
-| link:camel-example-spring-boot-rest-jpa/README.adoc[Spring Boot REST JPA] (camel-example-spring-boot-rest-jpa) | Database | An example demonstrating how to use Camel REST DSL with JPA to expose a RESTful API that performs CRUD
+| link:spring-boot-rest-jpa/README.adoc[Spring Boot REST JPA] (camel-example-spring-boot-rest-jpa) | Database | An example demonstrating how to use Camel REST DSL with JPA to expose a RESTful API that performs CRUD
         operations on a database
     
 
-| link:camel-example-spring-boot-hystrix/README.adoc[Spring Boot Hystrix] (camel-example-spring-boot-hystrix) | EIP | An example showing how to use Hystrix EIP as circuit breaker in Camel routes
+| link:spring-boot-hystrix/README.adoc[Spring Boot Hystrix] (camel-example-spring-boot-hystrix) | EIP | An example showing how to use Hystrix EIP as circuit breaker in Camel routes
 
-| link:camel-example-spring-boot-resilience4j/README.adoc[Spring Boot Resilience4j] (camel-example-spring-boot-resilience4j) | EIP | An example showing how to use Resilience4j EIP as circuit breaker in Camel routes
+| link:spring-boot-resilience4j/README.adoc[Spring Boot Resilience4j] (camel-example-spring-boot-resilience4j) | EIP | An example showing how to use Resilience4j EIP as circuit breaker in Camel routes
 
-| link:camel-example-spring-boot-fhir/readme.adoc[Spring Boot Fhir] (camel-example-spring-boot-fhir) | Health Care | An example showing how to work with Camel, FHIR and Spring Boot
+| link:spring-boot-fhir/readme.adoc[Spring Boot Fhir] (camel-example-spring-boot-fhir) | Health Care | An example showing how to work with Camel, FHIR and Spring Boot
 
-| link:camel-example-spring-boot-fhir-auth-tx/readme.adoc[Spring Boot Fhir Auth Tx] (camel-example-spring-boot-fhir-auth-tx) | Health Care | An example showing how to work with Camel, FHIR Authorization, FHIR Transaction and Spring Boot
+| link:spring-boot-fhir-auth-tx/readme.adoc[Spring Boot Fhir Auth Tx] (camel-example-spring-boot-fhir-auth-tx) | Health Care | An example showing how to work with Camel, FHIR Authorization, FHIR Transaction and Spring Boot
     
 
-| link:camel-example-spring-boot-validator/readme.adoc[Validator Spring Boot] (camel-example-spring-boot-validator) | Input/Output Type Contract | An example showing how to work with declarative validation and Spring Boot
+| link:spring-boot-validator/readme.adoc[Validator Spring Boot] (camel-example-spring-boot-validator) | Input/Output Type Contract | An example showing how to work with declarative validation and Spring Boot
 
-| link:camel-example-spring-boot-actuator-http-metrics/readme.adoc[Spring Boot Actuator Http Metrics] (camel-example-spring-boot-actuator-http-metrics) | Management and Monitoring | Example on how to use Spring Boot's Actuator endpoints to gather info like mappings or metrics
+| link:spring-boot-actuator-http-metrics/readme.adoc[Spring Boot Actuator Http Metrics] (camel-example-spring-boot-actuator-http-metrics) | Management and Monitoring | Example on how to use Spring Boot's Actuator endpoints to gather info like mappings or metrics
 
-| link:camel-example-spring-boot-apm-opentracing/README.adoc[OpenTracing APM] (camel-example-spring-boot-apm-opentracing) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with OpenTracing with ElastiCo APM
+| link:spring-boot-apm-opentracing/README.adoc[OpenTracing APM] (camel-example-spring-boot-apm-opentracing) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with OpenTracing with ElastiCo APM
     
 
-| link:camel-example-spring-boot-metrics/README.adoc[Spring Boot Metrics] (camel-example-spring-boot-metrics) | Management and Monitoring | An example showing how to work with Camel and Spring Boot and report metrics to Graphite
+| link:spring-boot-metrics/README.adoc[Spring Boot Metrics] (camel-example-spring-boot-metrics) | Management and Monitoring | An example showing how to work with Camel and Spring Boot and report metrics to Graphite
 
-| link:camel-example-spring-boot-opentracing/README.adoc[OpenTracing] (camel-example-spring-boot-opentracing) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with OpenTracing
+| link:spring-boot-opentracing/README.adoc[OpenTracing] (camel-example-spring-boot-opentracing) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with OpenTracing
     
 
-| link:camel-example-spring-boot-supervising-route-controller/readme.adoc[Spring Boot Supervising Route Controller] (camel-example-spring-boot-supervising-route-controller) | Management and Monitoring | An example showing how to work with Camel's Supervising Route Controller and Spring Boot
+| link:spring-boot-supervising-route-controller/readme.adoc[Spring Boot Supervising Route Controller] (camel-example-spring-boot-supervising-route-controller) | Management and Monitoring | An example showing how to work with Camel's Supervising Route Controller and Spring Boot
 
-| link:camel-example-spring-boot-zipkin/README.adoc[Spring Boot Zipkin] (camel-example-spring-boot-zipkin) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with Zipkin
+| link:spring-boot-zipkin/README.adoc[Spring Boot Zipkin] (camel-example-spring-boot-zipkin) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with Zipkin
 
-| link:camel-example-spring-boot-activemq/readme.adoc[Spring Boot Activemq] (camel-example-spring-boot-activemq) | Messaging | An example showing how to work with Camel, ActiveMQ and Spring Boot
+| link:spring-boot-activemq/readme.adoc[Spring Boot Activemq] (camel-example-spring-boot-activemq) | Messaging | An example showing how to work with Camel, ActiveMQ and Spring Boot
 
-| link:camel-example-spring-boot-amqp/readme.adoc[Spring Boot Amqp] (camel-example-spring-boot-amqp) | Messaging | An example showing how to work with Camel, ActiveMQ Amqp and Spring Boot
+| link:spring-boot-amqp/readme.adoc[Spring Boot Amqp] (camel-example-spring-boot-amqp) | Messaging | An example showing how to work with Camel, ActiveMQ Amqp and Spring Boot
 
 | link:camel-example-spring-boot-kafka-avro/README.adoc[Spring Boot Kafka Avro] (camel-example-spring-boot-kafka-avro) | Messaging | An example for Kafka avro
 
 | link:camel-example-spring-boot-kafka-offsetrepository/README.adoc[Spring Boot Kafka Offsetrepository] (camel-example-spring-boot-kafka-offsetrepository) | Messaging | An example for Kafka offsetrepository
 
-| link:camel-example-spring-boot-rabbitmq/readme.adoc[Spring Boot Rabbitmq] (camel-example-spring-boot-rabbitmq) | Messaging | An example showing how to work with Camel and RabbitMQ
+| link:spring-boot-rabbitmq/readme.adoc[Spring Boot Rabbitmq] (camel-example-spring-boot-rabbitmq) | Messaging | An example showing how to work with Camel and RabbitMQ
 
 | link:camel-example-spring-boot-strimzi/README.adoc[Spring Boot Strimzi] (camel-example-spring-boot-strimzi) | Messaging | Camel example which a route is defined in XML for Strimzi integration on Openshift/Kubernetes
 
-| link:camel-example-spring-boot-widget-gadget/readme.md[Spring Boot Widget Gadget] (camel-example-spring-boot-widget-gadget) | Messaging | The widget and gadget example from EIP book, running on Spring Boot
+| link:spring-boot-widget-gadget/README.adoc[Spring Boot Widget Gadget] (camel-example-spring-boot-widget-gadget) | Messaging | The widget and gadget example from EIP book, running on Spring Boot
 
-| link:camel-example-spring-boot-reactive-streams/readme.adoc[Spring Boot Reactive Streams] (camel-example-spring-boot-reactive-streams) | Reactive | An example that shows how Camel can exchange data using reactive streams with Spring Boot reactor
+| link:spring-boot-reactive-streams/readme.adoc[Spring Boot Reactive Streams] (camel-example-spring-boot-reactive-streams) | Reactive | An example that shows how Camel can exchange data using reactive streams with Spring Boot reactor
     
 
-| link:camel-example-spring-boot-geocoder/README.adoc[Spring Boot Geocoder] (camel-example-spring-boot-geocoder) | Rest | An example showing the Camel Geocoder component via REST DSL with Spring Boot
+| link:spring-boot-geocoder/README.adoc[Spring Boot Geocoder] (camel-example-spring-boot-geocoder) | Rest | An example showing the Camel Geocoder component via REST DSL with Spring Boot
 
-| link:camel-example-spring-boot-rest-openapi/README.adoc[Spring Boot Rest Openapi] (camel-example-spring-boot-rest-openapi) | Rest | An example showing Camel REST DSL and OpenApi with Spring Boot
+| link:spring-boot-rest-openapi/README.adoc[Spring Boot Rest Openapi] (camel-example-spring-boot-rest-openapi) | Rest | An example showing Camel REST DSL and OpenApi with Spring Boot
 
-| link:camel-example-spring-boot-rest-producer/readme.adoc[Spring Boot Rest Producer] (camel-example-spring-boot-rest-producer) | Rest | An example showing how to use Camel Rest to call a REST service
+| link:spring-boot-rest-producer/readme.adoc[Spring Boot Rest Producer] (camel-example-spring-boot-rest-producer) | Rest | An example showing how to use Camel Rest to call a REST service
 
-| link:camel-example-spring-boot-rest-swagger/README.adoc[Spring Boot Rest Swagger] (camel-example-spring-boot-rest-swagger) | Rest | An example showing Camel REST DSL and Swagger with Spring Boot
+| link:spring-boot-rest-swagger/README.adoc[Spring Boot Rest Swagger] (camel-example-spring-boot-rest-swagger) | Rest | An example showing Camel REST DSL and Swagger with Spring Boot
 
 | link:camel-example-spring-boot-twitter-salesforce/README.adoc[Spring Boot Twitter Salesforce] (camel-example-spring-boot-twitter-salesforce) | Social | Twitter mentions is created as contacts in Salesforce
 |===
 // examples: END
 
-== Help and contributions
+=== Help and contributions
 
 If you hit any problem using Camel or have some feedback,
 then please https://camel.apache.org/support.html[let us know].
diff --git a/camel-example-spring-boot-grpc-kubernetes/README.adoc b/camel-example-spring-boot-grpc-kubernetes/README.adoc
index cf32508..bc6df1e 100644
--- a/camel-example-spring-boot-grpc-kubernetes/README.adoc
+++ b/camel-example-spring-boot-grpc-kubernetes/README.adoc
@@ -1,10 +1,10 @@
-# Spring Boot Example with gRPC on Kubernetes
+= Spring Boot Example with gRPC on Kubernetes
 
-= Introduction
+== Introduction
 
 This example demonstrates how you can use Camel-gRPC Starter component. The example is composed of a standalone gRPC server and a Camel Spring-boot gRPC route acting as client. We will run this example on Minikube (0.21.0)
 
-== Server
+=== Server
 
 You can build the server under the directory hello-camel-grpc-server with:
 
@@ -36,7 +36,7 @@
 INFO: Server started. I'm listening on 8080
 ----
 
-== Run the client
+=== Run the client
 
 You can build the client example under the directory hello-camel-grpc-client with:
 
@@ -106,22 +106,26 @@
 
 ----
 
-== Cleanup
+=== Cleanup
 
 Undeploy server and client
-```
+
+[source,bash]
+----
 $ cd hello-camel-grpc-client-kubernetes
 $ mvn -Pkubernetes-install fabric8:undeploy
 $ cd ../hello-camel-grpc-server-kubernetes
 $ mvn -Pkubernetes-install fabric8:undeploy
-```
+----
 Make sure no pod is running
-```
+
+[source,bash]
+----
 $ kubectl get pods
 No resources found.
-```
+----
 
-=== Help and contributions
+==== Help and contributions
 
 If you hit any problem using Camel or have some feedback, 
 then please https://camel.apache.org/support.html[let us know].
diff --git a/camel-example-spring-boot-kafka-avro/README.adoc b/camel-example-spring-boot-kafka-avro/README.adoc
index 189d23d..dca2323 100644
--- a/camel-example-spring-boot-kafka-avro/README.adoc
+++ b/camel-example-spring-boot-kafka-avro/README.adoc
@@ -4,22 +4,30 @@
 
 An example which shows how to integrate Camel with Kafka avro  to make use of avro serialize/deserializer
 
-start confluent schema registry but before this kafka server should be started:
-./bin/schema-registry-start etc/schema-registry/schema-registry.properties
+First a kafka server should be started:
+----
+$ ./bin/schema-registry-start etc/schema-registry/schema-registry.properties
+----
 
-register_schema.py is simple custom python script to register the employee.avsc schema in confluent schema registry
-python3.6 src/main/resources/register_schema.py http://localhost:8081 employees-avro src/main/resources/avro/employee.avsc
+Then start confluent schema registry:
+register_schema.py is simple custom python script to register the employee.avsc schema in confluent schema registry:
+----
+$ python3.6 src/main/resources/register_schema.py http://localhost:8081 employees-avro src/main/resources/avro/employee.avsc
 Schema Registry URL: http://localhost:8081
 Topic: employees-avro
 Schema file: src/main/resources/avro/employee.avsc
 Success
+----
 
-
-[camel-example-kafka-avro]$ curl --noproxy '*' http://localhost:8081/subjects/employees-avro-value/versions/1
+----
+$ curl --noproxy '*' http://localhost:8081/subjects/employees-avro-value/versions/1
 {"subject":"employees-avro-value","version":1,"id":2,"schema":"{\"type\":\"record\",\"name\":\"Employee\",\"namespace\":\"com.example.kafkatutorials\",\"fields\":[{\"name\":\"firstName\",\"type\":\"string\"},{\"name\":\"lastName\",\"type\":\"string\"},{\"name\":\"birthDate\",\"type\":\"long\"}]}"}
+----
 
 To delete:
-curl -X DELETE http://localhost:8081/subjects/topic-value/versions/version-no
+----
+$ curl -X DELETE http://localhost:8081/subjects/topic-value/versions/version-no
+----
 
 === Preparing Kafka
 
diff --git a/camel-example-spring-boot-master/readme.adoc b/camel-example-spring-boot-master/readme.adoc
index 60f44d8..91f0181 100644
--- a/camel-example-spring-boot-master/readme.adoc
+++ b/camel-example-spring-boot-master/readme.adoc
@@ -8,11 +8,11 @@
 
     mvn clean package
 
-2. in a separate shell, run the first camel node
+2. Then run the first camel node:
 
     mvn spring-boot:run
 
-3. in a separate shell, run the second camel node
+3. in a separate shell, run the second camel node:
 
     mvn spring-boot:run
 
diff --git a/camel-example-spring-boot-rest-swagger-simple/README.adoc b/camel-example-spring-boot-rest-swagger-simple/README.adoc
index 213990a..11fca95 100644
--- a/camel-example-spring-boot-rest-swagger-simple/README.adoc
+++ b/camel-example-spring-boot-rest-swagger-simple/README.adoc
@@ -20,7 +20,7 @@
 The example by default uses the PetStore demo hosted on swagger.io and
 invokes the `+getInventory+` operation. You can make it call any API
 that you have Swagger specification for and any operation with simple
-arguments, for instance this retrives a pet from the PetStore demo with
+arguments, for instance this retrieves a pet from the PetStore demo with
 ID `+14+`:
 
 ....
diff --git a/camel-example-spring-boot-webhook/readme.adoc b/camel-example-spring-boot-webhook/readme.adoc
index 6d814d2..99d9665 100644
--- a/camel-example-spring-boot-webhook/readme.adoc
+++ b/camel-example-spring-boot-webhook/readme.adoc
@@ -25,7 +25,7 @@
 In order to use this example from a standard workstation machine, you need it to be exposed to the internet, for the Telegram servers to be
 able to contact it. Moreover, Telegram requires that the endpoint is exposed using *HTTPS*.
 
-The best way to expose your workstation through a internet HTTPS endpoint is using some tunneling tool, like link:https://serveo.net/[Serveo].
+The best way to expose your workstation through a internet HTTPS endpoint is using some tunneling tool, like link:https://github.com/localtunnel/localtunnel[localtunnel] or link:https://serveo.net/[Serveo].
 A more popular option is link:https://ngrok.com/[Ngrok] but HTTPS endpoints currently require a paid subscription.
 
 With Serveo, you can run in a terminal the following command:
@@ -57,9 +57,9 @@
 mvn spring-boot:run
 ----
 
-You can now contat your bot using a Telegram client and you'll see all your messages printed in the console.
+You can now contact your bot using a Telegram client, and you'll see all your messages printed in the console.
 
-What's interesting to notice is that in this example, *the Telegram component is not doing any long polling** to the Telegram API, it's just receiving *push notifications*.
+What's interesting to notice is that in this example, *the Telegram component is not doing any long polling* to the Telegram API, it's just receiving *push notifications*.
 
 === Help and contributions
 
diff --git a/pom.xml b/pom.xml
index e7f667b..820ae34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,53 +35,53 @@
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>camel-example-spring-boot</module>
-		<module>camel-example-spring-boot-activemq</module>
-		<module>camel-example-spring-boot-actuator-http-metrics</module>
-		<module>camel-example-spring-boot-amqp</module>
-		<module>camel-example-spring-boot-apm-opentracing</module>
-		<module>camel-example-spring-boot-arangodb</module>
-		<module>camel-example-spring-boot-aws2-s3</module>
-		<module>camel-example-spring-boot-clustered-route-controller</module>
-		<module>camel-example-spring-boot-fhir</module>
-		<module>camel-example-spring-boot-fhir-auth-tx</module>
-		<module>camel-example-spring-boot-geocoder</module>
-		<module>camel-example-spring-boot-grpc</module>
+		<module>spring-boot</module>
+		<module>spring-boot-activemq</module>
+		<module>spring-boot-actuator-http-metrics</module>
+		<module>spring-boot-amqp</module>
+		<module>spring-boot-apm-opentracing</module>
+		<module>spring-boot-arangodb</module>
+		<module>spring-boot-aws2-s3</module>
+		<module>spring-boot-clustered-route-controller</module>
+		<module>spring-boot-fhir</module>
+		<module>spring-boot-fhir-auth-tx</module>
+		<module>spring-boot-geocoder</module>
+		<module>spring-boot-grpc</module>
 		<module>camel-example-spring-boot-grpc-kubernetes</module>
-		<module>camel-example-spring-boot-health-checks</module>
-		<module>camel-example-spring-boot-hystrix</module>
-		<module>camel-example-spring-boot-infinispan</module>
-		<module>camel-example-spring-boot-jira</module>
+		<module>spring-boot-health-checks</module>
+		<module>spring-boot-hystrix</module>
+		<module>spring-boot-infinispan</module>
+		<module>spring-boot-jira</module>
 		<module>camel-example-spring-boot-kafka-avro</module>
 		<module>camel-example-spring-boot-kafka-offsetrepository</module>
-		<module>camel-example-spring-boot-load-balancer-eip</module>
+		<module>spring-boot-load-balancer-eip</module>
 		<module>camel-example-spring-boot-master</module>
-		<module>camel-example-spring-boot-metrics</module>
-		<module>camel-example-spring-boot-opentracing</module>
-		<module>camel-example-spring-boot-pojo</module>
-		<module>camel-example-spring-boot-rabbitmq</module>
-		<module>camel-example-spring-boot-reactive-streams</module>
-		<module>camel-example-spring-boot-resilience4j</module>
-		<module>camel-example-spring-boot-rest-jpa</module>
-		<module>camel-example-spring-boot-rest-producer</module>
-		<module>camel-example-spring-boot-rest-swagger</module>
+		<module>spring-boot-metrics</module>
+		<module>spring-boot-opentracing</module>
+		<module>spring-boot-pojo</module>
+		<module>spring-boot-rabbitmq</module>
+		<module>spring-boot-reactive-streams</module>
+		<module>spring-boot-resilience4j</module>
+		<module>spring-boot-rest-jpa</module>
+		<module>spring-boot-rest-producer</module>
+		<module>spring-boot-rest-swagger</module>
 		<module>camel-example-spring-boot-rest-swagger-simple</module>
-		<module>camel-example-spring-boot-rest-openapi</module>
-		<module>camel-example-spring-boot-rest-openapi-simple</module>
-		<module>camel-example-spring-boot-routetemplate</module>
-		<module>camel-example-spring-boot-servicecall</module>
-		<module>camel-example-spring-boot-supervising-route-controller</module>
+		<module>spring-boot-rest-openapi</module>
+		<module>spring-boot-rest-openapi-simple</module>
+		<module>spring-boot-routetemplate</module>
+		<module>spring-boot-servicecall</module>
+		<module>spring-boot-supervising-route-controller</module>
 		<module>camel-example-spring-boot-twitter-salesforce</module>
-		<module>camel-example-spring-boot-type-converter</module>
-		<module>camel-example-spring-boot-undertow-spring-security</module>
-		<module>camel-example-spring-boot-validator</module>
+		<module>spring-boot-type-converter</module>
+		<module>spring-boot-undertow-spring-security</module>
+		<module>spring-boot-validator</module>
 		<module>camel-example-spring-boot-webhook</module>
-		<module>camel-example-spring-boot-xml</module>
-		<module>camel-example-spring-boot-zipkin</module>
+		<module>spring-boot-xml</module>
+		<module>spring-boot-zipkin</module>
 		<module>camel-example-spring-boot-strimzi</module>
-		<module>camel-example-spring-boot-splitter-eip</module>
-		<module>camel-example-spring-boot-widget-gadget</module>
-		<module>camel-example-spring-boot-unit-testing</module>
+		<module>spring-boot-splitter-eip</module>
+		<module>spring-boot-widget-gadget</module>
+		<module>spring-boot-unit-testing</module>
 	</modules>
 
 	<properties>
diff --git a/camel-example-spring-boot-activemq/pom.xml b/spring-boot-activemq/pom.xml
similarity index 100%
rename from camel-example-spring-boot-activemq/pom.xml
rename to spring-boot-activemq/pom.xml
diff --git a/camel-example-spring-boot-activemq/readme.adoc b/spring-boot-activemq/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-activemq/readme.adoc
rename to spring-boot-activemq/readme.adoc
diff --git a/camel-example-spring-boot-activemq/src/main/java/sample/camel/SampleAmqApplication.java b/spring-boot-activemq/src/main/java/sample/camel/SampleAmqApplication.java
similarity index 100%
rename from camel-example-spring-boot-activemq/src/main/java/sample/camel/SampleAmqApplication.java
rename to spring-boot-activemq/src/main/java/sample/camel/SampleAmqApplication.java
diff --git a/camel-example-spring-boot-activemq/src/main/java/sample/camel/SampleAutowiredAmqRoute.java b/spring-boot-activemq/src/main/java/sample/camel/SampleAutowiredAmqRoute.java
similarity index 100%
rename from camel-example-spring-boot-activemq/src/main/java/sample/camel/SampleAutowiredAmqRoute.java
rename to spring-boot-activemq/src/main/java/sample/camel/SampleAutowiredAmqRoute.java
diff --git a/camel-example-spring-boot-activemq/src/main/resources/application.properties b/spring-boot-activemq/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-activemq/src/main/resources/application.properties
rename to spring-boot-activemq/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java b/spring-boot-activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java
similarity index 97%
rename from camel-example-spring-boot-activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java
rename to spring-boot-activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java
index 3f31691..7f06fc4 100644
--- a/camel-example-spring-boot-activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java
+++ b/spring-boot-activemq/src/test/java/sample/camel/SampleAmqApplicationTests.java
@@ -24,6 +24,7 @@
 import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
 import org.junit.jupiter.api.Disabled;
 
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -37,7 +38,7 @@
     private CamelContext camelContext;
 
     @Disabled("Requires a running activemq broker")
-//    @Test
+    @Test
     public void shouldProduceMessages() throws Exception {
         MockEndpoint mock = camelContext.getEndpoint("mock:activemq", MockEndpoint.class);
         NotifyBuilder notify = new NotifyBuilder(camelContext).whenDone(1).create();
diff --git a/camel-example-spring-boot-actuator-http-metrics/pom.xml b/spring-boot-actuator-http-metrics/pom.xml
similarity index 100%
rename from camel-example-spring-boot-actuator-http-metrics/pom.xml
rename to spring-boot-actuator-http-metrics/pom.xml
diff --git a/camel-example-spring-boot-actuator-http-metrics/readme.adoc b/spring-boot-actuator-http-metrics/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-actuator-http-metrics/readme.adoc
rename to spring-boot-actuator-http-metrics/readme.adoc
diff --git a/camel-example-spring-boot-actuator-http-metrics/src/main/java/sample/camel/Application.java b/spring-boot-actuator-http-metrics/src/main/java/sample/camel/Application.java
similarity index 100%
rename from camel-example-spring-boot-actuator-http-metrics/src/main/java/sample/camel/Application.java
rename to spring-boot-actuator-http-metrics/src/main/java/sample/camel/Application.java
diff --git a/camel-example-spring-boot-actuator-http-metrics/src/main/java/sample/camel/MyRouteBuilder.java b/spring-boot-actuator-http-metrics/src/main/java/sample/camel/MyRouteBuilder.java
similarity index 100%
rename from camel-example-spring-boot-actuator-http-metrics/src/main/java/sample/camel/MyRouteBuilder.java
rename to spring-boot-actuator-http-metrics/src/main/java/sample/camel/MyRouteBuilder.java
diff --git a/camel-example-spring-boot-actuator-http-metrics/src/main/resources/application.properties b/spring-boot-actuator-http-metrics/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-actuator-http-metrics/src/main/resources/application.properties
rename to spring-boot-actuator-http-metrics/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-amqp/pom.xml b/spring-boot-amqp/pom.xml
similarity index 100%
rename from camel-example-spring-boot-amqp/pom.xml
rename to spring-boot-amqp/pom.xml
diff --git a/camel-example-spring-boot-amqp/readme.adoc b/spring-boot-amqp/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-amqp/readme.adoc
rename to spring-boot-amqp/readme.adoc
diff --git a/camel-example-spring-boot-amqp/src/main/data/ReadMe.txt b/spring-boot-amqp/src/main/data/ReadMe.txt
similarity index 100%
rename from camel-example-spring-boot-amqp/src/main/data/ReadMe.txt
rename to spring-boot-amqp/src/main/data/ReadMe.txt
diff --git a/camel-example-spring-boot-amqp/src/main/java/sample/camel/AmqpConfig.java b/spring-boot-amqp/src/main/java/sample/camel/AmqpConfig.java
similarity index 100%
rename from camel-example-spring-boot-amqp/src/main/java/sample/camel/AmqpConfig.java
rename to spring-boot-amqp/src/main/java/sample/camel/AmqpConfig.java
diff --git a/camel-example-spring-boot-amqp/src/main/java/sample/camel/SampleAmqApplication.java b/spring-boot-amqp/src/main/java/sample/camel/SampleAmqApplication.java
similarity index 100%
rename from camel-example-spring-boot-amqp/src/main/java/sample/camel/SampleAmqApplication.java
rename to spring-boot-amqp/src/main/java/sample/camel/SampleAmqApplication.java
diff --git a/camel-example-spring-boot-amqp/src/main/java/sample/camel/SampleAutowiredAmqpRoute.java b/spring-boot-amqp/src/main/java/sample/camel/SampleAutowiredAmqpRoute.java
similarity index 100%
rename from camel-example-spring-boot-amqp/src/main/java/sample/camel/SampleAutowiredAmqpRoute.java
rename to spring-boot-amqp/src/main/java/sample/camel/SampleAutowiredAmqpRoute.java
diff --git a/camel-example-spring-boot-amqp/src/main/resources/application.properties b/spring-boot-amqp/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-amqp/src/main/resources/application.properties
rename to spring-boot-amqp/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java b/spring-boot-amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java
similarity index 98%
rename from camel-example-spring-boot-amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java
rename to spring-boot-amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java
index 9c6c6fc..56b5a80 100644
--- a/camel-example-spring-boot-amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java
+++ b/spring-boot-amqp/src/test/java/sample/camel/SampleAmqApplicationTests.java
@@ -35,7 +35,7 @@
     private CamelContext camelContext;
 
     @Disabled("Requires a running activemq broker")
-//    @Test
+    @Test
     public void shouldProduceMessages() throws Exception {
         NotifyBuilder notify = new NotifyBuilder(camelContext).whenDone(1).create();
 
diff --git a/camel-example-spring-boot-apm-opentracing/README.adoc b/spring-boot-apm-opentracing/README.adoc
similarity index 99%
rename from camel-example-spring-boot-apm-opentracing/README.adoc
rename to spring-boot-apm-opentracing/README.adoc
index 2638010..71010b0 100644
--- a/camel-example-spring-boot-apm-opentracing/README.adoc
+++ b/spring-boot-apm-opentracing/README.adoc
@@ -28,6 +28,7 @@
 [source,sh]
 ----
 $ mvn compile spring-boot:run
+----
 
 The client application explicitly instantiates and initializes the
 implementation
diff --git a/camel-example-spring-boot-apm-opentracing/pom.xml b/spring-boot-apm-opentracing/pom.xml
similarity index 100%
rename from camel-example-spring-boot-apm-opentracing/pom.xml
rename to spring-boot-apm-opentracing/pom.xml
diff --git a/camel-example-spring-boot-apm-opentracing/src/main/java/sample/camel/CamelConfig.java b/spring-boot-apm-opentracing/src/main/java/sample/camel/CamelConfig.java
similarity index 100%
rename from camel-example-spring-boot-apm-opentracing/src/main/java/sample/camel/CamelConfig.java
rename to spring-boot-apm-opentracing/src/main/java/sample/camel/CamelConfig.java
diff --git a/camel-example-spring-boot-apm-opentracing/src/main/java/sample/camel/CounterBean.java b/spring-boot-apm-opentracing/src/main/java/sample/camel/CounterBean.java
similarity index 100%
rename from camel-example-spring-boot-apm-opentracing/src/main/java/sample/camel/CounterBean.java
rename to spring-boot-apm-opentracing/src/main/java/sample/camel/CounterBean.java
diff --git a/camel-example-spring-boot-apm-opentracing/src/main/java/sample/camel/Service1Application.java b/spring-boot-apm-opentracing/src/main/java/sample/camel/Service1Application.java
similarity index 100%
rename from camel-example-spring-boot-apm-opentracing/src/main/java/sample/camel/Service1Application.java
rename to spring-boot-apm-opentracing/src/main/java/sample/camel/Service1Application.java
diff --git a/camel-example-spring-boot-apm-opentracing/src/main/java/sample/camel/Service1Route.java b/spring-boot-apm-opentracing/src/main/java/sample/camel/Service1Route.java
similarity index 96%
rename from camel-example-spring-boot-apm-opentracing/src/main/java/sample/camel/Service1Route.java
rename to spring-boot-apm-opentracing/src/main/java/sample/camel/Service1Route.java
index fbcb570..4b9f5c4 100644
--- a/camel-example-spring-boot-apm-opentracing/src/main/java/sample/camel/Service1Route.java
+++ b/spring-boot-apm-opentracing/src/main/java/sample/camel/Service1Route.java
@@ -26,7 +26,7 @@
     public void configure() throws Exception {
          from("timer:trigger?exchangePattern=InOut&period=30000").streamCaching()
             .bean("counterBean")
-            .log(" Client request: ${body}")
+            .log("Client request: ${body}")
             .to("http://localhost:9090/service1")
             .log("Client response: ${body}");
 
diff --git a/camel-example-spring-boot-apm-opentracing/src/main/resources/application.properties b/spring-boot-apm-opentracing/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-apm-opentracing/src/main/resources/application.properties
rename to spring-boot-apm-opentracing/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-arangodb/README.adoc b/spring-boot-arangodb/README.adoc
similarity index 100%
rename from camel-example-spring-boot-arangodb/README.adoc
rename to spring-boot-arangodb/README.adoc
diff --git a/camel-example-spring-boot-arangodb/pom.xml b/spring-boot-arangodb/pom.xml
similarity index 100%
rename from camel-example-spring-boot-arangodb/pom.xml
rename to spring-boot-arangodb/pom.xml
diff --git a/camel-example-spring-boot-arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/Application.java b/spring-boot-arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/Application.java
similarity index 100%
rename from camel-example-spring-boot-arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/Application.java
rename to spring-boot-arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/Application.java
diff --git a/camel-example-spring-boot-arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/CamelRoute.java b/spring-boot-arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/CamelRoute.java
similarity index 100%
rename from camel-example-spring-boot-arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/CamelRoute.java
rename to spring-boot-arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/CamelRoute.java
diff --git a/camel-example-spring-boot-arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/MyBeanService.java b/spring-boot-arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/MyBeanService.java
similarity index 100%
rename from camel-example-spring-boot-arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/MyBeanService.java
rename to spring-boot-arangodb/src/main/java/org/apache/camel/example/springboot/arangodb/MyBeanService.java
diff --git a/camel-example-spring-boot-arangodb/src/main/resources/application.properties b/spring-boot-arangodb/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-arangodb/src/main/resources/application.properties
rename to spring-boot-arangodb/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-aws2-s3/README.adoc b/spring-boot-aws2-s3/README.adoc
similarity index 100%
rename from camel-example-spring-boot-aws2-s3/README.adoc
rename to spring-boot-aws2-s3/README.adoc
diff --git a/camel-example-spring-boot-aws2-s3/pom.xml b/spring-boot-aws2-s3/pom.xml
similarity index 100%
rename from camel-example-spring-boot-aws2-s3/pom.xml
rename to spring-boot-aws2-s3/pom.xml
diff --git a/camel-example-spring-boot-aws2-s3/src/main/java/org/apache/camel/example/springboot/aws2s3/Application.java b/spring-boot-aws2-s3/src/main/java/org/apache/camel/example/springboot/aws2s3/Application.java
similarity index 100%
rename from camel-example-spring-boot-aws2-s3/src/main/java/org/apache/camel/example/springboot/aws2s3/Application.java
rename to spring-boot-aws2-s3/src/main/java/org/apache/camel/example/springboot/aws2s3/Application.java
diff --git a/camel-example-spring-boot-aws2-s3/src/main/java/org/apache/camel/example/springboot/aws2s3/CamelRoute.java b/spring-boot-aws2-s3/src/main/java/org/apache/camel/example/springboot/aws2s3/CamelRoute.java
similarity index 100%
rename from camel-example-spring-boot-aws2-s3/src/main/java/org/apache/camel/example/springboot/aws2s3/CamelRoute.java
rename to spring-boot-aws2-s3/src/main/java/org/apache/camel/example/springboot/aws2s3/CamelRoute.java
diff --git a/camel-example-spring-boot-aws2-s3/src/main/resources/application.properties b/spring-boot-aws2-s3/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-aws2-s3/src/main/resources/application.properties
rename to spring-boot-aws2-s3/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-aws2-s3/src/main/resources/logback.xml b/spring-boot-aws2-s3/src/main/resources/logback.xml
similarity index 100%
rename from camel-example-spring-boot-aws2-s3/src/main/resources/logback.xml
rename to spring-boot-aws2-s3/src/main/resources/logback.xml
diff --git a/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/pom.xml b/spring-boot-clustered-route-controller/cluster-bootstrap/pom.xml
similarity index 100%
rename from camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/pom.xml
rename to spring-boot-clustered-route-controller/cluster-bootstrap/pom.xml
diff --git a/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/src/main/java/org/apache/camel/examples/cluster/ClusterBootstrap.java b/spring-boot-clustered-route-controller/cluster-bootstrap/src/main/java/org/apache/camel/examples/cluster/ClusterBootstrap.java
similarity index 100%
rename from camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/src/main/java/org/apache/camel/examples/cluster/ClusterBootstrap.java
rename to spring-boot-clustered-route-controller/cluster-bootstrap/src/main/java/org/apache/camel/examples/cluster/ClusterBootstrap.java
diff --git a/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/src/main/java/org/apache/camel/examples/cluster/ClusterBootstrapConfiguration.java b/spring-boot-clustered-route-controller/cluster-bootstrap/src/main/java/org/apache/camel/examples/cluster/ClusterBootstrapConfiguration.java
similarity index 100%
rename from camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/src/main/java/org/apache/camel/examples/cluster/ClusterBootstrapConfiguration.java
rename to spring-boot-clustered-route-controller/cluster-bootstrap/src/main/java/org/apache/camel/examples/cluster/ClusterBootstrapConfiguration.java
diff --git a/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/src/main/resources/application.properties b/spring-boot-clustered-route-controller/cluster-bootstrap/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/src/main/resources/application.properties
rename to spring-boot-clustered-route-controller/cluster-bootstrap/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml b/spring-boot-clustered-route-controller/cluster-node/pom.xml
similarity index 100%
rename from camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml
rename to spring-boot-clustered-route-controller/cluster-node/pom.xml
diff --git a/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/java/org/apache/camel/examples/cluster/ClusterNode.java b/spring-boot-clustered-route-controller/cluster-node/src/main/java/org/apache/camel/examples/cluster/ClusterNode.java
similarity index 100%
rename from camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/java/org/apache/camel/examples/cluster/ClusterNode.java
rename to spring-boot-clustered-route-controller/cluster-node/src/main/java/org/apache/camel/examples/cluster/ClusterNode.java
diff --git a/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/java/org/apache/camel/examples/cluster/ClusterNodeConfiguration.java b/spring-boot-clustered-route-controller/cluster-node/src/main/java/org/apache/camel/examples/cluster/ClusterNodeConfiguration.java
similarity index 100%
rename from camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/java/org/apache/camel/examples/cluster/ClusterNodeConfiguration.java
rename to spring-boot-clustered-route-controller/cluster-node/src/main/java/org/apache/camel/examples/cluster/ClusterNodeConfiguration.java
diff --git a/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties b/spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
rename to spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-clustered-route-controller/pom.xml b/spring-boot-clustered-route-controller/pom.xml
similarity index 100%
rename from camel-example-spring-boot-clustered-route-controller/pom.xml
rename to spring-boot-clustered-route-controller/pom.xml
diff --git a/camel-example-spring-boot-clustered-route-controller/readme.adoc b/spring-boot-clustered-route-controller/readme.adoc
similarity index 99%
rename from camel-example-spring-boot-clustered-route-controller/readme.adoc
rename to spring-boot-clustered-route-controller/readme.adoc
index ffcbf70..6bf0749 100644
--- a/camel-example-spring-boot-clustered-route-controller/readme.adoc
+++ b/spring-boot-clustered-route-controller/readme.adoc
@@ -5,6 +5,7 @@
 === How to run
 
 1. build the project:
+
     mvn clean package
 
 2. in a shell, run the cluster node
diff --git a/camel-example-spring-boot-fhir-auth-tx/pom.xml b/spring-boot-fhir-auth-tx/pom.xml
similarity index 100%
rename from camel-example-spring-boot-fhir-auth-tx/pom.xml
rename to spring-boot-fhir-auth-tx/pom.xml
diff --git a/camel-example-spring-boot-fhir-auth-tx/readme.adoc b/spring-boot-fhir-auth-tx/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-fhir-auth-tx/readme.adoc
rename to spring-boot-fhir-auth-tx/readme.adoc
diff --git a/camel-example-spring-boot-fhir-auth-tx/src/main/data/patients.csv b/spring-boot-fhir-auth-tx/src/main/data/patients.csv
similarity index 100%
rename from camel-example-spring-boot-fhir-auth-tx/src/main/data/patients.csv
rename to spring-boot-fhir-auth-tx/src/main/data/patients.csv
diff --git a/camel-example-spring-boot-fhir-auth-tx/src/main/java/sample/camel/MyCamelApplication.java b/spring-boot-fhir-auth-tx/src/main/java/sample/camel/MyCamelApplication.java
similarity index 100%
rename from camel-example-spring-boot-fhir-auth-tx/src/main/java/sample/camel/MyCamelApplication.java
rename to spring-boot-fhir-auth-tx/src/main/java/sample/camel/MyCamelApplication.java
diff --git a/camel-example-spring-boot-fhir-auth-tx/src/main/java/sample/camel/MyCamelRouter.java b/spring-boot-fhir-auth-tx/src/main/java/sample/camel/MyCamelRouter.java
similarity index 100%
rename from camel-example-spring-boot-fhir-auth-tx/src/main/java/sample/camel/MyCamelRouter.java
rename to spring-boot-fhir-auth-tx/src/main/java/sample/camel/MyCamelRouter.java
diff --git a/camel-example-spring-boot-fhir-auth-tx/src/main/resources/application.properties b/spring-boot-fhir-auth-tx/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-fhir-auth-tx/src/main/resources/application.properties
rename to spring-boot-fhir-auth-tx/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-fhir-auth-tx/src/test/java/sample/camel/MyCamelApplicationTest.java b/spring-boot-fhir-auth-tx/src/test/java/sample/camel/MyCamelApplicationTest.java
similarity index 100%
rename from camel-example-spring-boot-fhir-auth-tx/src/test/java/sample/camel/MyCamelApplicationTest.java
rename to spring-boot-fhir-auth-tx/src/test/java/sample/camel/MyCamelApplicationTest.java
diff --git a/camel-example-spring-boot-fhir/pom.xml b/spring-boot-fhir/pom.xml
similarity index 100%
rename from camel-example-spring-boot-fhir/pom.xml
rename to spring-boot-fhir/pom.xml
diff --git a/camel-example-spring-boot-fhir/readme.adoc b/spring-boot-fhir/readme.adoc
similarity index 94%
rename from camel-example-spring-boot-fhir/readme.adoc
rename to spring-boot-fhir/readme.adoc
index a8ee54a..d216a78 100644
--- a/camel-example-spring-boot-fhir/readme.adoc
+++ b/spring-boot-fhir/readme.adoc
@@ -9,7 +9,7 @@
 This example will read HL7V2 patients from a directory and convert them to FHIR dtsu3 patients and upload them to a configured FHIR server. 
 
 The example assumes you have a running FHIR server at your disposal.
-You may use https://github.com/jamesagnew/hapi-fhir/tree/master/hapi-fhir-jpaserver-example[hapi-fhir-jpa-server-example].
+You may use https://github.com/Zorking/hapi-fhir-jpaserver-example[hapi-fhir-jpaserver-example].
 
 By default, the example uses `\http://localhost:8080/baseDstu3` as the FHIR server URL, DSTU3 as the FHIR version and `target/work/fhir/input`
 as the directory to look for HL7V2 patients.
diff --git a/camel-example-spring-boot-fhir/src/main/data/hl7v2.patient b/spring-boot-fhir/src/main/data/hl7v2.patient
similarity index 100%
rename from camel-example-spring-boot-fhir/src/main/data/hl7v2.patient
rename to spring-boot-fhir/src/main/data/hl7v2.patient
Binary files differ
diff --git a/camel-example-spring-boot-fhir/src/main/java/sample/camel/MyCamelApplication.java b/spring-boot-fhir/src/main/java/sample/camel/MyCamelApplication.java
similarity index 100%
rename from camel-example-spring-boot-fhir/src/main/java/sample/camel/MyCamelApplication.java
rename to spring-boot-fhir/src/main/java/sample/camel/MyCamelApplication.java
diff --git a/camel-example-spring-boot-fhir/src/main/java/sample/camel/MyCamelRouter.java b/spring-boot-fhir/src/main/java/sample/camel/MyCamelRouter.java
similarity index 100%
rename from camel-example-spring-boot-fhir/src/main/java/sample/camel/MyCamelRouter.java
rename to spring-boot-fhir/src/main/java/sample/camel/MyCamelRouter.java
diff --git a/camel-example-spring-boot-fhir/src/main/resources/application.properties b/spring-boot-fhir/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-fhir/src/main/resources/application.properties
rename to spring-boot-fhir/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-fhir/src/test/java/sample/camel/MyCamelApplicationTest.java b/spring-boot-fhir/src/test/java/sample/camel/MyCamelApplicationTest.java
similarity index 100%
rename from camel-example-spring-boot-fhir/src/test/java/sample/camel/MyCamelApplicationTest.java
rename to spring-boot-fhir/src/test/java/sample/camel/MyCamelApplicationTest.java
diff --git a/camel-example-spring-boot-geocoder/README.adoc b/spring-boot-geocoder/README.adoc
similarity index 100%
rename from camel-example-spring-boot-geocoder/README.adoc
rename to spring-boot-geocoder/README.adoc
diff --git a/camel-example-spring-boot-geocoder/pom.xml b/spring-boot-geocoder/pom.xml
similarity index 100%
rename from camel-example-spring-boot-geocoder/pom.xml
rename to spring-boot-geocoder/pom.xml
diff --git a/camel-example-spring-boot-geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/Application.java b/spring-boot-geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/Application.java
similarity index 100%
rename from camel-example-spring-boot-geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/Application.java
rename to spring-boot-geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/Application.java
diff --git a/camel-example-spring-boot-geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java b/spring-boot-geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java
similarity index 100%
rename from camel-example-spring-boot-geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java
rename to spring-boot-geocoder/src/main/java/org/apache/camel/example/springboot/geocoder/CamelGeocoderRoute.java
diff --git a/camel-example-spring-boot-geocoder/src/main/resources/application.properties b/spring-boot-geocoder/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-geocoder/src/main/resources/application.properties
rename to spring-boot-geocoder/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-geocoder/src/test/java/org/apache/camel/example/springboot/geocoder/ApplicationTest.java b/spring-boot-geocoder/src/test/java/org/apache/camel/example/springboot/geocoder/ApplicationTest.java
similarity index 100%
rename from camel-example-spring-boot-geocoder/src/test/java/org/apache/camel/example/springboot/geocoder/ApplicationTest.java
rename to spring-boot-geocoder/src/test/java/org/apache/camel/example/springboot/geocoder/ApplicationTest.java
diff --git a/camel-example-spring-boot-grpc/README.adoc b/spring-boot-grpc/README.adoc
similarity index 100%
rename from camel-example-spring-boot-grpc/README.adoc
rename to spring-boot-grpc/README.adoc
diff --git a/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml b/spring-boot-grpc/hello-camel-grpc-client/pom.xml
similarity index 100%
rename from camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml
rename to spring-boot-grpc/hello-camel-grpc-client/pom.xml
diff --git a/camel-example-spring-boot-grpc/hello-camel-grpc-client/src/main/java/org/apache/camel/example/springboot/grpc/Application.java b/spring-boot-grpc/hello-camel-grpc-client/src/main/java/org/apache/camel/example/springboot/grpc/Application.java
similarity index 100%
rename from camel-example-spring-boot-grpc/hello-camel-grpc-client/src/main/java/org/apache/camel/example/springboot/grpc/Application.java
rename to spring-boot-grpc/hello-camel-grpc-client/src/main/java/org/apache/camel/example/springboot/grpc/Application.java
diff --git a/camel-example-spring-boot-grpc/hello-camel-grpc-client/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java b/spring-boot-grpc/hello-camel-grpc-client/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
similarity index 100%
rename from camel-example-spring-boot-grpc/hello-camel-grpc-client/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
rename to spring-boot-grpc/hello-camel-grpc-client/src/main/java/org/apache/camel/example/springboot/grpc/CamelGrpcRoute.java
diff --git a/camel-example-spring-boot-grpc/hello-camel-grpc-client/src/main/proto/hellocamel.proto b/spring-boot-grpc/hello-camel-grpc-client/src/main/proto/hellocamel.proto
similarity index 100%
rename from camel-example-spring-boot-grpc/hello-camel-grpc-client/src/main/proto/hellocamel.proto
rename to spring-boot-grpc/hello-camel-grpc-client/src/main/proto/hellocamel.proto
diff --git a/camel-example-spring-boot-grpc/hello-camel-grpc-client/src/main/resources/application.properties b/spring-boot-grpc/hello-camel-grpc-client/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-grpc/hello-camel-grpc-client/src/main/resources/application.properties
rename to spring-boot-grpc/hello-camel-grpc-client/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml b/spring-boot-grpc/hello-camel-grpc-server/pom.xml
similarity index 100%
rename from camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
rename to spring-boot-grpc/hello-camel-grpc-server/pom.xml
diff --git a/camel-example-spring-boot-grpc/hello-camel-grpc-server/src/main/java/org/apache/camel/examples/grpc/HelloCamelServer.java b/spring-boot-grpc/hello-camel-grpc-server/src/main/java/org/apache/camel/examples/grpc/HelloCamelServer.java
similarity index 100%
rename from camel-example-spring-boot-grpc/hello-camel-grpc-server/src/main/java/org/apache/camel/examples/grpc/HelloCamelServer.java
rename to spring-boot-grpc/hello-camel-grpc-server/src/main/java/org/apache/camel/examples/grpc/HelloCamelServer.java
diff --git a/camel-example-spring-boot-grpc/hello-camel-grpc-server/src/main/proto/hellocamel.proto b/spring-boot-grpc/hello-camel-grpc-server/src/main/proto/hellocamel.proto
similarity index 100%
rename from camel-example-spring-boot-grpc/hello-camel-grpc-server/src/main/proto/hellocamel.proto
rename to spring-boot-grpc/hello-camel-grpc-server/src/main/proto/hellocamel.proto
diff --git a/camel-example-spring-boot-grpc/pom.xml b/spring-boot-grpc/pom.xml
similarity index 100%
rename from camel-example-spring-boot-grpc/pom.xml
rename to spring-boot-grpc/pom.xml
diff --git a/camel-example-spring-boot-health-checks/pom.xml b/spring-boot-health-checks/pom.xml
similarity index 100%
rename from camel-example-spring-boot-health-checks/pom.xml
rename to spring-boot-health-checks/pom.xml
diff --git a/camel-example-spring-boot-health-checks/readme.adoc b/spring-boot-health-checks/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-health-checks/readme.adoc
rename to spring-boot-health-checks/readme.adoc
diff --git a/camel-example-spring-boot-health-checks/src/main/java/sample/camel/Application.java b/spring-boot-health-checks/src/main/java/sample/camel/Application.java
similarity index 100%
rename from camel-example-spring-boot-health-checks/src/main/java/sample/camel/Application.java
rename to spring-boot-health-checks/src/main/java/sample/camel/Application.java
diff --git a/camel-example-spring-boot-health-checks/src/main/java/sample/camel/MonkeyHealthCheck.java b/spring-boot-health-checks/src/main/java/sample/camel/MonkeyHealthCheck.java
similarity index 100%
rename from camel-example-spring-boot-health-checks/src/main/java/sample/camel/MonkeyHealthCheck.java
rename to spring-boot-health-checks/src/main/java/sample/camel/MonkeyHealthCheck.java
diff --git a/camel-example-spring-boot-health-checks/src/main/java/sample/camel/MyConfiguration.java b/spring-boot-health-checks/src/main/java/sample/camel/MyConfiguration.java
similarity index 100%
rename from camel-example-spring-boot-health-checks/src/main/java/sample/camel/MyConfiguration.java
rename to spring-boot-health-checks/src/main/java/sample/camel/MyConfiguration.java
diff --git a/camel-example-spring-boot-health-checks/src/main/java/sample/camel/MyRouteBuilder.java b/spring-boot-health-checks/src/main/java/sample/camel/MyRouteBuilder.java
similarity index 100%
rename from camel-example-spring-boot-health-checks/src/main/java/sample/camel/MyRouteBuilder.java
rename to spring-boot-health-checks/src/main/java/sample/camel/MyRouteBuilder.java
diff --git a/camel-example-spring-boot-health-checks/src/main/resources/application.properties b/spring-boot-health-checks/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-health-checks/src/main/resources/application.properties
rename to spring-boot-health-checks/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-hystrix/README.adoc b/spring-boot-hystrix/README.adoc
similarity index 96%
rename from camel-example-spring-boot-hystrix/README.adoc
rename to spring-boot-hystrix/README.adoc
index 255de39..ff7a74c 100644
--- a/camel-example-spring-boot-hystrix/README.adoc
+++ b/spring-boot-hystrix/README.adoc
@@ -74,7 +74,7 @@
 The stream is accessible from the client at:
 `+http://localhost:8080/hystrix.stream+` which you can add as stream to
 the web console and then you should see the circuit breakers. In the
-screen shot below, we have just stopped service1, so the Hystrix EIP
+screenshot below, we have just stopped service1, so the Hystrix EIP
 will execute the fallback via network, which is calling service2
 instead. If you start service 1 again then the Hystrix EIP should go
 back to green again.
diff --git a/camel-example-spring-boot-hystrix/client/pom.xml b/spring-boot-hystrix/client/pom.xml
similarity index 100%
rename from camel-example-spring-boot-hystrix/client/pom.xml
rename to spring-boot-hystrix/client/pom.xml
diff --git a/camel-example-spring-boot-hystrix/client/src/main/java/sample/camel/ClientApplication.java b/spring-boot-hystrix/client/src/main/java/sample/camel/ClientApplication.java
similarity index 100%
rename from camel-example-spring-boot-hystrix/client/src/main/java/sample/camel/ClientApplication.java
rename to spring-boot-hystrix/client/src/main/java/sample/camel/ClientApplication.java
diff --git a/camel-example-spring-boot-hystrix/client/src/main/java/sample/camel/ClientRoute.java b/spring-boot-hystrix/client/src/main/java/sample/camel/ClientRoute.java
similarity index 100%
rename from camel-example-spring-boot-hystrix/client/src/main/java/sample/camel/ClientRoute.java
rename to spring-boot-hystrix/client/src/main/java/sample/camel/ClientRoute.java
diff --git a/camel-example-spring-boot-hystrix/client/src/main/java/sample/camel/CounterBean.java b/spring-boot-hystrix/client/src/main/java/sample/camel/CounterBean.java
similarity index 100%
rename from camel-example-spring-boot-hystrix/client/src/main/java/sample/camel/CounterBean.java
rename to spring-boot-hystrix/client/src/main/java/sample/camel/CounterBean.java
diff --git a/camel-example-spring-boot-hystrix/client/src/main/resources/META-INF/LICENSE.txt b/spring-boot-hystrix/client/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-hystrix/client/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-hystrix/client/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-hystrix/client/src/main/resources/META-INF/NOTICE.txt b/spring-boot-hystrix/client/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-hystrix/client/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-hystrix/client/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-hystrix/client/src/main/resources/META-INF/beans.xml b/spring-boot-hystrix/client/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from camel-example-spring-boot-hystrix/client/src/main/resources/META-INF/beans.xml
rename to spring-boot-hystrix/client/src/main/resources/META-INF/beans.xml
diff --git a/camel-example-spring-boot-hystrix/client/src/main/resources/application.properties b/spring-boot-hystrix/client/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-hystrix/client/src/main/resources/application.properties
rename to spring-boot-hystrix/client/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-hystrix/client/src/main/resources/log4j2.properties b/spring-boot-hystrix/client/src/main/resources/log4j2.properties
similarity index 100%
rename from camel-example-spring-boot-hystrix/client/src/main/resources/log4j2.properties
rename to spring-boot-hystrix/client/src/main/resources/log4j2.properties
diff --git a/camel-example-spring-boot-hystrix/images/hystrix-web-console.png b/spring-boot-hystrix/images/hystrix-web-console.png
similarity index 100%
rename from camel-example-spring-boot-hystrix/images/hystrix-web-console.png
rename to spring-boot-hystrix/images/hystrix-web-console.png
Binary files differ
diff --git a/camel-example-spring-boot-hystrix/pom.xml b/spring-boot-hystrix/pom.xml
similarity index 100%
rename from camel-example-spring-boot-hystrix/pom.xml
rename to spring-boot-hystrix/pom.xml
diff --git a/camel-example-spring-boot-hystrix/service1/pom.xml b/spring-boot-hystrix/service1/pom.xml
similarity index 100%
rename from camel-example-spring-boot-hystrix/service1/pom.xml
rename to spring-boot-hystrix/service1/pom.xml
diff --git a/camel-example-spring-boot-hystrix/service1/src/main/java/sample/camel/Service1Application.java b/spring-boot-hystrix/service1/src/main/java/sample/camel/Service1Application.java
similarity index 100%
rename from camel-example-spring-boot-hystrix/service1/src/main/java/sample/camel/Service1Application.java
rename to spring-boot-hystrix/service1/src/main/java/sample/camel/Service1Application.java
diff --git a/camel-example-spring-boot-hystrix/service1/src/main/java/sample/camel/Service1Route.java b/spring-boot-hystrix/service1/src/main/java/sample/camel/Service1Route.java
similarity index 100%
rename from camel-example-spring-boot-hystrix/service1/src/main/java/sample/camel/Service1Route.java
rename to spring-boot-hystrix/service1/src/main/java/sample/camel/Service1Route.java
diff --git a/camel-example-spring-boot-hystrix/service1/src/main/resources/META-INF/LICENSE.txt b/spring-boot-hystrix/service1/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-hystrix/service1/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-hystrix/service1/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-hystrix/service1/src/main/resources/META-INF/NOTICE.txt b/spring-boot-hystrix/service1/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-hystrix/service1/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-hystrix/service1/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-hystrix/service1/src/main/resources/application.properties b/spring-boot-hystrix/service1/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-hystrix/service1/src/main/resources/application.properties
rename to spring-boot-hystrix/service1/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-hystrix/service2/pom.xml b/spring-boot-hystrix/service2/pom.xml
similarity index 100%
rename from camel-example-spring-boot-hystrix/service2/pom.xml
rename to spring-boot-hystrix/service2/pom.xml
diff --git a/camel-example-spring-boot-hystrix/service2/src/main/java/sample/camel/Service2Application.java b/spring-boot-hystrix/service2/src/main/java/sample/camel/Service2Application.java
similarity index 100%
rename from camel-example-spring-boot-hystrix/service2/src/main/java/sample/camel/Service2Application.java
rename to spring-boot-hystrix/service2/src/main/java/sample/camel/Service2Application.java
diff --git a/camel-example-spring-boot-hystrix/service2/src/main/java/sample/camel/Service2Route.java b/spring-boot-hystrix/service2/src/main/java/sample/camel/Service2Route.java
similarity index 100%
rename from camel-example-spring-boot-hystrix/service2/src/main/java/sample/camel/Service2Route.java
rename to spring-boot-hystrix/service2/src/main/java/sample/camel/Service2Route.java
diff --git a/camel-example-spring-boot-hystrix/service2/src/main/resources/META-INF/LICENSE.txt b/spring-boot-hystrix/service2/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-hystrix/service2/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-hystrix/service2/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-hystrix/service2/src/main/resources/META-INF/NOTICE.txt b/spring-boot-hystrix/service2/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-hystrix/service2/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-hystrix/service2/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-hystrix/service2/src/main/resources/log4j2.properties b/spring-boot-hystrix/service2/src/main/resources/log4j2.properties
similarity index 100%
rename from camel-example-spring-boot-hystrix/service2/src/main/resources/log4j2.properties
rename to spring-boot-hystrix/service2/src/main/resources/log4j2.properties
diff --git a/camel-example-spring-boot-infinispan/README.adoc b/spring-boot-infinispan/README.adoc
similarity index 100%
rename from camel-example-spring-boot-infinispan/README.adoc
rename to spring-boot-infinispan/README.adoc
diff --git a/camel-example-spring-boot-infinispan/pom.xml b/spring-boot-infinispan/pom.xml
similarity index 100%
rename from camel-example-spring-boot-infinispan/pom.xml
rename to spring-boot-infinispan/pom.xml
diff --git a/camel-example-spring-boot-infinispan/src/main/java/org/apache/camel/example/springboot/infinispan/Application.java b/spring-boot-infinispan/src/main/java/org/apache/camel/example/springboot/infinispan/Application.java
similarity index 100%
rename from camel-example-spring-boot-infinispan/src/main/java/org/apache/camel/example/springboot/infinispan/Application.java
rename to spring-boot-infinispan/src/main/java/org/apache/camel/example/springboot/infinispan/Application.java
diff --git a/camel-example-spring-boot-infinispan/src/main/java/org/apache/camel/example/springboot/infinispan/CamelInfinispanRoute.java b/spring-boot-infinispan/src/main/java/org/apache/camel/example/springboot/infinispan/CamelInfinispanRoute.java
similarity index 100%
rename from camel-example-spring-boot-infinispan/src/main/java/org/apache/camel/example/springboot/infinispan/CamelInfinispanRoute.java
rename to spring-boot-infinispan/src/main/java/org/apache/camel/example/springboot/infinispan/CamelInfinispanRoute.java
diff --git a/camel-example-spring-boot-infinispan/src/main/resources/application.properties b/spring-boot-infinispan/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-infinispan/src/main/resources/application.properties
rename to spring-boot-infinispan/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-jira/README.adoc b/spring-boot-jira/README.adoc
similarity index 100%
rename from camel-example-spring-boot-jira/README.adoc
rename to spring-boot-jira/README.adoc
diff --git a/camel-example-spring-boot-jira/pom.xml b/spring-boot-jira/pom.xml
similarity index 100%
rename from camel-example-spring-boot-jira/pom.xml
rename to spring-boot-jira/pom.xml
diff --git a/camel-example-spring-boot-jira/src/main/java/org/apache/camel/example/jira/AddIssueRoute.java b/spring-boot-jira/src/main/java/org/apache/camel/example/jira/AddIssueRoute.java
similarity index 100%
rename from camel-example-spring-boot-jira/src/main/java/org/apache/camel/example/jira/AddIssueRoute.java
rename to spring-boot-jira/src/main/java/org/apache/camel/example/jira/AddIssueRoute.java
diff --git a/camel-example-spring-boot-jira/src/main/java/org/apache/camel/example/jira/Application.java b/spring-boot-jira/src/main/java/org/apache/camel/example/jira/Application.java
similarity index 100%
rename from camel-example-spring-boot-jira/src/main/java/org/apache/camel/example/jira/Application.java
rename to spring-boot-jira/src/main/java/org/apache/camel/example/jira/Application.java
diff --git a/camel-example-spring-boot-jira/src/main/java/org/apache/camel/example/jira/AttachFileRoute.java b/spring-boot-jira/src/main/java/org/apache/camel/example/jira/AttachFileRoute.java
similarity index 100%
rename from camel-example-spring-boot-jira/src/main/java/org/apache/camel/example/jira/AttachFileRoute.java
rename to spring-boot-jira/src/main/java/org/apache/camel/example/jira/AttachFileRoute.java
diff --git a/camel-example-spring-boot-jira/src/main/java/org/apache/camel/example/jira/NewCommentsRoute.java b/spring-boot-jira/src/main/java/org/apache/camel/example/jira/NewCommentsRoute.java
similarity index 100%
rename from camel-example-spring-boot-jira/src/main/java/org/apache/camel/example/jira/NewCommentsRoute.java
rename to spring-boot-jira/src/main/java/org/apache/camel/example/jira/NewCommentsRoute.java
diff --git a/camel-example-spring-boot-jira/src/main/resources/application.properties b/spring-boot-jira/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-jira/src/main/resources/application.properties
rename to spring-boot-jira/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-jira/src/main/resources/logback.xml b/spring-boot-jira/src/main/resources/logback.xml
similarity index 100%
rename from camel-example-spring-boot-jira/src/main/resources/logback.xml
rename to spring-boot-jira/src/main/resources/logback.xml
diff --git a/camel-example-spring-boot-load-balancer-eip/README.adoc b/spring-boot-load-balancer-eip/README.adoc
similarity index 100%
rename from camel-example-spring-boot-load-balancer-eip/README.adoc
rename to spring-boot-load-balancer-eip/README.adoc
diff --git a/camel-example-spring-boot-load-balancer-eip/pom.xml b/spring-boot-load-balancer-eip/pom.xml
similarity index 100%
rename from camel-example-spring-boot-load-balancer-eip/pom.xml
rename to spring-boot-load-balancer-eip/pom.xml
diff --git a/camel-example-spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/Application.java b/spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/Application.java
similarity index 100%
rename from camel-example-spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/Application.java
rename to spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/Application.java
diff --git a/camel-example-spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/CustomLoadBalancer.java b/spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/CustomLoadBalancer.java
similarity index 100%
rename from camel-example-spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/CustomLoadBalancer.java
rename to spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/CustomLoadBalancer.java
diff --git a/camel-example-spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/LoadBalancerEIPRouter.java b/spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/LoadBalancerEIPRouter.java
similarity index 100%
rename from camel-example-spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/LoadBalancerEIPRouter.java
rename to spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/LoadBalancerEIPRouter.java
diff --git a/camel-example-spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/MyException.java b/spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/MyException.java
similarity index 100%
rename from camel-example-spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/MyException.java
rename to spring-boot-load-balancer-eip/src/main/java/org/apache/camel/springboot/example/MyException.java
diff --git a/camel-example-spring-boot-load-balancer-eip/src/main/resources/application.properties b/spring-boot-load-balancer-eip/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-load-balancer-eip/src/main/resources/application.properties
rename to spring-boot-load-balancer-eip/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-load-balancer-eip/src/test/java/org/apache/camel/springboot/example/LoadBalancerEIPTest.java b/spring-boot-load-balancer-eip/src/test/java/org/apache/camel/springboot/example/LoadBalancerEIPTest.java
similarity index 100%
rename from camel-example-spring-boot-load-balancer-eip/src/test/java/org/apache/camel/springboot/example/LoadBalancerEIPTest.java
rename to spring-boot-load-balancer-eip/src/test/java/org/apache/camel/springboot/example/LoadBalancerEIPTest.java
diff --git a/camel-example-spring-boot-metrics/README.adoc b/spring-boot-metrics/README.adoc
similarity index 95%
rename from camel-example-spring-boot-metrics/README.adoc
rename to spring-boot-metrics/README.adoc
index 1763342..20ec9cf 100644
--- a/camel-example-spring-boot-metrics/README.adoc
+++ b/spring-boot-metrics/README.adoc
@@ -23,7 +23,7 @@
 java -jar target/camel-example-spring-boot-metrics.jar
 ....
 
-You will see logging from the ``Fast'' and ``Slow'' routes, and metrics
+You will see logging from the 'Fast' and 'Slow' routes, and metrics
 will be sent to Graphite (or nc) every 5 seconds.
 
 === Configuration
diff --git a/camel-example-spring-boot-metrics/pom.xml b/spring-boot-metrics/pom.xml
similarity index 100%
rename from camel-example-spring-boot-metrics/pom.xml
rename to spring-boot-metrics/pom.xml
diff --git a/camel-example-spring-boot-metrics/src/main/java/org/apache/camel/example/spring/boot/metrics/Application.java b/spring-boot-metrics/src/main/java/org/apache/camel/example/spring/boot/metrics/Application.java
similarity index 100%
rename from camel-example-spring-boot-metrics/src/main/java/org/apache/camel/example/spring/boot/metrics/Application.java
rename to spring-boot-metrics/src/main/java/org/apache/camel/example/spring/boot/metrics/Application.java
diff --git a/camel-example-spring-boot-metrics/src/main/resources/application.properties b/spring-boot-metrics/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-metrics/src/main/resources/application.properties
rename to spring-boot-metrics/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-opentracing/README.adoc b/spring-boot-opentracing/README.adoc
similarity index 100%
rename from camel-example-spring-boot-opentracing/README.adoc
rename to spring-boot-opentracing/README.adoc
diff --git a/camel-example-spring-boot-opentracing/client/pom.xml b/spring-boot-opentracing/client/pom.xml
similarity index 100%
rename from camel-example-spring-boot-opentracing/client/pom.xml
rename to spring-boot-opentracing/client/pom.xml
diff --git a/camel-example-spring-boot-opentracing/client/src/main/java/sample/camel/ClientApplication.java b/spring-boot-opentracing/client/src/main/java/sample/camel/ClientApplication.java
similarity index 100%
rename from camel-example-spring-boot-opentracing/client/src/main/java/sample/camel/ClientApplication.java
rename to spring-boot-opentracing/client/src/main/java/sample/camel/ClientApplication.java
diff --git a/camel-example-spring-boot-opentracing/client/src/main/java/sample/camel/ClientRoute.java b/spring-boot-opentracing/client/src/main/java/sample/camel/ClientRoute.java
similarity index 100%
rename from camel-example-spring-boot-opentracing/client/src/main/java/sample/camel/ClientRoute.java
rename to spring-boot-opentracing/client/src/main/java/sample/camel/ClientRoute.java
diff --git a/camel-example-spring-boot-opentracing/client/src/main/java/sample/camel/CounterBean.java b/spring-boot-opentracing/client/src/main/java/sample/camel/CounterBean.java
similarity index 100%
rename from camel-example-spring-boot-opentracing/client/src/main/java/sample/camel/CounterBean.java
rename to spring-boot-opentracing/client/src/main/java/sample/camel/CounterBean.java
diff --git a/camel-example-spring-boot-opentracing/client/src/main/resources/META-INF/LICENSE.txt b/spring-boot-opentracing/client/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-opentracing/client/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-opentracing/client/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-opentracing/client/src/main/resources/META-INF/NOTICE.txt b/spring-boot-opentracing/client/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-opentracing/client/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-opentracing/client/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-opentracing/client/src/main/resources/META-INF/beans.xml b/spring-boot-opentracing/client/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from camel-example-spring-boot-opentracing/client/src/main/resources/META-INF/beans.xml
rename to spring-boot-opentracing/client/src/main/resources/META-INF/beans.xml
diff --git a/camel-example-spring-boot-opentracing/client/src/main/resources/log4j2.properties b/spring-boot-opentracing/client/src/main/resources/log4j2.properties
similarity index 100%
rename from camel-example-spring-boot-opentracing/client/src/main/resources/log4j2.properties
rename to spring-boot-opentracing/client/src/main/resources/log4j2.properties
diff --git a/camel-example-spring-boot-opentracing/loggingtracer/pom.xml b/spring-boot-opentracing/loggingtracer/pom.xml
similarity index 100%
rename from camel-example-spring-boot-opentracing/loggingtracer/pom.xml
rename to spring-boot-opentracing/loggingtracer/pom.xml
diff --git a/camel-example-spring-boot-opentracing/loggingtracer/src/main/java/sample/opentracing/logging/LoggingTracer.java b/spring-boot-opentracing/loggingtracer/src/main/java/sample/opentracing/logging/LoggingTracer.java
similarity index 100%
rename from camel-example-spring-boot-opentracing/loggingtracer/src/main/java/sample/opentracing/logging/LoggingTracer.java
rename to spring-boot-opentracing/loggingtracer/src/main/java/sample/opentracing/logging/LoggingTracer.java
diff --git a/camel-example-spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/LICENSE.txt b/spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/NOTICE.txt b/spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/beans.xml b/spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from camel-example-spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/beans.xml
rename to spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/beans.xml
diff --git a/camel-example-spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/services/io.opentracing.Tracer b/spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/services/io.opentracing.Tracer
similarity index 100%
rename from camel-example-spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/services/io.opentracing.Tracer
rename to spring-boot-opentracing/loggingtracer/src/main/resources/META-INF/services/io.opentracing.Tracer
diff --git a/camel-example-spring-boot-opentracing/loggingtracer/src/main/resources/log4j2.properties b/spring-boot-opentracing/loggingtracer/src/main/resources/log4j2.properties
similarity index 100%
rename from camel-example-spring-boot-opentracing/loggingtracer/src/main/resources/log4j2.properties
rename to spring-boot-opentracing/loggingtracer/src/main/resources/log4j2.properties
diff --git a/camel-example-spring-boot-opentracing/pom.xml b/spring-boot-opentracing/pom.xml
similarity index 100%
rename from camel-example-spring-boot-opentracing/pom.xml
rename to spring-boot-opentracing/pom.xml
diff --git a/camel-example-spring-boot-opentracing/service1/pom.xml b/spring-boot-opentracing/service1/pom.xml
similarity index 100%
rename from camel-example-spring-boot-opentracing/service1/pom.xml
rename to spring-boot-opentracing/service1/pom.xml
diff --git a/camel-example-spring-boot-opentracing/service1/src/main/java/sample/camel/Service1Application.java b/spring-boot-opentracing/service1/src/main/java/sample/camel/Service1Application.java
similarity index 100%
rename from camel-example-spring-boot-opentracing/service1/src/main/java/sample/camel/Service1Application.java
rename to spring-boot-opentracing/service1/src/main/java/sample/camel/Service1Application.java
diff --git a/camel-example-spring-boot-opentracing/service1/src/main/java/sample/camel/Service1Route.java b/spring-boot-opentracing/service1/src/main/java/sample/camel/Service1Route.java
similarity index 100%
rename from camel-example-spring-boot-opentracing/service1/src/main/java/sample/camel/Service1Route.java
rename to spring-boot-opentracing/service1/src/main/java/sample/camel/Service1Route.java
diff --git a/camel-example-spring-boot-opentracing/service1/src/main/resources/META-INF/LICENSE.txt b/spring-boot-opentracing/service1/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-opentracing/service1/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-opentracing/service1/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-opentracing/service1/src/main/resources/META-INF/NOTICE.txt b/spring-boot-opentracing/service1/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-opentracing/service1/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-opentracing/service1/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-opentracing/service1/src/main/resources/application.properties b/spring-boot-opentracing/service1/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-opentracing/service1/src/main/resources/application.properties
rename to spring-boot-opentracing/service1/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-opentracing/service2/pom.xml b/spring-boot-opentracing/service2/pom.xml
similarity index 100%
rename from camel-example-spring-boot-opentracing/service2/pom.xml
rename to spring-boot-opentracing/service2/pom.xml
diff --git a/camel-example-spring-boot-opentracing/service2/src/main/java/sample/camel/Service2Application.java b/spring-boot-opentracing/service2/src/main/java/sample/camel/Service2Application.java
similarity index 100%
rename from camel-example-spring-boot-opentracing/service2/src/main/java/sample/camel/Service2Application.java
rename to spring-boot-opentracing/service2/src/main/java/sample/camel/Service2Application.java
diff --git a/camel-example-spring-boot-opentracing/service2/src/main/java/sample/camel/Service2Route.java b/spring-boot-opentracing/service2/src/main/java/sample/camel/Service2Route.java
similarity index 100%
rename from camel-example-spring-boot-opentracing/service2/src/main/java/sample/camel/Service2Route.java
rename to spring-boot-opentracing/service2/src/main/java/sample/camel/Service2Route.java
diff --git a/camel-example-spring-boot-opentracing/service2/src/main/resources/META-INF/LICENSE.txt b/spring-boot-opentracing/service2/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-opentracing/service2/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-opentracing/service2/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-opentracing/service2/src/main/resources/META-INF/NOTICE.txt b/spring-boot-opentracing/service2/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-opentracing/service2/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-opentracing/service2/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-opentracing/service2/src/main/resources/log4j2.properties b/spring-boot-opentracing/service2/src/main/resources/log4j2.properties
similarity index 100%
rename from camel-example-spring-boot-opentracing/service2/src/main/resources/log4j2.properties
rename to spring-boot-opentracing/service2/src/main/resources/log4j2.properties
diff --git a/camel-example-spring-boot-pojo/README.adoc b/spring-boot-pojo/README.adoc
similarity index 100%
rename from camel-example-spring-boot-pojo/README.adoc
rename to spring-boot-pojo/README.adoc
diff --git a/camel-example-spring-boot-pojo/pom.xml b/spring-boot-pojo/pom.xml
similarity index 100%
rename from camel-example-spring-boot-pojo/pom.xml
rename to spring-boot-pojo/pom.xml
diff --git a/camel-example-spring-boot-pojo/src/main/java/sample/camel/Application.java b/spring-boot-pojo/src/main/java/sample/camel/Application.java
similarity index 100%
rename from camel-example-spring-boot-pojo/src/main/java/sample/camel/Application.java
rename to spring-boot-pojo/src/main/java/sample/camel/Application.java
diff --git a/camel-example-spring-boot-pojo/src/main/java/sample/camel/MagicNumber.java b/spring-boot-pojo/src/main/java/sample/camel/MagicNumber.java
similarity index 100%
rename from camel-example-spring-boot-pojo/src/main/java/sample/camel/MagicNumber.java
rename to spring-boot-pojo/src/main/java/sample/camel/MagicNumber.java
diff --git a/camel-example-spring-boot-pojo/src/main/java/sample/camel/NumberPojo.java b/spring-boot-pojo/src/main/java/sample/camel/NumberPojo.java
similarity index 100%
rename from camel-example-spring-boot-pojo/src/main/java/sample/camel/NumberPojo.java
rename to spring-boot-pojo/src/main/java/sample/camel/NumberPojo.java
diff --git a/camel-example-spring-boot-pojo/src/main/java/sample/camel/NumberRoute.java b/spring-boot-pojo/src/main/java/sample/camel/NumberRoute.java
similarity index 100%
rename from camel-example-spring-boot-pojo/src/main/java/sample/camel/NumberRoute.java
rename to spring-boot-pojo/src/main/java/sample/camel/NumberRoute.java
diff --git a/camel-example-spring-boot-pojo/src/main/resources/application.properties b/spring-boot-pojo/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-pojo/src/main/resources/application.properties
rename to spring-boot-pojo/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-rabbitmq/pom.xml b/spring-boot-rabbitmq/pom.xml
similarity index 100%
rename from camel-example-spring-boot-rabbitmq/pom.xml
rename to spring-boot-rabbitmq/pom.xml
diff --git a/camel-example-spring-boot-rabbitmq/readme.adoc b/spring-boot-rabbitmq/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-rabbitmq/readme.adoc
rename to spring-boot-rabbitmq/readme.adoc
diff --git a/camel-example-spring-boot-rabbitmq/src/main/java/sample/camel/SampleCamelApplication.java b/spring-boot-rabbitmq/src/main/java/sample/camel/SampleCamelApplication.java
similarity index 100%
rename from camel-example-spring-boot-rabbitmq/src/main/java/sample/camel/SampleCamelApplication.java
rename to spring-boot-rabbitmq/src/main/java/sample/camel/SampleCamelApplication.java
diff --git a/camel-example-spring-boot-rabbitmq/src/main/java/sample/camel/SampleCamelRouter.java b/spring-boot-rabbitmq/src/main/java/sample/camel/SampleCamelRouter.java
similarity index 100%
rename from camel-example-spring-boot-rabbitmq/src/main/java/sample/camel/SampleCamelRouter.java
rename to spring-boot-rabbitmq/src/main/java/sample/camel/SampleCamelRouter.java
diff --git a/camel-example-spring-boot-rabbitmq/src/main/resources/application.properties b/spring-boot-rabbitmq/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-rabbitmq/src/main/resources/application.properties
rename to spring-boot-rabbitmq/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-reactive-streams/pom.xml b/spring-boot-reactive-streams/pom.xml
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/pom.xml
rename to spring-boot-reactive-streams/pom.xml
diff --git a/camel-example-spring-boot-reactive-streams/readme.adoc b/spring-boot-reactive-streams/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/readme.adoc
rename to spring-boot-reactive-streams/readme.adoc
diff --git a/camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicCamelToReactorExample.java b/spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicCamelToReactorExample.java
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicCamelToReactorExample.java
rename to spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicCamelToReactorExample.java
diff --git a/camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicCamelToReactorInOutExample.java b/spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicCamelToReactorInOutExample.java
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicCamelToReactorInOutExample.java
rename to spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicCamelToReactorInOutExample.java
diff --git a/camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicReactorToCamelExample.java b/spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicReactorToCamelExample.java
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicReactorToCamelExample.java
rename to spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicReactorToCamelExample.java
diff --git a/camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicReactorToCamelInOutExample.java b/spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicReactorToCamelInOutExample.java
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicReactorToCamelInOutExample.java
rename to spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/BasicReactorToCamelInOutExample.java
diff --git a/camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/ClientAPIRestExample.java b/spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/ClientAPIRestExample.java
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/ClientAPIRestExample.java
rename to spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/ClientAPIRestExample.java
diff --git a/camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/ClientAPIWorkflowExample.java b/spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/ClientAPIWorkflowExample.java
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/ClientAPIWorkflowExample.java
rename to spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/ClientAPIWorkflowExample.java
diff --git a/camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/RestExample.java b/spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/RestExample.java
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/RestExample.java
rename to spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/RestExample.java
diff --git a/camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/app/ReactiveStreamsSpringBootApp.java b/spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/app/ReactiveStreamsSpringBootApp.java
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/app/ReactiveStreamsSpringBootApp.java
rename to spring-boot-reactive-streams/src/main/java/org/apache/camel/example/reactive/streams/app/ReactiveStreamsSpringBootApp.java
diff --git a/camel-example-spring-boot-reactive-streams/src/main/resources/META-INF/LICENSE.txt b/spring-boot-reactive-streams/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-reactive-streams/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-reactive-streams/src/main/resources/META-INF/NOTICE.txt b/spring-boot-reactive-streams/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-reactive-streams/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-reactive-streams/src/main/resources/META-INF/spring.factories b/spring-boot-reactive-streams/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/src/main/resources/META-INF/spring.factories
rename to spring-boot-reactive-streams/src/main/resources/META-INF/spring.factories
diff --git a/camel-example-spring-boot-reactive-streams/src/main/resources/application.yml b/spring-boot-reactive-streams/src/main/resources/application.yml
similarity index 100%
rename from camel-example-spring-boot-reactive-streams/src/main/resources/application.yml
rename to spring-boot-reactive-streams/src/main/resources/application.yml
diff --git a/camel-example-spring-boot-resilience4j/README.adoc b/spring-boot-resilience4j/README.adoc
similarity index 100%
rename from camel-example-spring-boot-resilience4j/README.adoc
rename to spring-boot-resilience4j/README.adoc
diff --git a/camel-example-spring-boot-resilience4j/client/pom.xml b/spring-boot-resilience4j/client/pom.xml
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client/pom.xml
rename to spring-boot-resilience4j/client/pom.xml
diff --git a/camel-example-spring-boot-resilience4j/client/src/main/java/sample/camel/ClientApplication.java b/spring-boot-resilience4j/client/src/main/java/sample/camel/ClientApplication.java
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client/src/main/java/sample/camel/ClientApplication.java
rename to spring-boot-resilience4j/client/src/main/java/sample/camel/ClientApplication.java
diff --git a/camel-example-spring-boot-resilience4j/client/src/main/java/sample/camel/ClientRoute.java b/spring-boot-resilience4j/client/src/main/java/sample/camel/ClientRoute.java
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client/src/main/java/sample/camel/ClientRoute.java
rename to spring-boot-resilience4j/client/src/main/java/sample/camel/ClientRoute.java
diff --git a/camel-example-spring-boot-resilience4j/client/src/main/java/sample/camel/CounterBean.java b/spring-boot-resilience4j/client/src/main/java/sample/camel/CounterBean.java
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client/src/main/java/sample/camel/CounterBean.java
rename to spring-boot-resilience4j/client/src/main/java/sample/camel/CounterBean.java
diff --git a/camel-example-spring-boot-resilience4j/client/src/main/resources/META-INF/LICENSE.txt b/spring-boot-resilience4j/client/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-resilience4j/client/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-resilience4j/client/src/main/resources/META-INF/NOTICE.txt b/spring-boot-resilience4j/client/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-resilience4j/client/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-resilience4j/client/src/main/resources/META-INF/beans.xml b/spring-boot-resilience4j/client/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client/src/main/resources/META-INF/beans.xml
rename to spring-boot-resilience4j/client/src/main/resources/META-INF/beans.xml
diff --git a/camel-example-spring-boot-resilience4j/client/src/main/resources/application.properties b/spring-boot-resilience4j/client/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client/src/main/resources/application.properties
rename to spring-boot-resilience4j/client/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-resilience4j/client/src/main/resources/log4j2.properties b/spring-boot-resilience4j/client/src/main/resources/log4j2.properties
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client/src/main/resources/log4j2.properties
rename to spring-boot-resilience4j/client/src/main/resources/log4j2.properties
diff --git a/camel-example-spring-boot-resilience4j/client2/pom.xml b/spring-boot-resilience4j/client2/pom.xml
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client2/pom.xml
rename to spring-boot-resilience4j/client2/pom.xml
diff --git a/camel-example-spring-boot-resilience4j/client2/src/main/java/sample/camel/Client2Application.java b/spring-boot-resilience4j/client2/src/main/java/sample/camel/Client2Application.java
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client2/src/main/java/sample/camel/Client2Application.java
rename to spring-boot-resilience4j/client2/src/main/java/sample/camel/Client2Application.java
diff --git a/camel-example-spring-boot-resilience4j/client2/src/main/java/sample/camel/Client2Route.java b/spring-boot-resilience4j/client2/src/main/java/sample/camel/Client2Route.java
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client2/src/main/java/sample/camel/Client2Route.java
rename to spring-boot-resilience4j/client2/src/main/java/sample/camel/Client2Route.java
diff --git a/camel-example-spring-boot-resilience4j/client2/src/main/java/sample/camel/CounterBean.java b/spring-boot-resilience4j/client2/src/main/java/sample/camel/CounterBean.java
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client2/src/main/java/sample/camel/CounterBean.java
rename to spring-boot-resilience4j/client2/src/main/java/sample/camel/CounterBean.java
diff --git a/camel-example-spring-boot-resilience4j/client2/src/main/resources/META-INF/LICENSE.txt b/spring-boot-resilience4j/client2/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client2/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-resilience4j/client2/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-resilience4j/client2/src/main/resources/META-INF/NOTICE.txt b/spring-boot-resilience4j/client2/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client2/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-resilience4j/client2/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-resilience4j/client2/src/main/resources/META-INF/beans.xml b/spring-boot-resilience4j/client2/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client2/src/main/resources/META-INF/beans.xml
rename to spring-boot-resilience4j/client2/src/main/resources/META-INF/beans.xml
diff --git a/camel-example-spring-boot-resilience4j/client2/src/main/resources/application.properties b/spring-boot-resilience4j/client2/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client2/src/main/resources/application.properties
rename to spring-boot-resilience4j/client2/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-resilience4j/client2/src/main/resources/log4j2.properties b/spring-boot-resilience4j/client2/src/main/resources/log4j2.properties
similarity index 100%
rename from camel-example-spring-boot-resilience4j/client2/src/main/resources/log4j2.properties
rename to spring-boot-resilience4j/client2/src/main/resources/log4j2.properties
diff --git a/camel-example-spring-boot-resilience4j/pom.xml b/spring-boot-resilience4j/pom.xml
similarity index 100%
rename from camel-example-spring-boot-resilience4j/pom.xml
rename to spring-boot-resilience4j/pom.xml
diff --git a/camel-example-spring-boot-resilience4j/service1/pom.xml b/spring-boot-resilience4j/service1/pom.xml
similarity index 100%
rename from camel-example-spring-boot-resilience4j/service1/pom.xml
rename to spring-boot-resilience4j/service1/pom.xml
diff --git a/camel-example-spring-boot-resilience4j/service1/src/main/java/sample/camel/Service1Application.java b/spring-boot-resilience4j/service1/src/main/java/sample/camel/Service1Application.java
similarity index 100%
rename from camel-example-spring-boot-resilience4j/service1/src/main/java/sample/camel/Service1Application.java
rename to spring-boot-resilience4j/service1/src/main/java/sample/camel/Service1Application.java
diff --git a/camel-example-spring-boot-resilience4j/service1/src/main/java/sample/camel/Service1Route.java b/spring-boot-resilience4j/service1/src/main/java/sample/camel/Service1Route.java
similarity index 100%
rename from camel-example-spring-boot-resilience4j/service1/src/main/java/sample/camel/Service1Route.java
rename to spring-boot-resilience4j/service1/src/main/java/sample/camel/Service1Route.java
diff --git a/camel-example-spring-boot-resilience4j/service1/src/main/resources/META-INF/LICENSE.txt b/spring-boot-resilience4j/service1/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-resilience4j/service1/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-resilience4j/service1/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-resilience4j/service1/src/main/resources/META-INF/NOTICE.txt b/spring-boot-resilience4j/service1/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-resilience4j/service1/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-resilience4j/service1/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-resilience4j/service1/src/main/resources/application.properties b/spring-boot-resilience4j/service1/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-resilience4j/service1/src/main/resources/application.properties
rename to spring-boot-resilience4j/service1/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-resilience4j/service2/pom.xml b/spring-boot-resilience4j/service2/pom.xml
similarity index 100%
rename from camel-example-spring-boot-resilience4j/service2/pom.xml
rename to spring-boot-resilience4j/service2/pom.xml
diff --git a/camel-example-spring-boot-resilience4j/service2/src/main/java/sample/camel/Service2Application.java b/spring-boot-resilience4j/service2/src/main/java/sample/camel/Service2Application.java
similarity index 100%
rename from camel-example-spring-boot-resilience4j/service2/src/main/java/sample/camel/Service2Application.java
rename to spring-boot-resilience4j/service2/src/main/java/sample/camel/Service2Application.java
diff --git a/camel-example-spring-boot-resilience4j/service2/src/main/java/sample/camel/Service2Route.java b/spring-boot-resilience4j/service2/src/main/java/sample/camel/Service2Route.java
similarity index 100%
rename from camel-example-spring-boot-resilience4j/service2/src/main/java/sample/camel/Service2Route.java
rename to spring-boot-resilience4j/service2/src/main/java/sample/camel/Service2Route.java
diff --git a/camel-example-spring-boot-resilience4j/service2/src/main/resources/META-INF/LICENSE.txt b/spring-boot-resilience4j/service2/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-resilience4j/service2/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-resilience4j/service2/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-resilience4j/service2/src/main/resources/META-INF/NOTICE.txt b/spring-boot-resilience4j/service2/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-resilience4j/service2/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-resilience4j/service2/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-resilience4j/service2/src/main/resources/log4j2.properties b/spring-boot-resilience4j/service2/src/main/resources/log4j2.properties
similarity index 100%
rename from camel-example-spring-boot-resilience4j/service2/src/main/resources/log4j2.properties
rename to spring-boot-resilience4j/service2/src/main/resources/log4j2.properties
diff --git a/camel-example-spring-boot-rest-jpa/README.adoc b/spring-boot-rest-jpa/README.adoc
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/README.adoc
rename to spring-boot-rest-jpa/README.adoc
diff --git a/camel-example-spring-boot-rest-jpa/pom.xml b/spring-boot-rest-jpa/pom.xml
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/pom.xml
rename to spring-boot-rest-jpa/pom.xml
diff --git a/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java b/spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
rename to spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Application.java
diff --git a/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Book.java b/spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Book.java
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Book.java
rename to spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Book.java
diff --git a/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/BookRepository.java b/spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/BookRepository.java
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/BookRepository.java
rename to spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/BookRepository.java
diff --git a/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Database.java b/spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Database.java
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Database.java
rename to spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Database.java
diff --git a/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Order.java b/spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Order.java
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Order.java
rename to spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/Order.java
diff --git a/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderRepository.java b/spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderRepository.java
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderRepository.java
rename to spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderRepository.java
diff --git a/camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderService.java b/spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderService.java
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderService.java
rename to spring-boot-rest-jpa/src/main/java/org/apache/camel/example/spring/boot/rest/jpa/OrderService.java
diff --git a/camel-example-spring-boot-rest-jpa/src/main/resources/application-dev.yml b/spring-boot-rest-jpa/src/main/resources/application-dev.yml
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/src/main/resources/application-dev.yml
rename to spring-boot-rest-jpa/src/main/resources/application-dev.yml
diff --git a/camel-example-spring-boot-rest-jpa/src/main/resources/application.yml b/spring-boot-rest-jpa/src/main/resources/application.yml
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/src/main/resources/application.yml
rename to spring-boot-rest-jpa/src/main/resources/application.yml
diff --git a/camel-example-spring-boot-rest-jpa/src/main/resources/data.sql b/spring-boot-rest-jpa/src/main/resources/data.sql
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/src/main/resources/data.sql
rename to spring-boot-rest-jpa/src/main/resources/data.sql
diff --git a/camel-example-spring-boot-rest-jpa/src/test/java/org/apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java b/spring-boot-rest-jpa/src/test/java/org/apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/src/test/java/org/apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java
rename to spring-boot-rest-jpa/src/test/java/org/apache/camel/example/spring/boot/rest/jpa/ApplicationTest.java
diff --git a/camel-example-spring-boot-rest-jpa/src/test/resources/application.yml b/spring-boot-rest-jpa/src/test/resources/application.yml
similarity index 100%
rename from camel-example-spring-boot-rest-jpa/src/test/resources/application.yml
rename to spring-boot-rest-jpa/src/test/resources/application.yml
diff --git a/camel-example-spring-boot-rest-openapi-simple/README.adoc b/spring-boot-rest-openapi-simple/README.adoc
similarity index 100%
rename from camel-example-spring-boot-rest-openapi-simple/README.adoc
rename to spring-boot-rest-openapi-simple/README.adoc
diff --git a/camel-example-spring-boot-rest-openapi-simple/pom.xml b/spring-boot-rest-openapi-simple/pom.xml
similarity index 100%
rename from camel-example-spring-boot-rest-openapi-simple/pom.xml
rename to spring-boot-rest-openapi-simple/pom.xml
diff --git a/camel-example-spring-boot-rest-openapi-simple/src/main/java/org/apache/camel/example/RestOpenApiApplication.java b/spring-boot-rest-openapi-simple/src/main/java/org/apache/camel/example/RestOpenApiApplication.java
similarity index 100%
rename from camel-example-spring-boot-rest-openapi-simple/src/main/java/org/apache/camel/example/RestOpenApiApplication.java
rename to spring-boot-rest-openapi-simple/src/main/java/org/apache/camel/example/RestOpenApiApplication.java
diff --git a/camel-example-spring-boot-rest-openapi/README.adoc b/spring-boot-rest-openapi/README.adoc
similarity index 100%
rename from camel-example-spring-boot-rest-openapi/README.adoc
rename to spring-boot-rest-openapi/README.adoc
diff --git a/camel-example-spring-boot-rest-openapi/pom.xml b/spring-boot-rest-openapi/pom.xml
similarity index 100%
rename from camel-example-spring-boot-rest-openapi/pom.xml
rename to spring-boot-rest-openapi/pom.xml
diff --git a/camel-example-spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/Application.java b/spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/Application.java
similarity index 100%
rename from camel-example-spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/Application.java
rename to spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/Application.java
diff --git a/camel-example-spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/CamelRouter.java b/spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
similarity index 100%
rename from camel-example-spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
rename to spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
diff --git a/camel-example-spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/User.java b/spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/User.java
similarity index 100%
rename from camel-example-spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/User.java
rename to spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/User.java
diff --git a/camel-example-spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/UserService.java b/spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/UserService.java
similarity index 100%
rename from camel-example-spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/UserService.java
rename to spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/UserService.java
diff --git a/camel-example-spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/UserServiceImpl.java b/spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/UserServiceImpl.java
similarity index 100%
rename from camel-example-spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/UserServiceImpl.java
rename to spring-boot-rest-openapi/src/main/java/org/apache/camel/example/springboot/UserServiceImpl.java
diff --git a/camel-example-spring-boot-rest-openapi/src/main/resources/application.properties b/spring-boot-rest-openapi/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-rest-openapi/src/main/resources/application.properties
rename to spring-boot-rest-openapi/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-rest-producer/pom.xml b/spring-boot-rest-producer/pom.xml
similarity index 100%
rename from camel-example-spring-boot-rest-producer/pom.xml
rename to spring-boot-rest-producer/pom.xml
diff --git a/camel-example-spring-boot-rest-producer/readme.adoc b/spring-boot-rest-producer/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-rest-producer/readme.adoc
rename to spring-boot-rest-producer/readme.adoc
diff --git a/camel-example-spring-boot-rest-producer/src/main/java/sample/camel/PetController.java b/spring-boot-rest-producer/src/main/java/sample/camel/PetController.java
similarity index 100%
rename from camel-example-spring-boot-rest-producer/src/main/java/sample/camel/PetController.java
rename to spring-boot-rest-producer/src/main/java/sample/camel/PetController.java
diff --git a/camel-example-spring-boot-rest-producer/src/main/java/sample/camel/RestApplication.java b/spring-boot-rest-producer/src/main/java/sample/camel/RestApplication.java
similarity index 100%
rename from camel-example-spring-boot-rest-producer/src/main/java/sample/camel/RestApplication.java
rename to spring-boot-rest-producer/src/main/java/sample/camel/RestApplication.java
diff --git a/camel-example-spring-boot-rest-producer/src/main/java/sample/camel/RestRoute.java b/spring-boot-rest-producer/src/main/java/sample/camel/RestRoute.java
similarity index 100%
rename from camel-example-spring-boot-rest-producer/src/main/java/sample/camel/RestRoute.java
rename to spring-boot-rest-producer/src/main/java/sample/camel/RestRoute.java
diff --git a/camel-example-spring-boot-rest-producer/src/main/resources/application.properties b/spring-boot-rest-producer/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-rest-producer/src/main/resources/application.properties
rename to spring-boot-rest-producer/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-rest-swagger/README.adoc b/spring-boot-rest-swagger/README.adoc
similarity index 100%
rename from camel-example-spring-boot-rest-swagger/README.adoc
rename to spring-boot-rest-swagger/README.adoc
diff --git a/camel-example-spring-boot-rest-swagger/pom.xml b/spring-boot-rest-swagger/pom.xml
similarity index 100%
rename from camel-example-spring-boot-rest-swagger/pom.xml
rename to spring-boot-rest-swagger/pom.xml
diff --git a/camel-example-spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/Application.java b/spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/Application.java
similarity index 100%
rename from camel-example-spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/Application.java
rename to spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/Application.java
diff --git a/camel-example-spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/CamelRouter.java b/spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
similarity index 100%
rename from camel-example-spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
rename to spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/CamelRouter.java
diff --git a/camel-example-spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/User.java b/spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/User.java
similarity index 100%
rename from camel-example-spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/User.java
rename to spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/User.java
diff --git a/camel-example-spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/UserService.java b/spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/UserService.java
similarity index 100%
rename from camel-example-spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/UserService.java
rename to spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/UserService.java
diff --git a/camel-example-spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/UserServiceImpl.java b/spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/UserServiceImpl.java
similarity index 100%
rename from camel-example-spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/UserServiceImpl.java
rename to spring-boot-rest-swagger/src/main/java/org/apache/camel/example/springboot/UserServiceImpl.java
diff --git a/camel-example-spring-boot-rest-swagger/src/main/resources/application.properties b/spring-boot-rest-swagger/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-rest-swagger/src/main/resources/application.properties
rename to spring-boot-rest-swagger/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-routetemplate/pom.xml b/spring-boot-routetemplate/pom.xml
similarity index 100%
rename from camel-example-spring-boot-routetemplate/pom.xml
rename to spring-boot-routetemplate/pom.xml
diff --git a/camel-example-spring-boot-routetemplate/readme.adoc b/spring-boot-routetemplate/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-routetemplate/readme.adoc
rename to spring-boot-routetemplate/readme.adoc
diff --git a/camel-example-spring-boot-routetemplate/src/main/java/sample/camel/MyCamelApplication.java b/spring-boot-routetemplate/src/main/java/sample/camel/MyCamelApplication.java
similarity index 100%
rename from camel-example-spring-boot-routetemplate/src/main/java/sample/camel/MyCamelApplication.java
rename to spring-boot-routetemplate/src/main/java/sample/camel/MyCamelApplication.java
diff --git a/camel-example-spring-boot-routetemplate/src/main/java/sample/camel/MyRouteTemplates.java b/spring-boot-routetemplate/src/main/java/sample/camel/MyRouteTemplates.java
similarity index 100%
rename from camel-example-spring-boot-routetemplate/src/main/java/sample/camel/MyRouteTemplates.java
rename to spring-boot-routetemplate/src/main/java/sample/camel/MyRouteTemplates.java
diff --git a/camel-example-spring-boot-routetemplate/src/main/java/sample/camel/MyTemplateBuilder.java b/spring-boot-routetemplate/src/main/java/sample/camel/MyTemplateBuilder.java
similarity index 100%
rename from camel-example-spring-boot-routetemplate/src/main/java/sample/camel/MyTemplateBuilder.java
rename to spring-boot-routetemplate/src/main/java/sample/camel/MyTemplateBuilder.java
diff --git a/camel-example-spring-boot-routetemplate/src/main/resources/application.properties b/spring-boot-routetemplate/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-routetemplate/src/main/resources/application.properties
rename to spring-boot-routetemplate/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-routetemplate/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java b/spring-boot-routetemplate/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java
similarity index 100%
rename from camel-example-spring-boot-routetemplate/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java
rename to spring-boot-routetemplate/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java
diff --git a/camel-example-spring-boot-servicecall/README.adoc b/spring-boot-servicecall/README.adoc
similarity index 100%
rename from camel-example-spring-boot-servicecall/README.adoc
rename to spring-boot-servicecall/README.adoc
diff --git a/camel-example-spring-boot-servicecall/consumer/pom.xml b/spring-boot-servicecall/consumer/pom.xml
similarity index 100%
rename from camel-example-spring-boot-servicecall/consumer/pom.xml
rename to spring-boot-servicecall/consumer/pom.xml
diff --git a/camel-example-spring-boot-servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerApplication.java b/spring-boot-servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerApplication.java
similarity index 100%
rename from camel-example-spring-boot-servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerApplication.java
rename to spring-boot-servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerApplication.java
diff --git a/camel-example-spring-boot-servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerAutoConfiguration.java b/spring-boot-servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerAutoConfiguration.java
similarity index 100%
rename from camel-example-spring-boot-servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerAutoConfiguration.java
rename to spring-boot-servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerAutoConfiguration.java
diff --git a/camel-example-spring-boot-servicecall/consumer/src/main/resources/application.properties b/spring-boot-servicecall/consumer/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-servicecall/consumer/src/main/resources/application.properties
rename to spring-boot-servicecall/consumer/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-servicecall/consumer/src/main/resources/logback.xml b/spring-boot-servicecall/consumer/src/main/resources/logback.xml
similarity index 100%
rename from camel-example-spring-boot-servicecall/consumer/src/main/resources/logback.xml
rename to spring-boot-servicecall/consumer/src/main/resources/logback.xml
diff --git a/camel-example-spring-boot-servicecall/pom.xml b/spring-boot-servicecall/pom.xml
similarity index 100%
rename from camel-example-spring-boot-servicecall/pom.xml
rename to spring-boot-servicecall/pom.xml
diff --git a/camel-example-spring-boot-servicecall/services/pom.xml b/spring-boot-servicecall/services/pom.xml
similarity index 100%
rename from camel-example-spring-boot-servicecall/services/pom.xml
rename to spring-boot-servicecall/services/pom.xml
diff --git a/camel-example-spring-boot-servicecall/services/src/main/bash/consul-run-linux.sh b/spring-boot-servicecall/services/src/main/bash/consul-run-linux.sh
similarity index 100%
rename from camel-example-spring-boot-servicecall/services/src/main/bash/consul-run-linux.sh
rename to spring-boot-servicecall/services/src/main/bash/consul-run-linux.sh
diff --git a/camel-example-spring-boot-servicecall/services/src/main/bash/consul-run-osx.sh b/spring-boot-servicecall/services/src/main/bash/consul-run-osx.sh
similarity index 100%
rename from camel-example-spring-boot-servicecall/services/src/main/bash/consul-run-osx.sh
rename to spring-boot-servicecall/services/src/main/bash/consul-run-osx.sh
diff --git a/camel-example-spring-boot-servicecall/services/src/main/java/org/apache/camel/example/ServiceApplication.java b/spring-boot-servicecall/services/src/main/java/org/apache/camel/example/ServiceApplication.java
similarity index 100%
rename from camel-example-spring-boot-servicecall/services/src/main/java/org/apache/camel/example/ServiceApplication.java
rename to spring-boot-servicecall/services/src/main/java/org/apache/camel/example/ServiceApplication.java
diff --git a/camel-example-spring-boot-servicecall/services/src/main/resources/application.properties b/spring-boot-servicecall/services/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-servicecall/services/src/main/resources/application.properties
rename to spring-boot-servicecall/services/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-servicecall/services/src/main/resources/consul/services.json b/spring-boot-servicecall/services/src/main/resources/consul/services.json
similarity index 100%
rename from camel-example-spring-boot-servicecall/services/src/main/resources/consul/services.json
rename to spring-boot-servicecall/services/src/main/resources/consul/services.json
diff --git a/camel-example-spring-boot-servicecall/services/src/main/resources/logback.xml b/spring-boot-servicecall/services/src/main/resources/logback.xml
similarity index 100%
rename from camel-example-spring-boot-servicecall/services/src/main/resources/logback.xml
rename to spring-boot-servicecall/services/src/main/resources/logback.xml
diff --git a/camel-example-spring-boot-splitter-eip/README.adoc b/spring-boot-splitter-eip/README.adoc
similarity index 76%
rename from camel-example-spring-boot-splitter-eip/README.adoc
rename to spring-boot-splitter-eip/README.adoc
index e050011..c8ff332 100644
--- a/camel-example-spring-boot-splitter-eip/README.adoc
+++ b/spring-boot-splitter-eip/README.adoc
@@ -4,11 +4,11 @@
 
 Examples
 
- - Example 1 : Simple splitter.
- - Example 2 : Splitter with subsequent aggregation.
+ - Example 1 : Simple splitter
+ - Example 2 : Splitter with subsequent aggregation
  - Example 3 : Splitter with subsequent aggregation using POJO bean instead of AggregationStrategy implementation
- - Example 4 : Splitter with subsequent aggregation failing on exception.
- - Example 5: Splitter with subsequent aggregation on failing on aggregation exception.
+ - Example 4 : Splitter with subsequent aggregation failing on exception
+ - Example 5 : Splitter with subsequent aggregation on failing on aggregation exception
 
 === How to run
 
diff --git a/camel-example-spring-boot-splitter-eip/pom.xml b/spring-boot-splitter-eip/pom.xml
similarity index 100%
rename from camel-example-spring-boot-splitter-eip/pom.xml
rename to spring-boot-splitter-eip/pom.xml
diff --git a/camel-example-spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/AggregationStrategyPojo.java b/spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/AggregationStrategyPojo.java
similarity index 100%
rename from camel-example-spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/AggregationStrategyPojo.java
rename to spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/AggregationStrategyPojo.java
diff --git a/camel-example-spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/Application.java b/spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/Application.java
similarity index 100%
rename from camel-example-spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/Application.java
rename to spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/Application.java
diff --git a/camel-example-spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/MyMessageTransformer.java b/spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/MyMessageTransformer.java
similarity index 100%
rename from camel-example-spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/MyMessageTransformer.java
rename to spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/MyMessageTransformer.java
diff --git a/camel-example-spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/SplitterRouter.java b/spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/SplitterRouter.java
similarity index 100%
rename from camel-example-spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/SplitterRouter.java
rename to spring-boot-splitter-eip/src/main/java/org/apache/camel/example/spring/boot/SplitterRouter.java
diff --git a/camel-example-spring-boot-splitter-eip/src/main/resources/application.properties b/spring-boot-splitter-eip/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-splitter-eip/src/main/resources/application.properties
rename to spring-boot-splitter-eip/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-splitter-eip/src/test/java/CamelSplitterEIPTests.java b/spring-boot-splitter-eip/src/test/java/CamelSplitterEIPTests.java
similarity index 100%
rename from camel-example-spring-boot-splitter-eip/src/test/java/CamelSplitterEIPTests.java
rename to spring-boot-splitter-eip/src/test/java/CamelSplitterEIPTests.java
diff --git a/camel-example-spring-boot-supervising-route-controller/pom.xml b/spring-boot-supervising-route-controller/pom.xml
similarity index 100%
rename from camel-example-spring-boot-supervising-route-controller/pom.xml
rename to spring-boot-supervising-route-controller/pom.xml
diff --git a/camel-example-spring-boot-supervising-route-controller/readme.adoc b/spring-boot-supervising-route-controller/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-supervising-route-controller/readme.adoc
rename to spring-boot-supervising-route-controller/readme.adoc
diff --git a/camel-example-spring-boot-supervising-route-controller/src/main/java/sample/camel/Application.java b/spring-boot-supervising-route-controller/src/main/java/sample/camel/Application.java
similarity index 100%
rename from camel-example-spring-boot-supervising-route-controller/src/main/java/sample/camel/Application.java
rename to spring-boot-supervising-route-controller/src/main/java/sample/camel/Application.java
diff --git a/camel-example-spring-boot-supervising-route-controller/src/main/java/sample/camel/ApplicationRoutes.java b/spring-boot-supervising-route-controller/src/main/java/sample/camel/ApplicationRoutes.java
similarity index 100%
rename from camel-example-spring-boot-supervising-route-controller/src/main/java/sample/camel/ApplicationRoutes.java
rename to spring-boot-supervising-route-controller/src/main/java/sample/camel/ApplicationRoutes.java
diff --git a/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties b/spring-boot-supervising-route-controller/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties
rename to spring-boot-supervising-route-controller/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-type-converter/README.adoc b/spring-boot-type-converter/README.adoc
similarity index 100%
rename from camel-example-spring-boot-type-converter/README.adoc
rename to spring-boot-type-converter/README.adoc
diff --git a/camel-example-spring-boot-type-converter/pom.xml b/spring-boot-type-converter/pom.xml
similarity index 100%
rename from camel-example-spring-boot-type-converter/pom.xml
rename to spring-boot-type-converter/pom.xml
diff --git a/camel-example-spring-boot-type-converter/src/generated/java/sample/camel/CustomGeneratedConverterLoader.java b/spring-boot-type-converter/src/generated/java/sample/camel/CustomGeneratedConverterLoader.java
similarity index 100%
rename from camel-example-spring-boot-type-converter/src/generated/java/sample/camel/CustomGeneratedConverterLoader.java
rename to spring-boot-type-converter/src/generated/java/sample/camel/CustomGeneratedConverterLoader.java
diff --git a/camel-example-spring-boot-type-converter/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader b/spring-boot-type-converter/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
similarity index 100%
rename from camel-example-spring-boot-type-converter/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
rename to spring-boot-type-converter/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
diff --git a/camel-example-spring-boot-type-converter/src/main/java/sample/camel/Application.java b/spring-boot-type-converter/src/main/java/sample/camel/Application.java
similarity index 100%
rename from camel-example-spring-boot-type-converter/src/main/java/sample/camel/Application.java
rename to spring-boot-type-converter/src/main/java/sample/camel/Application.java
diff --git a/camel-example-spring-boot-type-converter/src/main/java/sample/camel/CustomGeneratedConverter.java b/spring-boot-type-converter/src/main/java/sample/camel/CustomGeneratedConverter.java
similarity index 100%
rename from camel-example-spring-boot-type-converter/src/main/java/sample/camel/CustomGeneratedConverter.java
rename to spring-boot-type-converter/src/main/java/sample/camel/CustomGeneratedConverter.java
diff --git a/camel-example-spring-boot-type-converter/src/main/java/sample/camel/CustomRuntimeConverter.java b/spring-boot-type-converter/src/main/java/sample/camel/CustomRuntimeConverter.java
similarity index 100%
rename from camel-example-spring-boot-type-converter/src/main/java/sample/camel/CustomRuntimeConverter.java
rename to spring-boot-type-converter/src/main/java/sample/camel/CustomRuntimeConverter.java
diff --git a/camel-example-spring-boot-type-converter/src/main/java/sample/camel/DataTypeConverterRouter.java b/spring-boot-type-converter/src/main/java/sample/camel/DataTypeConverterRouter.java
similarity index 100%
rename from camel-example-spring-boot-type-converter/src/main/java/sample/camel/DataTypeConverterRouter.java
rename to spring-boot-type-converter/src/main/java/sample/camel/DataTypeConverterRouter.java
diff --git a/camel-example-spring-boot-type-converter/src/main/java/sample/camel/Person.java b/spring-boot-type-converter/src/main/java/sample/camel/Person.java
similarity index 100%
rename from camel-example-spring-boot-type-converter/src/main/java/sample/camel/Person.java
rename to spring-boot-type-converter/src/main/java/sample/camel/Person.java
diff --git a/camel-example-spring-boot-type-converter/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/spring-boot-type-converter/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
similarity index 100%
rename from camel-example-spring-boot-type-converter/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
rename to spring-boot-type-converter/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
diff --git a/camel-example-spring-boot-type-converter/src/main/resources/META-INF/services/org/apache/camel/TypeConverterLoader b/spring-boot-type-converter/src/main/resources/META-INF/services/org/apache/camel/TypeConverterLoader
similarity index 100%
rename from camel-example-spring-boot-type-converter/src/main/resources/META-INF/services/org/apache/camel/TypeConverterLoader
rename to spring-boot-type-converter/src/main/resources/META-INF/services/org/apache/camel/TypeConverterLoader
diff --git a/camel-example-spring-boot-type-converter/src/main/resources/application.properties b/spring-boot-type-converter/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-type-converter/src/main/resources/application.properties
rename to spring-boot-type-converter/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-type-converter/src/test/java/sample/camel/CustomConverterGeneratedTest.java b/spring-boot-type-converter/src/test/java/sample/camel/CustomConverterGeneratedTest.java
similarity index 100%
rename from camel-example-spring-boot-type-converter/src/test/java/sample/camel/CustomConverterGeneratedTest.java
rename to spring-boot-type-converter/src/test/java/sample/camel/CustomConverterGeneratedTest.java
diff --git a/camel-example-spring-boot-type-converter/src/test/java/sample/camel/CustomConverterRuntimeTest.java b/spring-boot-type-converter/src/test/java/sample/camel/CustomConverterRuntimeTest.java
similarity index 100%
rename from camel-example-spring-boot-type-converter/src/test/java/sample/camel/CustomConverterRuntimeTest.java
rename to spring-boot-type-converter/src/test/java/sample/camel/CustomConverterRuntimeTest.java
diff --git a/camel-example-spring-boot-undertow-spring-security/pom.xml b/spring-boot-undertow-spring-security/pom.xml
similarity index 100%
rename from camel-example-spring-boot-undertow-spring-security/pom.xml
rename to spring-boot-undertow-spring-security/pom.xml
diff --git a/camel-example-spring-boot-undertow-spring-security/readme.adoc b/spring-boot-undertow-spring-security/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-undertow-spring-security/readme.adoc
rename to spring-boot-undertow-spring-security/readme.adoc
diff --git a/camel-example-spring-boot-undertow-spring-security/realm-export.json b/spring-boot-undertow-spring-security/realm-export.json
similarity index 100%
rename from camel-example-spring-boot-undertow-spring-security/realm-export.json
rename to spring-boot-undertow-spring-security/realm-export.json
diff --git a/camel-example-spring-boot-undertow-spring-security/src/main/java/org/apache/camel/undertow/spring/boot/Application.java b/spring-boot-undertow-spring-security/src/main/java/org/apache/camel/undertow/spring/boot/Application.java
similarity index 100%
rename from camel-example-spring-boot-undertow-spring-security/src/main/java/org/apache/camel/undertow/spring/boot/Application.java
rename to spring-boot-undertow-spring-security/src/main/java/org/apache/camel/undertow/spring/boot/Application.java
diff --git a/camel-example-spring-boot-undertow-spring-security/src/main/resources/application.properties b/spring-boot-undertow-spring-security/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-undertow-spring-security/src/main/resources/application.properties
rename to spring-boot-undertow-spring-security/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-unit-testing/README.adoc b/spring-boot-unit-testing/README.adoc
similarity index 74%
rename from camel-example-spring-boot-unit-testing/README.adoc
rename to spring-boot-unit-testing/README.adoc
index 4f7bdc6..52af239 100644
--- a/camel-example-spring-boot-unit-testing/README.adoc
+++ b/spring-boot-unit-testing/README.adoc
@@ -1,6 +1,6 @@
 == Camel Example Spring Boot
 
-This example different ways to unit test Camel routes in Spring Boot using Mock component and adviceWith techniques.
+This example shows different ways to unit test Camel routes in Spring Boot using Mock component and adviceWith techniques.
 
 === How to run
 
diff --git a/camel-example-spring-boot-unit-testing/pom.xml b/spring-boot-unit-testing/pom.xml
similarity index 100%
rename from camel-example-spring-boot-unit-testing/pom.xml
rename to spring-boot-unit-testing/pom.xml
diff --git a/camel-example-spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/Application.java b/spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/Application.java
similarity index 100%
rename from camel-example-spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/Application.java
rename to spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/Application.java
diff --git a/camel-example-spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/InterceptorSimulatedErrorException.java b/spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/InterceptorSimulatedErrorException.java
similarity index 100%
rename from camel-example-spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/InterceptorSimulatedErrorException.java
rename to spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/InterceptorSimulatedErrorException.java
diff --git a/camel-example-spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/MockSimulatedErrorException.java b/spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/MockSimulatedErrorException.java
similarity index 100%
rename from camel-example-spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/MockSimulatedErrorException.java
rename to spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/MockSimulatedErrorException.java
diff --git a/camel-example-spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/UnitTestsRouter.java b/spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/UnitTestsRouter.java
similarity index 100%
rename from camel-example-spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/UnitTestsRouter.java
rename to spring-boot-unit-testing/src/main/java/org/apache/camel/example/spring/boot/UnitTestsRouter.java
diff --git a/camel-example-spring-boot-unit-testing/src/main/resources/application.properties b/spring-boot-unit-testing/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-unit-testing/src/main/resources/application.properties
rename to spring-boot-unit-testing/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-unit-testing/src/test/java/CamelSpringBootUnitTests.java b/spring-boot-unit-testing/src/test/java/CamelSpringBootUnitTests.java
similarity index 100%
rename from camel-example-spring-boot-unit-testing/src/test/java/CamelSpringBootUnitTests.java
rename to spring-boot-unit-testing/src/test/java/CamelSpringBootUnitTests.java
diff --git a/camel-example-spring-boot-validator/pom.xml b/spring-boot-validator/pom.xml
similarity index 100%
rename from camel-example-spring-boot-validator/pom.xml
rename to spring-boot-validator/pom.xml
diff --git a/camel-example-spring-boot-validator/readme.adoc b/spring-boot-validator/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-validator/readme.adoc
rename to spring-boot-validator/readme.adoc
diff --git a/camel-example-spring-boot-validator/src/main/java/sample/camel/GreetingValidator.java b/spring-boot-validator/src/main/java/sample/camel/GreetingValidator.java
similarity index 100%
rename from camel-example-spring-boot-validator/src/main/java/sample/camel/GreetingValidator.java
rename to spring-boot-validator/src/main/java/sample/camel/GreetingValidator.java
diff --git a/camel-example-spring-boot-validator/src/main/java/sample/camel/SampleBean.java b/spring-boot-validator/src/main/java/sample/camel/SampleBean.java
similarity index 100%
rename from camel-example-spring-boot-validator/src/main/java/sample/camel/SampleBean.java
rename to spring-boot-validator/src/main/java/sample/camel/SampleBean.java
diff --git a/camel-example-spring-boot-validator/src/main/java/sample/camel/SampleCamelApplication.java b/spring-boot-validator/src/main/java/sample/camel/SampleCamelApplication.java
similarity index 100%
rename from camel-example-spring-boot-validator/src/main/java/sample/camel/SampleCamelApplication.java
rename to spring-boot-validator/src/main/java/sample/camel/SampleCamelApplication.java
diff --git a/camel-example-spring-boot-validator/src/main/java/sample/camel/SampleCamelRouter.java b/spring-boot-validator/src/main/java/sample/camel/SampleCamelRouter.java
similarity index 100%
rename from camel-example-spring-boot-validator/src/main/java/sample/camel/SampleCamelRouter.java
rename to spring-boot-validator/src/main/java/sample/camel/SampleCamelRouter.java
diff --git a/camel-example-spring-boot-validator/src/main/resources/application.properties b/spring-boot-validator/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-validator/src/main/resources/application.properties
rename to spring-boot-validator/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-validator/src/test/java/sample/camel/SampleCamelApplicationTest.java b/spring-boot-validator/src/test/java/sample/camel/SampleCamelApplicationTest.java
similarity index 100%
rename from camel-example-spring-boot-validator/src/test/java/sample/camel/SampleCamelApplicationTest.java
rename to spring-boot-validator/src/test/java/sample/camel/SampleCamelApplicationTest.java
diff --git a/spring-boot-widget-gadget/README.adoc b/spring-boot-widget-gadget/README.adoc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/spring-boot-widget-gadget/README.adoc
diff --git a/camel-example-spring-boot-widget-gadget/pom.xml b/spring-boot-widget-gadget/pom.xml
similarity index 100%
rename from camel-example-spring-boot-widget-gadget/pom.xml
rename to spring-boot-widget-gadget/pom.xml
diff --git a/camel-example-spring-boot-widget-gadget/src/main/data/order1.json b/spring-boot-widget-gadget/src/main/data/order1.json
similarity index 100%
rename from camel-example-spring-boot-widget-gadget/src/main/data/order1.json
rename to spring-boot-widget-gadget/src/main/data/order1.json
diff --git a/camel-example-spring-boot-widget-gadget/src/main/data/order2.json b/spring-boot-widget-gadget/src/main/data/order2.json
similarity index 100%
rename from camel-example-spring-boot-widget-gadget/src/main/data/order2.json
rename to spring-boot-widget-gadget/src/main/data/order2.json
diff --git a/camel-example-spring-boot-widget-gadget/src/main/java/sample/camel/AmqpConfig.java b/spring-boot-widget-gadget/src/main/java/sample/camel/AmqpConfig.java
similarity index 100%
rename from camel-example-spring-boot-widget-gadget/src/main/java/sample/camel/AmqpConfig.java
rename to spring-boot-widget-gadget/src/main/java/sample/camel/AmqpConfig.java
diff --git a/camel-example-spring-boot-widget-gadget/src/main/java/sample/camel/OrderRoute.java b/spring-boot-widget-gadget/src/main/java/sample/camel/OrderRoute.java
similarity index 100%
rename from camel-example-spring-boot-widget-gadget/src/main/java/sample/camel/OrderRoute.java
rename to spring-boot-widget-gadget/src/main/java/sample/camel/OrderRoute.java
diff --git a/camel-example-spring-boot-widget-gadget/src/main/java/sample/camel/WidgetGadgetApp.java b/spring-boot-widget-gadget/src/main/java/sample/camel/WidgetGadgetApp.java
similarity index 100%
rename from camel-example-spring-boot-widget-gadget/src/main/java/sample/camel/WidgetGadgetApp.java
rename to spring-boot-widget-gadget/src/main/java/sample/camel/WidgetGadgetApp.java
diff --git a/camel-example-spring-boot-widget-gadget/src/main/java/sample/camel/WidgetGadgetRoute.java b/spring-boot-widget-gadget/src/main/java/sample/camel/WidgetGadgetRoute.java
similarity index 100%
rename from camel-example-spring-boot-widget-gadget/src/main/java/sample/camel/WidgetGadgetRoute.java
rename to spring-boot-widget-gadget/src/main/java/sample/camel/WidgetGadgetRoute.java
diff --git a/camel-example-spring-boot-widget-gadget/src/main/resources/application.properties b/spring-boot-widget-gadget/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-widget-gadget/src/main/resources/application.properties
rename to spring-boot-widget-gadget/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-xml/pom.xml b/spring-boot-xml/pom.xml
similarity index 100%
rename from camel-example-spring-boot-xml/pom.xml
rename to spring-boot-xml/pom.xml
diff --git a/camel-example-spring-boot-xml/readme.adoc b/spring-boot-xml/readme.adoc
similarity index 100%
rename from camel-example-spring-boot-xml/readme.adoc
rename to spring-boot-xml/readme.adoc
diff --git a/camel-example-spring-boot-xml/src/main/java/sample/camel/SampleBean.java b/spring-boot-xml/src/main/java/sample/camel/SampleBean.java
similarity index 100%
rename from camel-example-spring-boot-xml/src/main/java/sample/camel/SampleBean.java
rename to spring-boot-xml/src/main/java/sample/camel/SampleBean.java
diff --git a/camel-example-spring-boot-xml/src/main/java/sample/camel/SampleCamelApplication.java b/spring-boot-xml/src/main/java/sample/camel/SampleCamelApplication.java
similarity index 100%
rename from camel-example-spring-boot-xml/src/main/java/sample/camel/SampleCamelApplication.java
rename to spring-boot-xml/src/main/java/sample/camel/SampleCamelApplication.java
diff --git a/camel-example-spring-boot-xml/src/main/resources/application.properties b/spring-boot-xml/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-xml/src/main/resources/application.properties
rename to spring-boot-xml/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-xml/src/main/resources/my-camel.xml b/spring-boot-xml/src/main/resources/my-camel.xml
similarity index 100%
rename from camel-example-spring-boot-xml/src/main/resources/my-camel.xml
rename to spring-boot-xml/src/main/resources/my-camel.xml
diff --git a/camel-example-spring-boot-xml/src/test/java/sample/camel/SampleCamelApplicationTest.java b/spring-boot-xml/src/test/java/sample/camel/SampleCamelApplicationTest.java
similarity index 100%
rename from camel-example-spring-boot-xml/src/test/java/sample/camel/SampleCamelApplicationTest.java
rename to spring-boot-xml/src/test/java/sample/camel/SampleCamelApplicationTest.java
diff --git a/camel-example-spring-boot-zipkin/README.adoc b/spring-boot-zipkin/README.adoc
similarity index 93%
rename from camel-example-spring-boot-zipkin/README.adoc
rename to spring-boot-zipkin/README.adoc
index 9d7c99c..59a416e 100644
--- a/camel-example-spring-boot-zipkin/README.adoc
+++ b/spring-boot-zipkin/README.adoc
@@ -29,9 +29,7 @@
 
 === Build
 
-First, start Zipkin as described below in the
-link:%22Installing%20Zipkin%20Server%22[Installing Zipkin Server]
-section
+First, start Zipkin as described below in the <<Installing Zipkin Server>> section
 
 Then compile this example:
 
@@ -73,7 +71,7 @@
 using the Zipkin UI. The services are named `+service1+` and
 `+service2+`.
 
-In the screen shot below we are showing a trace of a client calling
+In the screenshot below we are showing a trace of a client calling
 service1 and service2.
 
 image:images/zipkin-web-console-1.png[Zipkin UI Trace
diff --git a/camel-example-spring-boot-zipkin/client/pom.xml b/spring-boot-zipkin/client/pom.xml
similarity index 100%
rename from camel-example-spring-boot-zipkin/client/pom.xml
rename to spring-boot-zipkin/client/pom.xml
diff --git a/camel-example-spring-boot-zipkin/client/src/main/java/sample/camel/ClientApplication.java b/spring-boot-zipkin/client/src/main/java/sample/camel/ClientApplication.java
similarity index 100%
rename from camel-example-spring-boot-zipkin/client/src/main/java/sample/camel/ClientApplication.java
rename to spring-boot-zipkin/client/src/main/java/sample/camel/ClientApplication.java
diff --git a/camel-example-spring-boot-zipkin/client/src/main/java/sample/camel/ClientRoute.java b/spring-boot-zipkin/client/src/main/java/sample/camel/ClientRoute.java
similarity index 100%
rename from camel-example-spring-boot-zipkin/client/src/main/java/sample/camel/ClientRoute.java
rename to spring-boot-zipkin/client/src/main/java/sample/camel/ClientRoute.java
diff --git a/camel-example-spring-boot-zipkin/client/src/main/java/sample/camel/CounterBean.java b/spring-boot-zipkin/client/src/main/java/sample/camel/CounterBean.java
similarity index 100%
rename from camel-example-spring-boot-zipkin/client/src/main/java/sample/camel/CounterBean.java
rename to spring-boot-zipkin/client/src/main/java/sample/camel/CounterBean.java
diff --git a/camel-example-spring-boot-zipkin/client/src/main/resources/META-INF/LICENSE.txt b/spring-boot-zipkin/client/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-zipkin/client/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-zipkin/client/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-zipkin/client/src/main/resources/META-INF/NOTICE.txt b/spring-boot-zipkin/client/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-zipkin/client/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-zipkin/client/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-zipkin/client/src/main/resources/META-INF/beans.xml b/spring-boot-zipkin/client/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from camel-example-spring-boot-zipkin/client/src/main/resources/META-INF/beans.xml
rename to spring-boot-zipkin/client/src/main/resources/META-INF/beans.xml
diff --git a/camel-example-spring-boot-zipkin/client/src/main/resources/log4j2.properties b/spring-boot-zipkin/client/src/main/resources/log4j2.properties
similarity index 100%
rename from camel-example-spring-boot-zipkin/client/src/main/resources/log4j2.properties
rename to spring-boot-zipkin/client/src/main/resources/log4j2.properties
diff --git a/camel-example-spring-boot-zipkin/images/zipkin-web-console-1.png b/spring-boot-zipkin/images/zipkin-web-console-1.png
similarity index 100%
rename from camel-example-spring-boot-zipkin/images/zipkin-web-console-1.png
rename to spring-boot-zipkin/images/zipkin-web-console-1.png
Binary files differ
diff --git a/camel-example-spring-boot-zipkin/images/zipkin-web-console-2.png b/spring-boot-zipkin/images/zipkin-web-console-2.png
similarity index 100%
rename from camel-example-spring-boot-zipkin/images/zipkin-web-console-2.png
rename to spring-boot-zipkin/images/zipkin-web-console-2.png
Binary files differ
diff --git a/camel-example-spring-boot-zipkin/pom.xml b/spring-boot-zipkin/pom.xml
similarity index 100%
rename from camel-example-spring-boot-zipkin/pom.xml
rename to spring-boot-zipkin/pom.xml
diff --git a/camel-example-spring-boot-zipkin/service1/pom.xml b/spring-boot-zipkin/service1/pom.xml
similarity index 100%
rename from camel-example-spring-boot-zipkin/service1/pom.xml
rename to spring-boot-zipkin/service1/pom.xml
diff --git a/camel-example-spring-boot-zipkin/service1/src/main/java/sample/camel/Service1Application.java b/spring-boot-zipkin/service1/src/main/java/sample/camel/Service1Application.java
similarity index 100%
rename from camel-example-spring-boot-zipkin/service1/src/main/java/sample/camel/Service1Application.java
rename to spring-boot-zipkin/service1/src/main/java/sample/camel/Service1Application.java
diff --git a/camel-example-spring-boot-zipkin/service1/src/main/java/sample/camel/Service1Route.java b/spring-boot-zipkin/service1/src/main/java/sample/camel/Service1Route.java
similarity index 100%
rename from camel-example-spring-boot-zipkin/service1/src/main/java/sample/camel/Service1Route.java
rename to spring-boot-zipkin/service1/src/main/java/sample/camel/Service1Route.java
diff --git a/camel-example-spring-boot-zipkin/service1/src/main/resources/META-INF/LICENSE.txt b/spring-boot-zipkin/service1/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-zipkin/service1/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-zipkin/service1/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-zipkin/service1/src/main/resources/META-INF/NOTICE.txt b/spring-boot-zipkin/service1/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-zipkin/service1/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-zipkin/service1/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-zipkin/service1/src/main/resources/application.properties b/spring-boot-zipkin/service1/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot-zipkin/service1/src/main/resources/application.properties
rename to spring-boot-zipkin/service1/src/main/resources/application.properties
diff --git a/camel-example-spring-boot-zipkin/service2/pom.xml b/spring-boot-zipkin/service2/pom.xml
similarity index 100%
rename from camel-example-spring-boot-zipkin/service2/pom.xml
rename to spring-boot-zipkin/service2/pom.xml
diff --git a/camel-example-spring-boot-zipkin/service2/src/main/java/sample/camel/Service2Application.java b/spring-boot-zipkin/service2/src/main/java/sample/camel/Service2Application.java
similarity index 100%
rename from camel-example-spring-boot-zipkin/service2/src/main/java/sample/camel/Service2Application.java
rename to spring-boot-zipkin/service2/src/main/java/sample/camel/Service2Application.java
diff --git a/camel-example-spring-boot-zipkin/service2/src/main/java/sample/camel/Service2Route.java b/spring-boot-zipkin/service2/src/main/java/sample/camel/Service2Route.java
similarity index 100%
rename from camel-example-spring-boot-zipkin/service2/src/main/java/sample/camel/Service2Route.java
rename to spring-boot-zipkin/service2/src/main/java/sample/camel/Service2Route.java
diff --git a/camel-example-spring-boot-zipkin/service2/src/main/resources/META-INF/LICENSE.txt b/spring-boot-zipkin/service2/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from camel-example-spring-boot-zipkin/service2/src/main/resources/META-INF/LICENSE.txt
rename to spring-boot-zipkin/service2/src/main/resources/META-INF/LICENSE.txt
diff --git a/camel-example-spring-boot-zipkin/service2/src/main/resources/META-INF/NOTICE.txt b/spring-boot-zipkin/service2/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from camel-example-spring-boot-zipkin/service2/src/main/resources/META-INF/NOTICE.txt
rename to spring-boot-zipkin/service2/src/main/resources/META-INF/NOTICE.txt
diff --git a/camel-example-spring-boot-zipkin/service2/src/main/resources/log4j2.properties b/spring-boot-zipkin/service2/src/main/resources/log4j2.properties
similarity index 100%
rename from camel-example-spring-boot-zipkin/service2/src/main/resources/log4j2.properties
rename to spring-boot-zipkin/service2/src/main/resources/log4j2.properties
diff --git a/camel-example-spring-boot/pom.xml b/spring-boot/pom.xml
similarity index 100%
rename from camel-example-spring-boot/pom.xml
rename to spring-boot/pom.xml
diff --git a/camel-example-spring-boot/readme.adoc b/spring-boot/readme.adoc
similarity index 100%
rename from camel-example-spring-boot/readme.adoc
rename to spring-boot/readme.adoc
diff --git a/camel-example-spring-boot/src/main/java/sample/camel/MyBean.java b/spring-boot/src/main/java/sample/camel/MyBean.java
similarity index 100%
rename from camel-example-spring-boot/src/main/java/sample/camel/MyBean.java
rename to spring-boot/src/main/java/sample/camel/MyBean.java
diff --git a/camel-example-spring-boot/src/main/java/sample/camel/MyCamelApplication.java b/spring-boot/src/main/java/sample/camel/MyCamelApplication.java
similarity index 100%
rename from camel-example-spring-boot/src/main/java/sample/camel/MyCamelApplication.java
rename to spring-boot/src/main/java/sample/camel/MyCamelApplication.java
diff --git a/camel-example-spring-boot/src/main/java/sample/camel/MyCamelRouter.java b/spring-boot/src/main/java/sample/camel/MyCamelRouter.java
similarity index 100%
rename from camel-example-spring-boot/src/main/java/sample/camel/MyCamelRouter.java
rename to spring-boot/src/main/java/sample/camel/MyCamelRouter.java
diff --git a/camel-example-spring-boot/src/main/resources/application.properties b/spring-boot/src/main/resources/application.properties
similarity index 100%
rename from camel-example-spring-boot/src/main/resources/application.properties
rename to spring-boot/src/main/resources/application.properties
diff --git a/camel-example-spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java b/spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java
similarity index 100%
rename from camel-example-spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java
rename to spring-boot/src/test/java/sample/camel/MyCamelApplicationJUnit5Test.java