Regen
diff --git a/README.adoc b/README.adoc
index 7f77b60..15b297d 100644
--- a/README.adoc
+++ b/README.adoc
@@ -33,105 +33,105 @@
 |===
 | Example | Category | Description
 
-| link:spring-boot-health-checks/readme.adoc[Spring Boot Health Checks] (spring-boot-health-checks) |  | 
+| link:health-checks/readme.adoc[Health Checks] (health-checks) |  | 
 
-| link:spring-boot-undertow-spring-security/readme.adoc[Spring Boot Undertow Spring Security] (spring-boot-undertow-spring-security) | Advanced | Example on how to use the Camel Undertow component with spring security and Keycloak
+| link:undertow-spring-security/readme.adoc[Undertow Spring Security] (undertow-spring-security) | Advanced | Example on how to use the Camel Undertow component with spring security and Keycloak
 
-| link:spring-boot-webhook/readme.adoc[Spring Boot Webhook] (spring-boot-webhook) | Advanced | Example on how to use the Camel Webhook component
+| link:webhook/readme.adoc[Webhook] (webhook) | Advanced | Example on how to use the Camel Webhook component
+
+| link:jira/README.adoc[Jira] (jira) | Beginner | An example that uses Jira Camel API
+
+| link:load-balancer-eip/README.adoc[Load Balancer Eip] (load-balancer-eip) | Beginner | An example showing Load Balancer EIP with Camel and Spring Boot
+
+| link:pojo/README.adoc[Pojo] (pojo) | Beginner | An example showing how to work with Camel POJO routing with Spring Boot
+
+| link:rest-openapi-simple/README.adoc[REST OpenApi] (rest-openapi-simple) | Beginner | This example shows how to call a Rest service defined using OpenApi specification
+
+| link:rest-swagger-simple/README.adoc[REST Swagger] (rest-swagger-simple) | Beginner | This example shows how to call a Rest service defined using Swagger specification
+
+| link:routetemplate/readme.adoc[Routetemplate] (routetemplate) | Beginner | How to use route templates (parameterized routes)
+
+| link:splitter-eip/README.adoc[Splitter Eip] (splitter-eip) | Beginner | An example showing Splitter EIP with Camel and Spring Boot
 
 | link:spring-boot/readme.adoc[Spring Boot] (spring-boot) | Beginner | An example showing how to work with Camel and Spring Boot
 
-| link:spring-boot-jira/README.adoc[Spring Boot Jira] (spring-boot-jira) | Beginner | An example that uses Jira Camel API
+| link:type-converter/README.adoc[Type Converter] (type-converter) | Beginner | An example showing how to create custom type converter with Camel and Spring Boot
 
-| link:spring-boot-load-balancer-eip/README.adoc[Spring Boot Load Balancer Eip] (spring-boot-load-balancer-eip) | Beginner | An example showing Load Balancer EIP with Camel and Spring Boot
+| link:unit-testing/README.adoc[Unit Testing] (unit-testing) | Beginner | An example showing how to write unit tests with Camel and Spring Boot
 
-| link:spring-boot-pojo/README.adoc[Spring Boot Pojo] (spring-boot-pojo) | Beginner | An example showing how to work with Camel POJO routing with Spring Boot
+| link:xml/readme.adoc[Spring Boot XML] (xml) | Beginner | An example showing how to work with Camel routes in XML files and Spring Boot
 
-| link:spring-boot-rest-openapi-simple/README.adoc[REST OpenApi] (spring-boot-rest-openapi-simple) | Beginner | This example shows how to call a Rest service defined using OpenApi specification
+| link:aws2-s3/README.adoc[Aws2 S3] (aws2-s3) | Cloud | An example showing the Camel AWS2 S3 component with Spring Boot
 
-| link:spring-boot-rest-swagger-simple/README.adoc[REST Swagger] (spring-boot-rest-swagger-simple) | Beginner | This example shows how to call a Rest service defined using Swagger specification
+| link:grpc/README.adoc[gRPC Spring Boot] (grpc) | Cloud | An example showing the Camel gRPC component with Spring Boot
 
-| link:spring-boot-routetemplate/readme.adoc[Spring Boot Routetemplate] (spring-boot-routetemplate) | Beginner | How to use route templates (parameterized routes)
+| link:grpc-kubernetes/README.adoc[gRPC Kubernetes] (grpc-kubernetes) | Cloud | An example showing the Camel gRPC component with Spring Boot running on Kubernetes
 
-| link:spring-boot-splitter-eip/README.adoc[Spring Boot Splitter Eip] (spring-boot-splitter-eip) | Beginner | An example showing Splitter EIP with Camel and Spring Boot
+| link:infinispan/README.adoc[Infinispan] (infinispan) | Cloud | An example showing the Camel Infinispan component with Spring Boot
 
-| link:spring-boot-type-converter/README.adoc[Spring Boot Type Converter] (spring-boot-type-converter) | Beginner | An example showing how to create custom type converter with Camel and Spring Boot
+| link:servicecall/README.adoc[Spring Boot ServiceCall] (servicecall) | Cloud | An example showing how to work with Camel ServiceCall EIP and Spring Boot
 
-| link:spring-boot-unit-testing/README.adoc[Spring Boot Unit Testing] (spring-boot-unit-testing) | Beginner | An example showing how to write unit tests with Camel and Spring Boot
+| link:clustered-route-controller/readme.adoc[Clustered Route Controller] (clustered-route-controller) | Clustering | An example showing how to work with Camel's Clustered Route Controller and Spring Boot
 
-| link:spring-boot-xml/readme.adoc[Spring Boot XML] (spring-boot-xml) | Beginner | An example showing how to work with Camel routes in XML files and Spring Boot
+| link:master/readme.adoc[Master] (master) | Clustering | An example showing how to work with Camel's Master component and Spring Boot
 
-| link:spring-boot-aws2-s3/README.adoc[Spring Boot Aws2 S3] (spring-boot-aws2-s3) | Cloud | An example showing the Camel AWS2 S3 component with Spring Boot
+| link:arangodb/README.adoc[Arangodb] (arangodb) | Database | An example showing the Camel ArangoDb component with Spring Boot
 
-| link:spring-boot-grpc/README.adoc[gRPC Spring Boot] (spring-boot-grpc) | Cloud | An example showing the Camel gRPC component with Spring Boot
-
-| link:spring-boot-grpc-kubernetes/README.adoc[gRPC Kubernetes] (spring-boot-grpc-kubernetes) | Cloud | An example showing the Camel gRPC component with Spring Boot running on Kubernetes
-
-| link:spring-boot-infinispan/README.adoc[Spring Boot Infinispan] (spring-boot-infinispan) | Cloud | An example showing the Camel Infinispan component with Spring Boot
-
-| link:spring-boot-servicecall/README.adoc[Spring Boot ServiceCall] (spring-boot-servicecall) | Cloud | An example showing how to work with Camel ServiceCall EIP and Spring Boot
-
-| link:spring-boot-clustered-route-controller/readme.adoc[Spring Boot Clustered Route Controller] (spring-boot-clustered-route-controller) | Clustering | An example showing how to work with Camel's Clustered Route Controller and Spring Boot
-
-| link:spring-boot-master/readme.adoc[Spring Boot Master] (spring-boot-master) | Clustering | An example showing how to work with Camel's Master component and Spring Boot
-
-| link:spring-boot-arangodb/README.adoc[Spring Boot Arangodb] (spring-boot-arangodb) | Database | An example showing the Camel ArangoDb component with Spring Boot
-
-| link:spring-boot-rest-jpa/README.adoc[Spring Boot REST JPA] (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:rest-jpa/README.adoc[Spring Boot REST JPA] (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:spring-boot-hystrix/README.adoc[Spring Boot Hystrix] (spring-boot-hystrix) | EIP | An example showing how to use Hystrix EIP as circuit breaker in Camel routes
+| link:hystrix/README.adoc[Hystrix] (hystrix) | EIP | An example showing how to use Hystrix EIP as circuit breaker in Camel routes
 
-| link:spring-boot-resilience4j/README.adoc[Spring Boot Resilience4j] (spring-boot-resilience4j) | EIP | An example showing how to use Resilience4j EIP as circuit breaker in Camel routes
+| link:resilience4j/README.adoc[Resilience4j] (resilience4j) | EIP | An example showing how to use Resilience4j EIP as circuit breaker in Camel routes
 
-| link:spring-boot-fhir/readme.adoc[Spring Boot Fhir] (spring-boot-fhir) | Health Care | An example showing how to work with Camel, FHIR and Spring Boot
+| link:fhir/readme.adoc[Fhir] (fhir) | Health Care | An example showing how to work with Camel, FHIR and Spring Boot
 
-| link:spring-boot-fhir-auth-tx/readme.adoc[Spring Boot Fhir Auth Tx] (spring-boot-fhir-auth-tx) | Health Care | An example showing how to work with Camel, FHIR Authorization, FHIR Transaction and Spring Boot
+| link:fhir-auth-tx/readme.adoc[Fhir Auth Tx] (fhir-auth-tx) | Health Care | An example showing how to work with Camel, FHIR Authorization, FHIR Transaction and Spring Boot
     
 
-| link:spring-boot-validator/readme.adoc[Validator Spring Boot] (spring-boot-validator) | Input/Output Type Contract | An example showing how to work with declarative validation and Spring Boot
+| link:validator/readme.adoc[Validator Spring Boot] (validator) | Input/Output Type Contract | An example showing how to work with declarative validation and Spring Boot
 
-| link:spring-boot-actuator-http-metrics/readme.adoc[Spring Boot Actuator Http Metrics] (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:actuator-http-metrics/readme.adoc[Actuator Http Metrics] (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-apm-opentracing/README.adoc[OpenTracing APM] (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:apm-opentracing/README.adoc[OpenTracing APM] (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-metrics/README.adoc[Spring Boot Metrics] (spring-boot-metrics) | Management and Monitoring | An example showing how to work with Camel and Spring Boot and report metrics to Graphite
+| link:metrics/README.adoc[Metrics] (metrics) | Management and Monitoring | An example showing how to work with Camel and Spring Boot and report metrics to Graphite
 
-| link:spring-boot-opentracing/README.adoc[OpenTracing] (spring-boot-opentracing) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with OpenTracing
+| link:opentracing/README.adoc[OpenTracing] (opentracing) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with OpenTracing
     
 
-| link:spring-boot-supervising-route-controller/readme.adoc[Spring Boot Supervising Route Controller] (spring-boot-supervising-route-controller) | Management and Monitoring | An example showing how to work with Camel's Supervising Route Controller and Spring Boot
+| link:supervising-route-controller/readme.adoc[Supervising Route Controller] (supervising-route-controller) | Management and Monitoring | An example showing how to work with Camel's Supervising Route Controller and Spring Boot
 
-| link:spring-boot-zipkin/README.adoc[Spring Boot Zipkin] (spring-boot-zipkin) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with Zipkin
+| link:zipkin/README.adoc[Zipkin] (zipkin) | Management and Monitoring | An example showing how to trace incoming and outgoing messages from Camel with Zipkin
 
-| link:spring-boot-activemq/readme.adoc[Spring Boot Activemq] (spring-boot-activemq) | Messaging | An example showing how to work with Camel, ActiveMQ and Spring Boot
+| link:activemq/readme.adoc[Activemq] (activemq) | Messaging | An example showing how to work with Camel, ActiveMQ and Spring Boot
 
-| link:spring-boot-amqp/readme.adoc[Spring Boot Amqp] (spring-boot-amqp) | Messaging | An example showing how to work with Camel, ActiveMQ Amqp and Spring Boot
+| link:amqp/readme.adoc[Amqp] (amqp) | Messaging | An example showing how to work with Camel, ActiveMQ Amqp and Spring Boot
 
-| link:spring-boot-kafka-avro/README.adoc[Spring Boot Kafka Avro] (spring-boot-kafka-avro) | Messaging | An example for Kafka avro
+| link:kafka-avro/README.adoc[Kafka Avro] (kafka-avro) | Messaging | An example for Kafka avro
 
-| link:spring-boot-kafka-offsetrepository/README.adoc[Spring Boot Kafka Offsetrepository] (spring-boot-kafka-offsetrepository) | Messaging | An example for Kafka offsetrepository
+| link:kafka-offsetrepository/README.adoc[Kafka Offsetrepository] (kafka-offsetrepository) | Messaging | An example for Kafka offsetrepository
 
-| link:spring-boot-rabbitmq/readme.adoc[Spring Boot Rabbitmq] (spring-boot-rabbitmq) | Messaging | An example showing how to work with Camel and RabbitMQ
+| link:rabbitmq/readme.adoc[Rabbitmq] (rabbitmq) | Messaging | An example showing how to work with Camel and RabbitMQ
 
-| link:spring-boot-strimzi/README.adoc[Spring Boot Strimzi] (spring-boot-strimzi) | Messaging | Camel example which a route is defined in XML for Strimzi integration on Openshift/Kubernetes
+| link:strimzi/README.adoc[Strimzi] (strimzi) | Messaging | Camel example which a route is defined in XML for Strimzi integration on Openshift/Kubernetes
 
-| link:spring-boot-widget-gadget/README.adoc[Spring Boot Widget Gadget] (spring-boot-widget-gadget) | Messaging | The widget and gadget example from EIP book, running on Spring Boot
+| link:widget-gadget/README.adoc[Widget Gadget] (widget-gadget) | Messaging | The widget and gadget example from EIP book, running on Spring Boot
 
-| link:spring-boot-reactive-streams/readme.adoc[Spring Boot Reactive Streams] (spring-boot-reactive-streams) | Reactive | An example that shows how Camel can exchange data using reactive streams with Spring Boot reactor
+| link:reactive-streams/readme.adoc[Reactive Streams] (reactive-streams) | Reactive | An example that shows how Camel can exchange data using reactive streams with Spring Boot reactor
     
 
-| link:spring-boot-geocoder/README.adoc[Spring Boot Geocoder] (spring-boot-geocoder) | Rest | An example showing the Camel Geocoder component via REST DSL with Spring Boot
+| link:geocoder/README.adoc[Geocoder] (geocoder) | Rest | An example showing the Camel Geocoder component via REST DSL with Spring Boot
 
-| link:spring-boot-rest-openapi/README.adoc[Spring Boot Rest Openapi] (spring-boot-rest-openapi) | Rest | An example showing Camel REST DSL and OpenApi with Spring Boot
+| link:rest-openapi/README.adoc[Rest Openapi] (rest-openapi) | Rest | An example showing Camel REST DSL and OpenApi with Spring Boot
 
-| link:spring-boot-rest-producer/readme.adoc[Spring Boot Rest Producer] (spring-boot-rest-producer) | Rest | An example showing how to use Camel Rest to call a REST service
+| link:rest-producer/readme.adoc[Rest Producer] (rest-producer) | Rest | An example showing how to use Camel Rest to call a REST service
 
-| link:spring-boot-rest-swagger/README.adoc[Spring Boot Rest Swagger] (spring-boot-rest-swagger) | Rest | An example showing Camel REST DSL and Swagger with Spring Boot
+| link:rest-swagger/README.adoc[Rest Swagger] (rest-swagger) | Rest | An example showing Camel REST DSL and Swagger with Spring Boot
 
-| link:spring-boot-twitter-salesforce/README.adoc[Spring Boot Twitter Salesforce] (spring-boot-twitter-salesforce) | Social | Twitter mentions is created as contacts in Salesforce
+| link:twitter-salesforce/README.adoc[Twitter Salesforce] (twitter-salesforce) | Social | Twitter mentions is created as contacts in Salesforce
 |===
 // examples: END