Polished examples
diff --git a/README.adoc b/README.adoc
index 0dd9869..e6af448 100644
--- a/README.adoc
+++ b/README.adoc
@@ -27,32 +27,20 @@
 === Examples
 
 // examples: START
-Number of Examples: 59 (0 deprecated)
+Number of Examples: 58 (0 deprecated)
 
 [width="100%",cols="4,2,4",options="header"]
 |===
 | Example | Category | Description
 
-| 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:webhook/readme.adoc[Webhook] (webhook) | Advanced | Example on how to use the Camel Webhook component
-
 | link:endpointdsl/readme.adoc[Endpointdsl] (endpointdsl) | Beginner | Using type-safe Endpoint DSL
 
-| link:jira/README.adoc[Jira] (jira) | Beginner | An example that uses Jira Camel API
-
 | link:kamelet-chucknorris/readme.adoc[Kamelet Chucknorris] (kamelet-chucknorris) | Beginner | How easy it is to create your own Kamelets
 
-| 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:quartz/README.adoc[Quartz] (quartz) | Beginner | An example showing how to work with Camel Quartz and Camel Log 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:route-reload/readme.adoc[Spring Boot Route Reload] (route-reload) | Beginner | Live reload of routes if file is updated and saved
 
 | link:routes-configuration/readme.adoc[Routes Configuration] (routes-configuration) | Beginner | Example with global routes configuration for error handling
@@ -61,14 +49,10 @@
 
 | link:routetemplate-xml/README.adoc[Routetemplate Xml] (routetemplate-xml) | Beginner | How to use route templates (parameterized routes) in XML
 
-| 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:type-converter/README.adoc[Type Converter] (type-converter) | Beginner | An example showing how to create custom type converter 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:xml/readme.adoc[Spring Boot XML] (xml) | Beginner | An example showing how to work with Camel routes in XML files and Spring Boot
 
 | link:xml-import/readme.adoc[Spring Boot XML Import] (xml-import) | Beginner | An example showing how to work with Spring XML files imported with embedded CamelContext
@@ -83,7 +67,7 @@
 
 | link:infinispan/README.adoc[Infinispan] (infinispan) | Cloud | An example showing the Camel Infinispan component with 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:webhook/readme.adoc[Webhook] (webhook) | Cloud | Example on how to use the Camel Webhook component
 
 | link:master/readme.adoc[Master] (master) | Clustering | An example showing how to work with Camel's Master component and Spring Boot
 
@@ -97,10 +81,14 @@
 
 | link:dynamic-router-eip/README.adoc[Dynamic Router Eip] (dynamic-router-eip) | EIP | An example on how to use the Dynamic Router EIP component in Spring Boot
 
+| link:load-balancer-eip/README.adoc[Load Balancer Eip] (load-balancer-eip) | EIP | An example showing Load Balancer EIP with Camel and Spring Boot
+
 | link:resilience4j/README.adoc[Resilience4j] (resilience4j) | EIP | An example showing how to use Resilience4j EIP as circuit breaker in Camel routes
 
 | link:saga/readme.adoc[Saga] (saga) | EIP | This example shows how to work with a simple Apache Camel application using Spring Boot and Narayana LRA Coordinator to manage distributed actions implementing SAGA pattern
 
+| link:splitter-eip/README.adoc[Splitter Eip] (splitter-eip) | EIP | An example showing Splitter EIP with Camel and Spring Boot
+
 | link:fhir/readme.adoc[Fhir] (fhir) | Health Care | An example showing how to work with Camel, FHIR 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
@@ -147,15 +135,25 @@
 
 | link:rest-openapi/README.adoc[Rest Openapi] (rest-openapi) | Rest | An example showing Camel REST DSL and OpenApi with Spring Boot
 
+| link:rest-openapi-simple/README.adoc[REST OpenApi] (rest-openapi-simple) | Rest | This example shows how to call a Rest service defined using OpenApi specification
+
 | link:rest-openapi-springdoc/README.adoc[Rest Openapi Springdoc] (rest-openapi-springdoc) | Rest | An example showing Camel REST DSL and OpenApi with a Springdoc UI in a Spring Boot application
 
 | link:rest-producer/readme.adoc[Rest Producer] (rest-producer) | Rest | An example showing how to use Camel Rest to call a REST service
 
 | link:rest-swagger/README.adoc[Rest Swagger] (rest-swagger) | Rest | An example showing Camel REST DSL and Swagger with Spring Boot
 
+| link:rest-swagger-simple/README.adoc[REST Swagger] (rest-swagger-simple) | Rest | This example shows how to call a Rest service defined using Swagger specification
+
+| link:jira/README.adoc[Jira] (jira) | SaaS | An example that uses Jira Camel API
+
 | link:twitter-salesforce/README.adoc[Twitter Salesforce] (twitter-salesforce) | SaaS | Twitter mentions is created as contacts in Salesforce
 
 | link:sapjcoserver/readme.md[Sapjcoserver] (sapjcoserver) | SAP | An example showing how to work with Camel,SAP JCOServer and Spring Boot
+
+| link:undertow-spring-security/readme.adoc[Undertow Spring Security] (undertow-spring-security) | Security | Example on how to use the Camel Undertow component with spring security and Keycloak
+
+| link:unit-testing/README.adoc[Unit Testing] (unit-testing) | Testing | An example showing how to write unit tests with Camel and Spring Boot
 |===
 // examples: END
 
diff --git a/jira/pom.xml b/jira/pom.xml
index 2722854..1a0e7d5 100644
--- a/jira/pom.xml
+++ b/jira/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <category>Beginner</category>
+        <category>SaaS</category>
     </properties>
 
     <dependencyManagement>
diff --git a/load-balancer-eip/pom.xml b/load-balancer-eip/pom.xml
index 72fada3..6fab9da 100644
--- a/load-balancer-eip/pom.xml
+++ b/load-balancer-eip/pom.xml
@@ -14,7 +14,7 @@
 	<description>An example showing Load Balancer EIP with Camel and Spring Boot</description>
 
 	<properties>
-		<category>Beginner</category>
+		<category>EIP</category>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/pom.xml b/pom.xml
index ac26cea..7a7a54d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,6 @@
 		<module>route-reload</module>
 		<module>routes-configuration</module>
 		<module>saga</module>
-		<module>servicecall</module>
 		<module>supervising-route-controller</module>
 		<module>twitter-salesforce</module>
 		<module>type-converter</module>
diff --git a/rest-openapi-simple/pom.xml b/rest-openapi-simple/pom.xml
index 0bd835e..a7586ef 100644
--- a/rest-openapi-simple/pom.xml
+++ b/rest-openapi-simple/pom.xml
@@ -31,7 +31,7 @@
     <description>This example shows how to call a Rest service defined using OpenApi specification</description>
 
     <properties>
-        <category>Beginner</category>
+        <category>Rest</category>
         <title>REST OpenApi</title>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/rest-swagger-simple/pom.xml b/rest-swagger-simple/pom.xml
index 992c979..b8a484d 100644
--- a/rest-swagger-simple/pom.xml
+++ b/rest-swagger-simple/pom.xml
@@ -31,7 +31,7 @@
     <description>This example shows how to call a Rest service defined using Swagger specification</description>
 
     <properties>
-        <category>Beginner</category>
+        <category>Rest</category>
         <title>REST Swagger</title>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/rest-swagger/pom.xml b/rest-swagger/pom.xml
index 07fb4e3..7dd60ca 100644
--- a/rest-swagger/pom.xml
+++ b/rest-swagger/pom.xml
@@ -30,7 +30,8 @@
     <description>An example showing Camel REST DSL and Swagger with Spring Boot</description>
 
     <properties>
-        <category>Rest</category>    </properties>
+        <category>Rest</category>
+    </properties>
 
     <!-- Spring-Boot and Camel BOM -->
     <dependencyManagement>
diff --git a/servicecall/README.adoc b/servicecall/README.adoc
deleted file mode 100644
index ebe6299..0000000
--- a/servicecall/README.adoc
+++ /dev/null
@@ -1,78 +0,0 @@
-== Spring Boot and ServiceCall EIP Example
-
-This example show how to use Camel with ServiceCall EIP with spring-boot and consul.
-
-This example includes two maven modules:
-
- - services that exposes a number of services
- - consumer that consumes services
-
-=== Configuration
-
-The consumer is configured in the src/main/resources/application.properties in which we blacklist some services for being discovered and we add some additional services not managed by consul
-
-    # Configure service filter
-    camel.cloud.service-filter.blacklist[service-1] = localhost:9012
-
-    # Configure additional services
-    camel.cloud.service-discovery.services[service-2] = localhost:9021,localhost:9022,localhost:9023
-
-=== Build
-
-You can build this example using
-
-    mvn compile
-
-=== Run the example
-
-Using multiple shells:
-
- - start consul:
-
-  $ cd services
-  $ src/main/bash/consul-run-linux.sh      (for linux)
-  $ src/main/bash/consul-run-osx.sh        (for mac osx)
-
- - start the service-1 service group:
-
-  $ cd services
-  $ mvn spring-boot:run -Dspring-boot.run.profiles=service-1
-
-  - start the service-2 service group:
-
-  $ cd services
-  $ mvn spring-boot:run -Dspring-boot.run.profiles=service-2
-
-  - start the consumer
-
-  $ cd consumer
-  $ mvn spring-boot:run
-
-=== Test the example:
-
-In a new shell:
-
-  $ curl localhost:8080/camel/serviceCall/service1
-  Hi!, I'm service-1 on camel-1/route1
-  $ curl localhost:8080/camel/serviceCall/service2
-  Hi!, I'm service-1 on camel-1/route2
-
-If you keep calling the http endpoint you'll notice they are consumed using a round robin policy and that one of the services registered in consul is not taken into account according to the blacklist.
-
-=== Web console
-
-You can open the Consul web console
-
-     http://localhost:8500/ui
-
-Where you can find information about the services and its state.
-     
-=== 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].
-
-We also love contributors, so
-https://camel.apache.org/contributing.html[get involved] :-)
-
-The Camel riders!
diff --git a/servicecall/consumer/pom.xml b/servicecall/consumer/pom.xml
deleted file mode 100644
index ec17e60..0000000
--- a/servicecall/consumer/pom.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.camel.springboot.example</groupId>
-        <artifactId>camel-example-spring-boot-servicecall</artifactId>
-        <version>3.19.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>camel-example-spring-boot-servicecall-consumer</artifactId>
-    <name>Camel SB Examples :: ServiceCall :: Consumer</name>
-    <description>An example showing how to work with Camel ServiceCall EIP and Spring Boot (Consumer)</description>
-
-    <properties>
-        <category>Cloud</category>
-
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Spring Boot BOM -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot-version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <!-- Camel BOM -->
-            <dependency>
-                <groupId>org.apache.camel.springboot</groupId>
-                <artifactId>camel-spring-boot-bom</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-
-        <!-- Spring Boot -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-actuator</artifactId>
-        </dependency>
-
-        <!-- Camel -->
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-consul-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-servlet-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-undertow-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-http-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-jackson-starter</artifactId>
-        </dependency>
-
-        <!-- test -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-spring-junit5</artifactId>
-            <version>${camel-version}</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>
diff --git a/servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerApplication.java b/servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerApplication.java
deleted file mode 100644
index b29b740..0000000
--- a/servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerApplication.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.example;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-//CHECKSTYLE:OFF
-/**
- * A sample Spring Boot application that starts the Camel routes.
- */
-@SpringBootApplication
-public class ServiceCallConsumerApplication {
-
-    /**
-     * A main method to start this application.
-     */
-    public static void main(String[] args) {
-        SpringApplication.run(ServiceCallConsumerApplication.class, args);
-    }
-
-}
-//CHECKSTYLE:ON
diff --git a/servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerAutoConfiguration.java b/servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerAutoConfiguration.java
deleted file mode 100644
index 2629aad..0000000
--- a/servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerAutoConfiguration.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.example;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class ServiceCallConsumerAutoConfiguration {
-
-    @Bean
-    public RouteBuilder routeBuilder() {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                rest("/serviceCall")
-                    .get("/{serviceId}")
-                    .to("direct:service-call");
-
-                from("direct:service-call")
-                    .setBody().constant(null)
-                    .removeHeaders("CamelHttp*")
-                    .to("log:service-call?level=INFO&showAll=true&multiline=true")
-                    .choice()
-                        .when(header("serviceId").isEqualTo("service1"))
-                            .serviceCall("service-1")
-                            .convertBodyTo(String.class)
-                            .log("service-1 : ${body}")
-                        .when(header("serviceId").isEqualTo("service2"))
-                            .serviceCall("service-2")
-                            .convertBodyTo(String.class)
-                            .log("service-2 : ${body}");
-            }
-        };
-    }
-}
\ No newline at end of file
diff --git a/servicecall/consumer/src/main/resources/application.properties b/servicecall/consumer/src/main/resources/application.properties
deleted file mode 100644
index 9189ced..0000000
--- a/servicecall/consumer/src/main/resources/application.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# Spring Boot
-management.endpoints.enabled-by-default=false
-management.endpoint.health.enabled=true
-
-# Camel
-camel.springboot.main-run-controller=true
-camel.springboot.jmx-enabled=false
-
-camel.rest.component=servlet
-camel.rest.binding-mode=auto
-
-# Configure the underlying Service Call component
-camel.cloud.service-call.component = undertow
-
-# Configure service filter
-camel.cloud.service-filter.blacklist[service-1] = localhost:9012
-
-# Configure additional services
-camel.cloud.service-discovery.services[service-2] = localhost:9021,localhost:9022,localhost:9023
-
-# Consul
-#
-# this property is not mandatory and it has been included to show how to configure
-# the service discovery implementation provided by camel-consul
-camel.cloud.consul.service-discovery.url=http://localhost:8500
diff --git a/servicecall/consumer/src/main/resources/logback.xml b/servicecall/consumer/src/main/resources/logback.xml
deleted file mode 100644
index dbeb95e..0000000
--- a/servicecall/consumer/src/main/resources/logback.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<configuration>
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
-    </encoder>
-  </appender>
-  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
-    </encoder>
-    <file>target/camel-example-spring-boot-servicecall-consumer.log</file>
-  </appender>
-  <root level="INFO">
-    <!--<appender-ref ref="FILE"/>-->
-    <appender-ref ref="STDOUT"/>
-  </root>
-</configuration>
\ No newline at end of file
diff --git a/servicecall/pom.xml b/servicecall/pom.xml
deleted file mode 100644
index 134f7d3..0000000
--- a/servicecall/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.camel.springboot.example</groupId>
-        <artifactId>examples</artifactId>
-        <version>3.19.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>camel-example-spring-boot-servicecall</artifactId>
-    <name>Camel SB Examples :: ServiceCall</name>
-    <description>An example showing how to work with Camel ServiceCall EIP and Spring Boot</description>
-    <packaging>pom</packaging>
-
-    <properties>
-        <category>Cloud</category>
-        <title>Spring Boot ServiceCall</title>
-    </properties>
-
-    <modules>
-        <module>consumer</module>
-        <module>services</module>
-    </modules>
-
-</project>
diff --git a/servicecall/services/pom.xml b/servicecall/services/pom.xml
deleted file mode 100644
index a13eeef..0000000
--- a/servicecall/services/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.camel.springboot.example</groupId>
-        <artifactId>camel-example-spring-boot-servicecall</artifactId>
-        <version>3.19.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>camel-example-spring-boot-servicecall-services</artifactId>
-    <name>Camel SB Examples :: ServiceCall :: Services</name>
-    <description>An example showing how to work with Camel ServiceCall EIP and Spring Boot (Services)</description>
-
-    <properties>
-        <category>Cloud</category>
-
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Spring Boot BOM -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot-version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <!-- Camel BOM -->
-            <dependency>
-                <groupId>org.apache.camel.springboot</groupId>
-                <artifactId>camel-spring-boot-bom</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-
-        <!-- Spring Boot -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- Camel -->
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel.springboot</groupId>
-            <artifactId>camel-undertow-starter</artifactId>
-        </dependency>
-
-        <!-- test -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-spring-junit5</artifactId>
-            <version>${camel-version}</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/servicecall/services/src/main/bash/consul-run-linux.sh b/servicecall/services/src/main/bash/consul-run-linux.sh
deleted file mode 100755
index e50ba4c..0000000
--- a/servicecall/services/src/main/bash/consul-run-linux.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-CONSUL_VER="1.11.2"
-CONSUL_ZIP="consul_${CONSUL_VER}_linux_amd64.zip"
-
-# cleanup
-rm -rf "target/consul-data"
-rm -rf "target/consul-config"
-rm -rf "target/consul"
-
-mkdir -p target/
-mkdir -p target/consul-data
-mkdir -p target/consul-config
-
-if [ ! -f target/${CONSUL_ZIP} ]; then
-    echo Downloading: https://releases.hashicorp.com/consul/${CONSUL_VER}/${CONSUL_ZIP}
-    wget "https://releases.hashicorp.com/consul/${CONSUL_VER}/${CONSUL_ZIP}" -O target/${CONSUL_ZIP}
-fi
-
-
-unzip -d target target/${CONSUL_ZIP}
-chmod +x target/consul
-
-target/consul \
-    agent \
-    -server \
-    -bootstrap \
-    -datacenter camel \
-    -advertise 127.0.0.1 \
-    -bind 0.0.0.0 \
-    -log-level trace \
-    -data-dir target/consul-data \
-    -config-dir src/main/resources/consul \
-    -ui
diff --git a/servicecall/services/src/main/bash/consul-run-osx.sh b/servicecall/services/src/main/bash/consul-run-osx.sh
deleted file mode 100755
index 05ec493..0000000
--- a/servicecall/services/src/main/bash/consul-run-osx.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-CONSUL_VER="1.11.2"
-CONSUL_ZIP="consul_${CONSUL_VER}_darwin_amd64.zip"
-
-# cleanup
-rm -rf "target/consul-data"
-rm -rf "target/consul-config"
-rm -rf "target/consul"
-
-mkdir -p target/
-mkdir -p target/consul-data
-mkdir -p target/consul-config
-
-
-if [ ! -f target/$CONSUL_ZIP ]; then
-    echo Downloading: https://releases.hashicorp.com/consul/$CONSUL_VER/$CONSUL_ZIP 
-    curl -o target/$CONSUL_ZIP "https://releases.hashicorp.com/consul/$CONSUL_VER/$CONSUL_ZIP"
-fi
-
-
-unzip -d target target/$CONSUL_ZIP
-chmod +x target/consul
-
-target/consul \
-    agent \
-    -server \
-    -bootstrap \
-    -datacenter camel \
-    -advertise 127.0.0.1 \
-    -bind 0.0.0.0 \
-    -log-level trace \
-    -data-dir target/consul-data \
-    -config-dir src/main/resources/consul \
-    -ui
diff --git a/servicecall/services/src/main/java/org/apache/camel/example/ServiceApplication.java b/servicecall/services/src/main/java/org/apache/camel/example/ServiceApplication.java
deleted file mode 100644
index 52b99a2..0000000
--- a/servicecall/services/src/main/java/org/apache/camel/example/ServiceApplication.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.example;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Component;
-
-//CHECKSTYLE:OFF
-/**
- * A sample Spring Boot application that starts the Camel routes.
- */
-@SpringBootApplication
-public class ServiceApplication {
-
-    @Profile("service-1")
-    @Component
-    public class Service1Route extends RouteBuilder {
-        @Override
-        public void configure() throws Exception {
-            from("undertow:http://localhost:9011")
-                .to("log:org.apache.camel.example?level=INFO&showAll=true&multiline=true")
-                .transform().simple("Hi!, I'm {{spring.profiles.active}} on ${camelId}/${routeId}");
-            from("undertow:http://localhost:9012")
-                .to("log:org.apache.camel.example?level=INFO&showAll=true&multiline=true")
-                .transform().simple("Hi!, I'm {{spring.profiles.active}} on ${camelId}/${routeId}");
-            from("undertow:http://localhost:9013")
-                .to("log:org.apache.camel.example?level=INFO&showAll=true&multiline=true")
-                .transform().simple("Hi!, I'm {{spring.profiles.active}} on ${camelId}/${routeId}");
-        }
-    }
-
-    @Profile("service-2")
-    @Component
-    public class Service2Route extends RouteBuilder {
-        @Override
-        public void configure() throws Exception {
-            from("undertow:http://localhost:9021")
-                .to("log:org.apache.camel.example?level=INFO&showAll=true&multiline=true")
-                .transform().simple("Hi!, I'm {{spring.profiles.active}} on ${camelId}/${routeId}");
-            from("undertow:http://localhost:9022")
-                .to("log:org.apache.camel.example?level=INFO&showAll=true&multiline=true")
-                .transform().simple("Hi!, I'm {{spring.profiles.active}} on ${camelId}/${routeId}");
-            from("undertow:http://localhost:9023")
-                .to("log:org.apache.camel.example?level=INFO&showAll=true&multiline=true")
-                .transform().simple("Hi!, I'm {{spring.profiles.active}} on ${camelId}/${routeId}");
-        }
-    }
-
-    /**
-     * A main method to start this application.
-     */
-    public static void main(String[] args) {
-        SpringApplication.run(ServiceApplication.class, args);
-    }
-
-}
-//CHECKSTYLE:ON
diff --git a/servicecall/services/src/main/resources/application.properties b/servicecall/services/src/main/resources/application.properties
deleted file mode 100644
index cc61bad..0000000
--- a/servicecall/services/src/main/resources/application.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-##      http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# Spring Boot
-management.endpoints.enabled-by-default=false
-management.endpoint.health.enabled=true
-
-# Camel
-camel.springboot.main-run-controller=true
-camel.springboot.jmx-enabled=false
-
diff --git a/servicecall/services/src/main/resources/consul/services.json b/servicecall/services/src/main/resources/consul/services.json
deleted file mode 100644
index ca43a54..0000000
--- a/servicecall/services/src/main/resources/consul/services.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "services": [{
-    "id": "s1i1", "name": "service-1", "tags": ["camel", "service-call"], "address": "localhost", "port": 9011
-  }, {
-    "id": "s1i2", "name": "service-1", "tags": ["camel", "service-call"], "address": "localhost", "port": 9012
-  }, {
-    "id": "s1i3", "name": "service-1", "tags": ["camel", "service-call"], "address": "localhost", "port": 9013
-  }, {
-    "id": "s1i4", "name": "service-1", "address": "localhost", "port": 9014
-  }, {
-    "id": "s2i1", "name": "service-2", "tags": ["camel", "service-call"], "address": "localhost", "port": 9021
-  }, {
-    "id": "s2i2", "name": "service-2", "tags": ["camel", "service-call"], "address": "localhost", "port": 9022
-  }, {
-    "id": "s2i3", "name": "service-2", "tags": ["camel", "service-call"], "address": "localhost", "port": 9023
-  }, {
-    "id": "s2i4", "name": "service-2", "address": "localhost", "port": 9024
-  }]
-}
\ No newline at end of file
diff --git a/servicecall/services/src/main/resources/logback.xml b/servicecall/services/src/main/resources/logback.xml
deleted file mode 100644
index 4bbf10e..0000000
--- a/servicecall/services/src/main/resources/logback.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<configuration>
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
-    </encoder>
-  </appender>
-  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-    <encoder>
-      <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
-    </encoder>
-    <file>target/camel-example-spring-boot-servicecall-service-1.log</file>
-  </appender>
-  <root level="INFO">
-    <!--<appender-ref ref="FILE"/>-->
-    <appender-ref ref="STDOUT"/>
-  </root>
-</configuration>
\ No newline at end of file
diff --git a/splitter-eip/pom.xml b/splitter-eip/pom.xml
index 5c03bd0..475c55f 100644
--- a/splitter-eip/pom.xml
+++ b/splitter-eip/pom.xml
@@ -33,7 +33,7 @@
 	<description>An example showing Splitter EIP with Camel and Spring Boot</description>
 
 	<properties>
-		<category>Beginner</category>
+		<category>EIP</category>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/undertow-spring-security/pom.xml b/undertow-spring-security/pom.xml
index c3cd3b9..4172dff 100644
--- a/undertow-spring-security/pom.xml
+++ b/undertow-spring-security/pom.xml
@@ -31,7 +31,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <category>Advanced</category>
+        <category>Security</category>
     </properties>
 
     <dependencyManagement>
diff --git a/unit-testing/pom.xml b/unit-testing/pom.xml
index 3abdc1c..6c1110f 100644
--- a/unit-testing/pom.xml
+++ b/unit-testing/pom.xml
@@ -14,7 +14,7 @@
 	<description>An example showing how to write unit tests with Camel and Spring Boot</description>
 
 	<properties>
-		<category>Beginner</category>
+		<category>Testing</category>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/webhook/pom.xml b/webhook/pom.xml
index fdae754..788a5cc 100644
--- a/webhook/pom.xml
+++ b/webhook/pom.xml
@@ -31,7 +31,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <category>Advanced</category>
+        <category>Cloud</category>
     </properties>
 
     <dependencyManagement>