You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2020/03/11 09:59:53 UTC

[camel-quarkus] 02/03: Fix #865 Re-org the source tree

This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit cdc4da09e0ca7603a95435fa1cc13eb66401a9dc
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Tue Mar 10 23:16:36 2020 +0100

    Fix #865 Re-org the source tree
---
 .../core-cloud/deployment/pom.xml                  |  0
 {extensions => extensions-core}/core-cloud/pom.xml |  0
 .../core-cloud/runtime/pom.xml                     |  0
 .../graal/SubstituteCachingServiceDiscovery.java   |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../core/deployment/pom.xml                        |  0
 .../quarkus/core/deployment/BuildProcessor.java    |  0
 .../core/deployment/CamelBeanBuildItem.java        |  0
 .../quarkus/core/deployment/CamelBeanInfo.java     |  0
 .../core/deployment/CamelContextBuildItem.java     |  0
 .../CamelFactoryFinderResolverBuildItem.java       |  0
 .../core/deployment/CamelMainBuildItem.java        |  0
 .../deployment/CamelMainListenerBuildItem.java     |  0
 .../CamelModelJAXBContextFactoryBuildItem.java     |  0
 .../deployment/CamelModelToXMLDumperBuildItem.java |  0
 .../deployment/CamelReactiveExecutorBuildItem.java |  0
 .../core/deployment/CamelRegistryBuildItem.java    |  0
 .../CamelRoutesBuilderClassBuildItem.java          |  0
 .../deployment/CamelRoutesCollectorBuildItem.java  |  0
 .../deployment/CamelRoutesLoaderBuildItems.java    |  0
 .../core/deployment/CamelRuntimeBeanBuildItem.java |  0
 .../deployment/CamelRuntimeRegistryBuildItem.java  |  0
 .../core/deployment/CamelServiceBuildItem.java     |  0
 .../core/deployment/CamelServiceFilter.java        |  0
 .../deployment/CamelServiceFilterBuildItem.java    |  0
 .../deployment/CamelServicePatternBuildItem.java   |  0
 .../quarkus/core/deployment/CamelSupport.java      |  0
 .../CamelTypeConverterLoaderBuildItem.java         |  0
 .../CamelTypeConverterRegistryBuildItem.java       |  0
 .../core/deployment/ContainerBeansBuildItem.java   |  0
 .../camel/quarkus/core/deployment/Feature.java     |  0
 .../core/deployment/HotDeploymentProcessor.java    |  0
 .../core/deployment/NativeImageProcessor.java      |  0
 .../deployment/UnbannedReflectiveBuildItem.java    |  0
 .../core/deployment/UploadAttacherBuildItem.java   |  0
 .../quarkus/core/deployment/util/PathFilter.java   |  0
 .../core/deployment/CamelRoutesDiscoveryTest.java  |  0
 .../core/deployment/CamelRoutesFilterTest.java     |  0
 .../core/deployment/util/PathFilterTest.java       |  0
 .../quarkus/core/runtime/CamelProducersTest.java   |  0
 .../quarkus/core/runtime/CamelRegistryTest.java    |  0
 {extensions => extensions-core}/core/pom.xml       |  0
 .../core/runtime/pom.xml                           |  0
 .../org/apache/camel/quarkus/core/BaseModel.java   |  0
 .../org/apache/camel/quarkus/core/CamelConfig.java |  0
 .../org/apache/camel/quarkus/core/CamelMain.java   |  0
 .../quarkus/core/CamelMainEventDispatcher.java     |  0
 .../apache/camel/quarkus/core/CamelMainEvents.java |  0
 .../camel/quarkus/core/CamelMainProducers.java     |  0
 .../camel/quarkus/core/CamelMainRecorder.java      |  0
 .../apache/camel/quarkus/core/CamelProducers.java  |  0
 .../apache/camel/quarkus/core/CamelRecorder.java   |  0
 .../camel/quarkus/core/CamelRoutesCollector.java   |  0
 .../camel/quarkus/core/CamelRuntimeCatalog.java    |  0
 .../quarkus/core/CoreAttachmentsRecorder.java      |  0
 .../core/DisabledModelJAXBContextFactory.java      |  0
 .../quarkus/core/DisabledModelToXMLDumper.java     |  0
 .../core/DisabledPredicateValidatorReifier.java    |  0
 .../quarkus/core/DisabledValidateReifier.java      |  0
 .../core/DisabledXMLRoutesDefinitionLoader.java    |  0
 .../camel/quarkus/core/FastCamelContext.java       |  0
 .../quarkus/core/FastFactoryFinderResolver.java    |  0
 .../org/apache/camel/quarkus/core/FastModel.java   |  0
 .../camel/quarkus/core/FastTypeConverter.java      |  0
 .../camel/quarkus/core/FastUuidGenerator.java      |  0
 .../java/org/apache/camel/quarkus/core/Flags.java  |  0
 .../camel/quarkus/core/NoShutdownStrategy.java     |  0
 .../camel/quarkus/core/RegistryRoutesLoader.java   |  0
 .../camel/quarkus/core/RegistryRoutesLoaders.java  |  0
 .../camel/quarkus/core/RuntimeBeanRepository.java  |  0
 .../apache/camel/quarkus/core/RuntimeRegistry.java |  0
 .../apache/camel/quarkus/core/UploadAttacher.java  |  0
 .../core/devmode/CamelHotReplacementSetup.java     |  0
 .../quarkus/core/graal/SubstituteHostUtils.java    |  0
 .../core/graal/SubstituteIntrospectionSupport.java |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../io.quarkus.dev.spi.HotReplacementSetup         |  0
 .../http-common/deployment/pom.xml                 |  0
 .../http-common/pom.xml                            |  0
 .../http-common/runtime/pom.xml                    |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../support/common => extensions-core}/pom.xml     | 21 +++--
 .../reactive-executor/deployment/pom.xml           |  0
 .../executor/deployment/BuildProcessor.java        |  0
 .../reactive/executor/deployment/Feature.java      |  0
 .../reactive-executor/pom.xml                      |  0
 .../reactive-executor/runtime/pom.xml              |  0
 .../executor/ReactiveExecutorRecorder.java         |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../xml-io/deployment/pom.xml                      |  0
 .../xml/io/deployment/XmlIoProcessor.java          |  0
 {extensions => extensions-core}/xml-io/pom.xml     |  0
 .../xml-io/runtime/pom.xml                         |  0
 .../quarkus/component/xml/io/XmlIoRecorder.java    |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../xml-jaxb/deployment/pom.xml                    |  0
 .../xml/jaxb/deployment/XmlJaxbProcessor.java      |  0
 .../xml/jaxb/deployment/CamelDevModeTest.java      |  0
 .../xml/jaxb/deployment/CamelSupportResource.java  |  0
 .../deployment/src/test/resources/routes.1         |  0
 .../deployment/src/test/resources/routes.2         |  0
 {extensions => extensions-core}/xml-jaxb/pom.xml   |  0
 .../xml-jaxb/runtime/pom.xml                       |  0
 .../component/xml/jaxb/XmlJaxbRecorder.java        |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../xml-jaxp/deployment/pom.xml                    |  0
 .../xml/jaxp/deployment/XmlJaxpProcessor.java      |  0
 {extensions => extensions-core}/xml-jaxp/pom.xml   |  0
 .../xml-jaxp/runtime/pom.xml                       |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../ahc/deployment/pom.xml                         |  0
 .../ahc/deployment/SupportAhcProcessor.java        |  0
 .../support => extensions-support}/ahc/pom.xml     |  2 +-
 .../ahc/runtime/pom.xml                            |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../aws/deployment/pom.xml                         |  0
 .../commons/deployment/AwsCommonsProcessor.java    |  0
 .../support => extensions-support}/aws/pom.xml     |  2 +-
 .../aws/runtime/pom.xml                            |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../common/deployment/pom.xml                      |  0
 .../common/deployment/CommonSupportFeature.java    |  0
 .../support => extensions-support}/common/pom.xml  |  2 +-
 .../common/runtime/pom.xml                         |  0
 .../quarkus/support/common/CamelCapabilities.java  |  0
 .../runtime/graal/SubstituteBeansIntrospector.java |  0
 .../runtime/graal/SubstituteBeansWeakCache.java    |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../commons-logging/deployment/pom.xml             |  0
 .../deployment/CommonsLoggingSupportFeature.java   |  0
 .../deployment/CommonsLoggingSupportProcessor.java |  0
 .../commons-logging/pom.xml                        |  2 +-
 .../commons-logging/runtime/pom.xml                |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../consul-client/deployment/pom.xml               |  0
 .../deployment/ConsulClientSupportFeature.java     |  0
 .../deployment/ConsulClientSupportProcessor.java   |  0
 .../consul-client/pom.xml                          |  2 +-
 .../consul-client/runtime/pom.xml                  |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../httpclient/deployment/pom.xml                  |  0
 .../httpclient/deployment/HttpClientFeature.java   |  0
 .../httpclient/deployment/HttpClientProcessor.java |  0
 .../httpclient/pom.xml                             |  2 +-
 .../httpclient/runtime/pom.xml                     |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../jackson-dataformat-xml/deployment/pom.xml      |  0
 .../JacksonDataformatXmlSupportProcessor.java      |  0
 .../jackson-dataformat-xml/pom.xml                 |  2 +-
 .../jackson-dataformat-xml/runtime/pom.xml         |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../jetty/deployment/pom.xml                       |  0
 .../jetty/deployment/JettySupportFeature.java      |  0
 .../jetty/deployment/JettySupportProcessor.java    |  0
 .../support => extensions-support}/jetty/pom.xml   |  2 +-
 .../jetty/runtime/pom.xml                          |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../policy/deployment/pom.xml                      |  0
 .../support/policy/deployment/PolicyProcessor.java |  0
 .../support => extensions-support}/policy/pom.xml  |  2 +-
 .../policy/runtime/pom.xml                         |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  4 +-
 {extensions/support => extensions-support}/pom.xml |  6 +-
 .../retrofit/deployment/pom.xml                    |  0
 .../deployment/RetrofitSupportFeature.java         |  0
 .../retrofit/pom.xml                               |  2 +-
 .../retrofit/runtime/pom.xml                       |  0
 ...etableFutureCallAdapterFactorySubstitution.java |  0
 .../DefaultCallAdapterFactorySubstitution.java     |  0
 .../ExecutorCallAdapterFactorySubstitution.java    |  0
 .../OptionalConverterFactorySubstitution.java      |  0
 .../retrofit/graal/PlatformSubstitution.java       |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../spring/deployment/pom.xml                      |  0
 .../support/spring/deployment/SpringFeature.java   |  0
 .../support/spring/deployment/SpringProcessor.java |  0
 .../support => extensions-support}/spring/pom.xml  |  2 +-
 .../spring/runtime/pom.xml                         |  0
 .../support/spring/graal/SpringSubstitutions.java  |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../xalan/deployment/pom.xml                       |  0
 .../support/xalan/deployment/XalanFeature.java     |  0
 .../deployment/XalanNativeImageProcessor.java      |  0
 .../support => extensions-support}/xalan/pom.xml   |  2 +-
 .../xalan/runtime/pom.xml                          |  0
 .../support/xalan/XalanTransformerFactory.java     |  0
 .../xalan/graal/SunTemplatesImplSubstitution.java  |  0
 .../xalan/graal/TemplatesImplSubstitution.java     |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../xml/deployment/pom.xml                         |  0
 .../support/xml/deployment/XmlSupportFeature.java  |  0
 .../xml/deployment/XmlSupportProcessor.java        |  0
 .../support => extensions-support}/xml/pom.xml     |  2 +-
 .../xml/runtime/pom.xml                            |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 .../xstream/deployment/pom.xml                     |  0
 .../xstream/deployment/XStreamSupportFeature.java  |  0
 .../deployment/XStreamSupportProcessor.java        |  0
 .../support => extensions-support}/xstream/pom.xml |  2 +-
 .../xstream/runtime/pom.xml                        |  0
 .../main/resources/META-INF/quarkus-extension.yaml |  0
 extensions/pom.xml                                 | 52 -------------
 pom.xml                                            | 16 ++++
 .../quarkus/maven/UpdateDocExtensionsListMojo.java |  6 +-
 tooling/scripts/sort-poms.groovy                   |  9 ++-
 tooling/scripts/validate-extension-metadata.groovy | 91 ++++++++++++----------
 206 files changed, 107 insertions(+), 126 deletions(-)

diff --git a/extensions/core-cloud/deployment/pom.xml b/extensions-core/core-cloud/deployment/pom.xml
similarity index 100%
rename from extensions/core-cloud/deployment/pom.xml
rename to extensions-core/core-cloud/deployment/pom.xml
diff --git a/extensions/core-cloud/pom.xml b/extensions-core/core-cloud/pom.xml
similarity index 100%
rename from extensions/core-cloud/pom.xml
rename to extensions-core/core-cloud/pom.xml
diff --git a/extensions/core-cloud/runtime/pom.xml b/extensions-core/core-cloud/runtime/pom.xml
similarity index 100%
rename from extensions/core-cloud/runtime/pom.xml
rename to extensions-core/core-cloud/runtime/pom.xml
diff --git a/extensions/core-cloud/runtime/src/main/java/org/apache/camel/core/cloud/graal/SubstituteCachingServiceDiscovery.java b/extensions-core/core-cloud/runtime/src/main/java/org/apache/camel/core/cloud/graal/SubstituteCachingServiceDiscovery.java
similarity index 100%
rename from extensions/core-cloud/runtime/src/main/java/org/apache/camel/core/cloud/graal/SubstituteCachingServiceDiscovery.java
rename to extensions-core/core-cloud/runtime/src/main/java/org/apache/camel/core/cloud/graal/SubstituteCachingServiceDiscovery.java
diff --git a/extensions/core-cloud/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-core/core-cloud/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/core-cloud/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-core/core-cloud/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/core/deployment/pom.xml b/extensions-core/core/deployment/pom.xml
similarity index 100%
rename from extensions/core/deployment/pom.xml
rename to extensions-core/core/deployment/pom.xml
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/BuildProcessor.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanInfo.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanInfo.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanInfo.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelBeanInfo.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelContextBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelFactoryFinderResolverBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelFactoryFinderResolverBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelFactoryFinderResolverBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelFactoryFinderResolverBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainListenerBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainListenerBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainListenerBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelMainListenerBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelJAXBContextFactoryBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelJAXBContextFactoryBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelJAXBContextFactoryBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelJAXBContextFactoryBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelToXMLDumperBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelToXMLDumperBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelToXMLDumperBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelModelToXMLDumperBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelReactiveExecutorBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelReactiveExecutorBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelReactiveExecutorBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelReactiveExecutorBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRegistryBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesBuilderClassBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesBuilderClassBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesBuilderClassBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesBuilderClassBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesCollectorBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesLoaderBuildItems.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesLoaderBuildItems.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesLoaderBuildItems.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRoutesLoaderBuildItems.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeBeanBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeBeanBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeBeanBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeBeanBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeRegistryBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeRegistryBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeRegistryBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelRuntimeRegistryBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilter.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilter.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilter.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilter.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilterBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilterBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilterBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServiceFilterBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServicePatternBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServicePatternBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServicePatternBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelServicePatternBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelSupport.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterLoaderBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterLoaderBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterLoaderBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterLoaderBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterRegistryBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterRegistryBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterRegistryBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelTypeConverterRegistryBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ContainerBeansBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ContainerBeansBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ContainerBeansBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/ContainerBeansBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/Feature.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/HotDeploymentProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/HotDeploymentProcessor.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/HotDeploymentProcessor.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/HotDeploymentProcessor.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/NativeImageProcessor.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UnbannedReflectiveBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UnbannedReflectiveBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UnbannedReflectiveBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UnbannedReflectiveBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UploadAttacherBuildItem.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UploadAttacherBuildItem.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UploadAttacherBuildItem.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/UploadAttacherBuildItem.java
diff --git a/extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/util/PathFilter.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/util/PathFilter.java
similarity index 100%
rename from extensions/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/util/PathFilter.java
rename to extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/util/PathFilter.java
diff --git a/extensions/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesDiscoveryTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesDiscoveryTest.java
similarity index 100%
rename from extensions/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesDiscoveryTest.java
rename to extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesDiscoveryTest.java
diff --git a/extensions/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesFilterTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesFilterTest.java
similarity index 100%
rename from extensions/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesFilterTest.java
rename to extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/CamelRoutesFilterTest.java
diff --git a/extensions/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/util/PathFilterTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/util/PathFilterTest.java
similarity index 100%
rename from extensions/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/util/PathFilterTest.java
rename to extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/deployment/util/PathFilterTest.java
diff --git a/extensions/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelProducersTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelProducersTest.java
similarity index 100%
rename from extensions/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelProducersTest.java
rename to extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelProducersTest.java
diff --git a/extensions/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelRegistryTest.java b/extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelRegistryTest.java
similarity index 100%
rename from extensions/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelRegistryTest.java
rename to extensions-core/core/deployment/src/test/java/org/apache/camel/quarkus/core/runtime/CamelRegistryTest.java
diff --git a/extensions/core/pom.xml b/extensions-core/core/pom.xml
similarity index 100%
rename from extensions/core/pom.xml
rename to extensions-core/core/pom.xml
diff --git a/extensions/core/runtime/pom.xml b/extensions-core/core/runtime/pom.xml
similarity index 100%
rename from extensions/core/runtime/pom.xml
rename to extensions-core/core/runtime/pom.xml
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/BaseModel.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMain.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMain.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMain.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMain.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEventDispatcher.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEventDispatcher.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEventDispatcher.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEventDispatcher.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEvents.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEvents.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEvents.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainEvents.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainProducers.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainProducers.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainProducers.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainProducers.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainRecorder.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainRecorder.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelMainRecorder.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelProducers.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelProducers.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelProducers.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelProducers.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRoutesCollector.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRoutesCollector.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRoutesCollector.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRoutesCollector.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CoreAttachmentsRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CoreAttachmentsRecorder.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CoreAttachmentsRecorder.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CoreAttachmentsRecorder.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelJAXBContextFactory.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelJAXBContextFactory.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelJAXBContextFactory.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelJAXBContextFactory.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastFactoryFinderResolver.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastFactoryFinderResolver.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastFactoryFinderResolver.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastFactoryFinderResolver.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastModel.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastModel.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastModel.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastModel.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastUuidGenerator.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastUuidGenerator.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastUuidGenerator.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastUuidGenerator.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/Flags.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/Flags.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/Flags.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/Flags.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/NoShutdownStrategy.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/NoShutdownStrategy.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/NoShutdownStrategy.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/NoShutdownStrategy.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/RegistryRoutesLoader.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RegistryRoutesLoader.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/RegistryRoutesLoader.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RegistryRoutesLoader.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/RegistryRoutesLoaders.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RegistryRoutesLoaders.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/RegistryRoutesLoaders.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RegistryRoutesLoaders.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeRegistry.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeRegistry.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeRegistry.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeRegistry.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/UploadAttacher.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/UploadAttacher.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/UploadAttacher.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/UploadAttacher.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/devmode/CamelHotReplacementSetup.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/devmode/CamelHotReplacementSetup.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/devmode/CamelHotReplacementSetup.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/devmode/CamelHotReplacementSetup.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/SubstituteHostUtils.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/SubstituteHostUtils.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/SubstituteHostUtils.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/SubstituteHostUtils.java
diff --git a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/SubstituteIntrospectionSupport.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/SubstituteIntrospectionSupport.java
similarity index 100%
rename from extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/SubstituteIntrospectionSupport.java
rename to extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/SubstituteIntrospectionSupport.java
diff --git a/extensions/core/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-core/core/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/core/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-core/core/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/core/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup b/extensions-core/core/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup
similarity index 100%
rename from extensions/core/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup
rename to extensions-core/core/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup
diff --git a/extensions/http-common/deployment/pom.xml b/extensions-core/http-common/deployment/pom.xml
similarity index 100%
rename from extensions/http-common/deployment/pom.xml
rename to extensions-core/http-common/deployment/pom.xml
diff --git a/extensions/http-common/pom.xml b/extensions-core/http-common/pom.xml
similarity index 100%
rename from extensions/http-common/pom.xml
rename to extensions-core/http-common/pom.xml
diff --git a/extensions/http-common/runtime/pom.xml b/extensions-core/http-common/runtime/pom.xml
similarity index 100%
rename from extensions/http-common/runtime/pom.xml
rename to extensions-core/http-common/runtime/pom.xml
diff --git a/extensions/http-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-core/http-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/http-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-core/http-common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/common/pom.xml b/extensions-core/pom.xml
similarity index 75%
copy from extensions/support/common/pom.xml
copy to extensions-core/pom.xml
index da06aed..c16a012 100644
--- a/extensions/support/common/pom.xml
+++ b/extensions-core/pom.xml
@@ -19,21 +19,26 @@
 -->
 <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/xsd/maven-4.0.0.xsd">
 
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-build-parent</artifactId>
+        <artifactId>camel-quarkus-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>camel-quarkus-support-common-parent</artifactId>
-    <name>Camel Quarkus :: Support :: Common</name>
+    <artifactId>camel-quarkus-extensions-core</artifactId>
     <packaging>pom</packaging>
+
+    <name>Camel Quarkus :: Extensions :: Core</name>
+
     <modules>
-        <module>deployment</module>
-        <module>runtime</module>
+        <module>core</module>
+        <module>core-cloud</module>
+        <module>http-common</module>
+        <module>reactive-executor</module>
+        <module>xml-io</module>
+        <module>xml-jaxb</module>
+        <module>xml-jaxp</module>
     </modules>
 
 </project>
diff --git a/extensions/reactive-executor/deployment/pom.xml b/extensions-core/reactive-executor/deployment/pom.xml
similarity index 100%
rename from extensions/reactive-executor/deployment/pom.xml
rename to extensions-core/reactive-executor/deployment/pom.xml
diff --git a/extensions/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java b/extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
similarity index 100%
rename from extensions/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
rename to extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java
diff --git a/extensions/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/Feature.java b/extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/Feature.java
similarity index 100%
rename from extensions/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/Feature.java
rename to extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/Feature.java
diff --git a/extensions/reactive-executor/pom.xml b/extensions-core/reactive-executor/pom.xml
similarity index 100%
rename from extensions/reactive-executor/pom.xml
rename to extensions-core/reactive-executor/pom.xml
diff --git a/extensions/reactive-executor/runtime/pom.xml b/extensions-core/reactive-executor/runtime/pom.xml
similarity index 100%
rename from extensions/reactive-executor/runtime/pom.xml
rename to extensions-core/reactive-executor/runtime/pom.xml
diff --git a/extensions/reactive-executor/runtime/src/main/java/org/apache/camel/quarkus/reactive/executor/ReactiveExecutorRecorder.java b/extensions-core/reactive-executor/runtime/src/main/java/org/apache/camel/quarkus/reactive/executor/ReactiveExecutorRecorder.java
similarity index 100%
rename from extensions/reactive-executor/runtime/src/main/java/org/apache/camel/quarkus/reactive/executor/ReactiveExecutorRecorder.java
rename to extensions-core/reactive-executor/runtime/src/main/java/org/apache/camel/quarkus/reactive/executor/ReactiveExecutorRecorder.java
diff --git a/extensions/reactive-executor/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-core/reactive-executor/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/reactive-executor/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-core/reactive-executor/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/xml-io/deployment/pom.xml b/extensions-core/xml-io/deployment/pom.xml
similarity index 100%
rename from extensions/xml-io/deployment/pom.xml
rename to extensions-core/xml-io/deployment/pom.xml
diff --git a/extensions/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java b/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
similarity index 100%
rename from extensions/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
rename to extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java
diff --git a/extensions/xml-io/pom.xml b/extensions-core/xml-io/pom.xml
similarity index 100%
rename from extensions/xml-io/pom.xml
rename to extensions-core/xml-io/pom.xml
diff --git a/extensions/xml-io/runtime/pom.xml b/extensions-core/xml-io/runtime/pom.xml
similarity index 100%
rename from extensions/xml-io/runtime/pom.xml
rename to extensions-core/xml-io/runtime/pom.xml
diff --git a/extensions/xml-io/runtime/src/main/java/org/apache/camel/quarkus/component/xml/io/XmlIoRecorder.java b/extensions-core/xml-io/runtime/src/main/java/org/apache/camel/quarkus/component/xml/io/XmlIoRecorder.java
similarity index 100%
rename from extensions/xml-io/runtime/src/main/java/org/apache/camel/quarkus/component/xml/io/XmlIoRecorder.java
rename to extensions-core/xml-io/runtime/src/main/java/org/apache/camel/quarkus/component/xml/io/XmlIoRecorder.java
diff --git a/extensions/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-core/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-core/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/xml-jaxb/deployment/pom.xml b/extensions-core/xml-jaxb/deployment/pom.xml
similarity index 100%
rename from extensions/xml-jaxb/deployment/pom.xml
rename to extensions-core/xml-jaxb/deployment/pom.xml
diff --git a/extensions/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java b/extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java
similarity index 100%
rename from extensions/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java
rename to extensions-core/xml-jaxb/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/XmlJaxbProcessor.java
diff --git a/extensions/xml-jaxb/deployment/src/test/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/CamelDevModeTest.java b/extensions-core/xml-jaxb/deployment/src/test/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/CamelDevModeTest.java
similarity index 100%
rename from extensions/xml-jaxb/deployment/src/test/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/CamelDevModeTest.java
rename to extensions-core/xml-jaxb/deployment/src/test/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/CamelDevModeTest.java
diff --git a/extensions/xml-jaxb/deployment/src/test/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/CamelSupportResource.java b/extensions-core/xml-jaxb/deployment/src/test/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/CamelSupportResource.java
similarity index 100%
rename from extensions/xml-jaxb/deployment/src/test/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/CamelSupportResource.java
rename to extensions-core/xml-jaxb/deployment/src/test/java/org/apache/camel/quarkus/component/xml/jaxb/deployment/CamelSupportResource.java
diff --git a/extensions/xml-jaxb/deployment/src/test/resources/routes.1 b/extensions-core/xml-jaxb/deployment/src/test/resources/routes.1
similarity index 100%
rename from extensions/xml-jaxb/deployment/src/test/resources/routes.1
rename to extensions-core/xml-jaxb/deployment/src/test/resources/routes.1
diff --git a/extensions/xml-jaxb/deployment/src/test/resources/routes.2 b/extensions-core/xml-jaxb/deployment/src/test/resources/routes.2
similarity index 100%
rename from extensions/xml-jaxb/deployment/src/test/resources/routes.2
rename to extensions-core/xml-jaxb/deployment/src/test/resources/routes.2
diff --git a/extensions/xml-jaxb/pom.xml b/extensions-core/xml-jaxb/pom.xml
similarity index 100%
rename from extensions/xml-jaxb/pom.xml
rename to extensions-core/xml-jaxb/pom.xml
diff --git a/extensions/xml-jaxb/runtime/pom.xml b/extensions-core/xml-jaxb/runtime/pom.xml
similarity index 100%
rename from extensions/xml-jaxb/runtime/pom.xml
rename to extensions-core/xml-jaxb/runtime/pom.xml
diff --git a/extensions/xml-jaxb/runtime/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/XmlJaxbRecorder.java b/extensions-core/xml-jaxb/runtime/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/XmlJaxbRecorder.java
similarity index 100%
rename from extensions/xml-jaxb/runtime/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/XmlJaxbRecorder.java
rename to extensions-core/xml-jaxb/runtime/src/main/java/org/apache/camel/quarkus/component/xml/jaxb/XmlJaxbRecorder.java
diff --git a/extensions/xml-jaxb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-core/xml-jaxb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/xml-jaxb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-core/xml-jaxb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/xml-jaxp/deployment/pom.xml b/extensions-core/xml-jaxp/deployment/pom.xml
similarity index 100%
rename from extensions/xml-jaxp/deployment/pom.xml
rename to extensions-core/xml-jaxp/deployment/pom.xml
diff --git a/extensions/xml-jaxp/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxp/deployment/XmlJaxpProcessor.java b/extensions-core/xml-jaxp/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxp/deployment/XmlJaxpProcessor.java
similarity index 100%
rename from extensions/xml-jaxp/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxp/deployment/XmlJaxpProcessor.java
rename to extensions-core/xml-jaxp/deployment/src/main/java/org/apache/camel/quarkus/component/xml/jaxp/deployment/XmlJaxpProcessor.java
diff --git a/extensions/xml-jaxp/pom.xml b/extensions-core/xml-jaxp/pom.xml
similarity index 100%
rename from extensions/xml-jaxp/pom.xml
rename to extensions-core/xml-jaxp/pom.xml
diff --git a/extensions/xml-jaxp/runtime/pom.xml b/extensions-core/xml-jaxp/runtime/pom.xml
similarity index 100%
rename from extensions/xml-jaxp/runtime/pom.xml
rename to extensions-core/xml-jaxp/runtime/pom.xml
diff --git a/extensions/xml-jaxp/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-core/xml-jaxp/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/xml-jaxp/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-core/xml-jaxp/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/ahc/deployment/pom.xml b/extensions-support/ahc/deployment/pom.xml
similarity index 100%
rename from extensions/support/ahc/deployment/pom.xml
rename to extensions-support/ahc/deployment/pom.xml
diff --git a/extensions/support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java b/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
similarity index 100%
rename from extensions/support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
rename to extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
diff --git a/extensions/support/ahc/pom.xml b/extensions-support/ahc/pom.xml
similarity index 95%
rename from extensions/support/ahc/pom.xml
rename to extensions-support/ahc/pom.xml
index 4686224..2d33637 100644
--- a/extensions/support/ahc/pom.xml
+++ b/extensions-support/ahc/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>camel-quarkus-support-ahc-parent</artifactId>
diff --git a/extensions/support/ahc/runtime/pom.xml b/extensions-support/ahc/runtime/pom.xml
similarity index 100%
rename from extensions/support/ahc/runtime/pom.xml
rename to extensions-support/ahc/runtime/pom.xml
diff --git a/extensions/support/ahc/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/ahc/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/support/ahc/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/ahc/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/aws/deployment/pom.xml b/extensions-support/aws/deployment/pom.xml
similarity index 100%
rename from extensions/support/aws/deployment/pom.xml
rename to extensions-support/aws/deployment/pom.xml
diff --git a/extensions/support/aws/deployment/src/main/java/org/apache/camel/quarkus/component/aws/commons/deployment/AwsCommonsProcessor.java b/extensions-support/aws/deployment/src/main/java/org/apache/camel/quarkus/component/aws/commons/deployment/AwsCommonsProcessor.java
similarity index 100%
rename from extensions/support/aws/deployment/src/main/java/org/apache/camel/quarkus/component/aws/commons/deployment/AwsCommonsProcessor.java
rename to extensions-support/aws/deployment/src/main/java/org/apache/camel/quarkus/component/aws/commons/deployment/AwsCommonsProcessor.java
diff --git a/extensions/support/aws/pom.xml b/extensions-support/aws/pom.xml
similarity index 95%
rename from extensions/support/aws/pom.xml
rename to extensions-support/aws/pom.xml
index 1bb9539..31a8173 100644
--- a/extensions/support/aws/pom.xml
+++ b/extensions-support/aws/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>camel-quarkus-support-aws-parent</artifactId>
diff --git a/extensions/support/aws/runtime/pom.xml b/extensions-support/aws/runtime/pom.xml
similarity index 100%
rename from extensions/support/aws/runtime/pom.xml
rename to extensions-support/aws/runtime/pom.xml
diff --git a/extensions/support/aws/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/aws/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/support/aws/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/aws/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/common/deployment/pom.xml b/extensions-support/common/deployment/pom.xml
similarity index 100%
rename from extensions/support/common/deployment/pom.xml
rename to extensions-support/common/deployment/pom.xml
diff --git a/extensions/support/common/deployment/src/main/java/org/apache/camel/quarkus/support/common/deployment/CommonSupportFeature.java b/extensions-support/common/deployment/src/main/java/org/apache/camel/quarkus/support/common/deployment/CommonSupportFeature.java
similarity index 100%
rename from extensions/support/common/deployment/src/main/java/org/apache/camel/quarkus/support/common/deployment/CommonSupportFeature.java
rename to extensions-support/common/deployment/src/main/java/org/apache/camel/quarkus/support/common/deployment/CommonSupportFeature.java
diff --git a/extensions/support/common/pom.xml b/extensions-support/common/pom.xml
similarity index 95%
rename from extensions/support/common/pom.xml
rename to extensions-support/common/pom.xml
index da06aed..5cef3fb 100644
--- a/extensions/support/common/pom.xml
+++ b/extensions-support/common/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/support/common/runtime/pom.xml b/extensions-support/common/runtime/pom.xml
similarity index 100%
rename from extensions/support/common/runtime/pom.xml
rename to extensions-support/common/runtime/pom.xml
diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/CamelCapabilities.java b/extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/CamelCapabilities.java
similarity index 100%
rename from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/CamelCapabilities.java
rename to extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/CamelCapabilities.java
diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansIntrospector.java b/extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansIntrospector.java
similarity index 100%
rename from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansIntrospector.java
rename to extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansIntrospector.java
diff --git a/extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansWeakCache.java b/extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansWeakCache.java
similarity index 100%
rename from extensions/support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansWeakCache.java
rename to extensions-support/common/runtime/src/main/java/org/apache/camel/quarkus/support/common/runtime/graal/SubstituteBeansWeakCache.java
diff --git a/extensions/support/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
copy from extensions/support/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
copy to extensions-support/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/commons-logging/deployment/pom.xml b/extensions-support/commons-logging/deployment/pom.xml
similarity index 100%
rename from extensions/support/commons-logging/deployment/pom.xml
rename to extensions-support/commons-logging/deployment/pom.xml
diff --git a/extensions/support/commons-logging/deployment/src/main/java/org/apache/camel/quarkus/support/commons/logging/deployment/CommonsLoggingSupportFeature.java b/extensions-support/commons-logging/deployment/src/main/java/org/apache/camel/quarkus/support/commons/logging/deployment/CommonsLoggingSupportFeature.java
similarity index 100%
rename from extensions/support/commons-logging/deployment/src/main/java/org/apache/camel/quarkus/support/commons/logging/deployment/CommonsLoggingSupportFeature.java
rename to extensions-support/commons-logging/deployment/src/main/java/org/apache/camel/quarkus/support/commons/logging/deployment/CommonsLoggingSupportFeature.java
diff --git a/extensions/support/commons-logging/deployment/src/main/java/org/apache/camel/quarkus/support/commons/logging/deployment/CommonsLoggingSupportProcessor.java b/extensions-support/commons-logging/deployment/src/main/java/org/apache/camel/quarkus/support/commons/logging/deployment/CommonsLoggingSupportProcessor.java
similarity index 100%
rename from extensions/support/commons-logging/deployment/src/main/java/org/apache/camel/quarkus/support/commons/logging/deployment/CommonsLoggingSupportProcessor.java
rename to extensions-support/commons-logging/deployment/src/main/java/org/apache/camel/quarkus/support/commons/logging/deployment/CommonsLoggingSupportProcessor.java
diff --git a/extensions/support/commons-logging/pom.xml b/extensions-support/commons-logging/pom.xml
similarity index 95%
rename from extensions/support/commons-logging/pom.xml
rename to extensions-support/commons-logging/pom.xml
index f8967f3..dc75ef9 100644
--- a/extensions/support/commons-logging/pom.xml
+++ b/extensions-support/commons-logging/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/support/commons-logging/runtime/pom.xml b/extensions-support/commons-logging/runtime/pom.xml
similarity index 100%
rename from extensions/support/commons-logging/runtime/pom.xml
rename to extensions-support/commons-logging/runtime/pom.xml
diff --git a/extensions/support/commons-logging/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/commons-logging/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/support/commons-logging/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/commons-logging/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/consul-client/deployment/pom.xml b/extensions-support/consul-client/deployment/pom.xml
similarity index 100%
rename from extensions/support/consul-client/deployment/pom.xml
rename to extensions-support/consul-client/deployment/pom.xml
diff --git a/extensions/support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportFeature.java b/extensions-support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportFeature.java
similarity index 100%
rename from extensions/support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportFeature.java
rename to extensions-support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportFeature.java
diff --git a/extensions/support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportProcessor.java b/extensions-support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportProcessor.java
similarity index 100%
rename from extensions/support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportProcessor.java
rename to extensions-support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportProcessor.java
diff --git a/extensions/support/consul-client/pom.xml b/extensions-support/consul-client/pom.xml
similarity index 95%
rename from extensions/support/consul-client/pom.xml
rename to extensions-support/consul-client/pom.xml
index 3abd148..43dcb07 100644
--- a/extensions/support/consul-client/pom.xml
+++ b/extensions-support/consul-client/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/support/consul-client/runtime/pom.xml b/extensions-support/consul-client/runtime/pom.xml
similarity index 100%
rename from extensions/support/consul-client/runtime/pom.xml
rename to extensions-support/consul-client/runtime/pom.xml
diff --git a/extensions/support/consul-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/consul-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/support/consul-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/consul-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/httpclient/deployment/pom.xml b/extensions-support/httpclient/deployment/pom.xml
similarity index 100%
rename from extensions/support/httpclient/deployment/pom.xml
rename to extensions-support/httpclient/deployment/pom.xml
diff --git a/extensions/support/httpclient/deployment/src/main/java/org/apache/camel/quarkus/support/httpclient/deployment/HttpClientFeature.java b/extensions-support/httpclient/deployment/src/main/java/org/apache/camel/quarkus/support/httpclient/deployment/HttpClientFeature.java
similarity index 100%
rename from extensions/support/httpclient/deployment/src/main/java/org/apache/camel/quarkus/support/httpclient/deployment/HttpClientFeature.java
rename to extensions-support/httpclient/deployment/src/main/java/org/apache/camel/quarkus/support/httpclient/deployment/HttpClientFeature.java
diff --git a/extensions/support/httpclient/deployment/src/main/java/org/apache/camel/quarkus/support/httpclient/deployment/HttpClientProcessor.java b/extensions-support/httpclient/deployment/src/main/java/org/apache/camel/quarkus/support/httpclient/deployment/HttpClientProcessor.java
similarity index 100%
rename from extensions/support/httpclient/deployment/src/main/java/org/apache/camel/quarkus/support/httpclient/deployment/HttpClientProcessor.java
rename to extensions-support/httpclient/deployment/src/main/java/org/apache/camel/quarkus/support/httpclient/deployment/HttpClientProcessor.java
diff --git a/extensions/support/httpclient/pom.xml b/extensions-support/httpclient/pom.xml
similarity index 95%
rename from extensions/support/httpclient/pom.xml
rename to extensions-support/httpclient/pom.xml
index 4b736ab..2700edd 100644
--- a/extensions/support/httpclient/pom.xml
+++ b/extensions-support/httpclient/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/support/httpclient/runtime/pom.xml b/extensions-support/httpclient/runtime/pom.xml
similarity index 100%
rename from extensions/support/httpclient/runtime/pom.xml
rename to extensions-support/httpclient/runtime/pom.xml
diff --git a/extensions/support/httpclient/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/httpclient/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/support/httpclient/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/httpclient/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/jackson-dataformat-xml/deployment/pom.xml b/extensions-support/jackson-dataformat-xml/deployment/pom.xml
similarity index 100%
rename from extensions/support/jackson-dataformat-xml/deployment/pom.xml
rename to extensions-support/jackson-dataformat-xml/deployment/pom.xml
diff --git a/extensions/support/jackson-dataformat-xml/deployment/src/main/java/org/apache/camel/quarkus/support/jackson/datafromat/xml/deployment/JacksonDataformatXmlSupportProcessor.java b/extensions-support/jackson-dataformat-xml/deployment/src/main/java/org/apache/camel/quarkus/support/jackson/datafromat/xml/deployment/JacksonDataformatXmlSupportProcessor.java
similarity index 100%
rename from extensions/support/jackson-dataformat-xml/deployment/src/main/java/org/apache/camel/quarkus/support/jackson/datafromat/xml/deployment/JacksonDataformatXmlSupportProcessor.java
rename to extensions-support/jackson-dataformat-xml/deployment/src/main/java/org/apache/camel/quarkus/support/jackson/datafromat/xml/deployment/JacksonDataformatXmlSupportProcessor.java
diff --git a/extensions/support/jackson-dataformat-xml/pom.xml b/extensions-support/jackson-dataformat-xml/pom.xml
similarity index 95%
rename from extensions/support/jackson-dataformat-xml/pom.xml
rename to extensions-support/jackson-dataformat-xml/pom.xml
index f672bec..b039039 100644
--- a/extensions/support/jackson-dataformat-xml/pom.xml
+++ b/extensions-support/jackson-dataformat-xml/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/support/jackson-dataformat-xml/runtime/pom.xml b/extensions-support/jackson-dataformat-xml/runtime/pom.xml
similarity index 100%
rename from extensions/support/jackson-dataformat-xml/runtime/pom.xml
rename to extensions-support/jackson-dataformat-xml/runtime/pom.xml
diff --git a/extensions/support/jackson-dataformat-xml/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/jackson-dataformat-xml/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/support/jackson-dataformat-xml/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/jackson-dataformat-xml/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/jetty/deployment/pom.xml b/extensions-support/jetty/deployment/pom.xml
similarity index 100%
rename from extensions/support/jetty/deployment/pom.xml
rename to extensions-support/jetty/deployment/pom.xml
diff --git a/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportFeature.java b/extensions-support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportFeature.java
similarity index 100%
rename from extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportFeature.java
rename to extensions-support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportFeature.java
diff --git a/extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java b/extensions-support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java
similarity index 100%
rename from extensions/support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java
rename to extensions-support/jetty/deployment/src/main/java/org/apache/camel/quarkus/support/jetty/deployment/JettySupportProcessor.java
diff --git a/extensions/support/jetty/pom.xml b/extensions-support/jetty/pom.xml
similarity index 95%
rename from extensions/support/jetty/pom.xml
rename to extensions-support/jetty/pom.xml
index 8dadebf..eb82ce9 100644
--- a/extensions/support/jetty/pom.xml
+++ b/extensions-support/jetty/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/support/jetty/runtime/pom.xml b/extensions-support/jetty/runtime/pom.xml
similarity index 100%
rename from extensions/support/jetty/runtime/pom.xml
rename to extensions-support/jetty/runtime/pom.xml
diff --git a/extensions/support/jetty/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/jetty/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/support/jetty/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/jetty/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/policy/deployment/pom.xml b/extensions-support/policy/deployment/pom.xml
similarity index 100%
rename from extensions/support/policy/deployment/pom.xml
rename to extensions-support/policy/deployment/pom.xml
diff --git a/extensions/support/policy/deployment/src/main/java/org/apache/camel/quarkus/component/support/policy/deployment/PolicyProcessor.java b/extensions-support/policy/deployment/src/main/java/org/apache/camel/quarkus/component/support/policy/deployment/PolicyProcessor.java
similarity index 100%
rename from extensions/support/policy/deployment/src/main/java/org/apache/camel/quarkus/component/support/policy/deployment/PolicyProcessor.java
rename to extensions-support/policy/deployment/src/main/java/org/apache/camel/quarkus/component/support/policy/deployment/PolicyProcessor.java
diff --git a/extensions/support/policy/pom.xml b/extensions-support/policy/pom.xml
similarity index 95%
rename from extensions/support/policy/pom.xml
rename to extensions-support/policy/pom.xml
index 622989b..d794341 100644
--- a/extensions/support/policy/pom.xml
+++ b/extensions-support/policy/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>camel-quarkus-support-policy-parent</artifactId>
diff --git a/extensions/support/policy/runtime/pom.xml b/extensions-support/policy/runtime/pom.xml
similarity index 100%
rename from extensions/support/policy/runtime/pom.xml
rename to extensions-support/policy/runtime/pom.xml
diff --git a/extensions/support/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/policy/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 91%
rename from extensions/support/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/policy/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index d77930f..09d89fa 100644
--- a/extensions/support/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions-support/policy/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -16,8 +16,8 @@
 #
 
 ---
-name: "Camel Quarkus Support Common"
-description: "Camel Quarkus Support Common"
+name: "Camel Quarkus Support Policy"
+description: "Camel Quarkus Support Policy"
 metadata:
   unlisted: true
   keywords:
diff --git a/extensions/support/pom.xml b/extensions-support/pom.xml
similarity index 91%
rename from extensions/support/pom.xml
rename to extensions-support/pom.xml
index babf30e..724b440 100644
--- a/extensions/support/pom.xml
+++ b/extensions-support/pom.xml
@@ -21,14 +21,14 @@
 
     <parent>
         <groupId>org.apache.camel.quarkus</groupId>
-        <artifactId>camel-quarkus-extensions</artifactId>
+        <artifactId>camel-quarkus-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>camel-quarkus-support-extensions</artifactId>
-    <name>Camel Quarkus :: Support</name>
+    <artifactId>camel-quarkus-extensions-support</artifactId>
+    <name>Camel Quarkus :: Extensions :: Support</name>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/extensions/support/retrofit/deployment/pom.xml b/extensions-support/retrofit/deployment/pom.xml
similarity index 100%
rename from extensions/support/retrofit/deployment/pom.xml
rename to extensions-support/retrofit/deployment/pom.xml
diff --git a/extensions/support/retrofit/deployment/src/main/java/org/apache/camel/quarkus/support/retrofit/deployment/RetrofitSupportFeature.java b/extensions-support/retrofit/deployment/src/main/java/org/apache/camel/quarkus/support/retrofit/deployment/RetrofitSupportFeature.java
similarity index 100%
rename from extensions/support/retrofit/deployment/src/main/java/org/apache/camel/quarkus/support/retrofit/deployment/RetrofitSupportFeature.java
rename to extensions-support/retrofit/deployment/src/main/java/org/apache/camel/quarkus/support/retrofit/deployment/RetrofitSupportFeature.java
diff --git a/extensions/support/retrofit/pom.xml b/extensions-support/retrofit/pom.xml
similarity index 95%
rename from extensions/support/retrofit/pom.xml
rename to extensions-support/retrofit/pom.xml
index 0a95cf2..fef537a 100644
--- a/extensions/support/retrofit/pom.xml
+++ b/extensions-support/retrofit/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/support/retrofit/runtime/pom.xml b/extensions-support/retrofit/runtime/pom.xml
similarity index 100%
rename from extensions/support/retrofit/runtime/pom.xml
rename to extensions-support/retrofit/runtime/pom.xml
diff --git a/extensions/support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/CompletableFutureCallAdapterFactorySubstitution.java b/extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/CompletableFutureCallAdapterFactorySubstitution.java
similarity index 100%
rename from extensions/support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/CompletableFutureCallAdapterFactorySubstitution.java
rename to extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/CompletableFutureCallAdapterFactorySubstitution.java
diff --git a/extensions/support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/DefaultCallAdapterFactorySubstitution.java b/extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/DefaultCallAdapterFactorySubstitution.java
similarity index 100%
rename from extensions/support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/DefaultCallAdapterFactorySubstitution.java
rename to extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/DefaultCallAdapterFactorySubstitution.java
diff --git a/extensions/support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/ExecutorCallAdapterFactorySubstitution.java b/extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/ExecutorCallAdapterFactorySubstitution.java
similarity index 100%
rename from extensions/support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/ExecutorCallAdapterFactorySubstitution.java
rename to extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/ExecutorCallAdapterFactorySubstitution.java
diff --git a/extensions/support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/OptionalConverterFactorySubstitution.java b/extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/OptionalConverterFactorySubstitution.java
similarity index 100%
rename from extensions/support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/OptionalConverterFactorySubstitution.java
rename to extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/OptionalConverterFactorySubstitution.java
diff --git a/extensions/support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/PlatformSubstitution.java b/extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/PlatformSubstitution.java
similarity index 100%
rename from extensions/support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/PlatformSubstitution.java
rename to extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/PlatformSubstitution.java
diff --git a/extensions/support/retrofit/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/retrofit/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/support/retrofit/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/retrofit/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/spring/deployment/pom.xml b/extensions-support/spring/deployment/pom.xml
similarity index 100%
rename from extensions/support/spring/deployment/pom.xml
rename to extensions-support/spring/deployment/pom.xml
diff --git a/extensions/support/spring/deployment/src/main/java/org/apache/camel/quarkus/support/spring/deployment/SpringFeature.java b/extensions-support/spring/deployment/src/main/java/org/apache/camel/quarkus/support/spring/deployment/SpringFeature.java
similarity index 100%
rename from extensions/support/spring/deployment/src/main/java/org/apache/camel/quarkus/support/spring/deployment/SpringFeature.java
rename to extensions-support/spring/deployment/src/main/java/org/apache/camel/quarkus/support/spring/deployment/SpringFeature.java
diff --git a/extensions/support/spring/deployment/src/main/java/org/apache/camel/quarkus/support/spring/deployment/SpringProcessor.java b/extensions-support/spring/deployment/src/main/java/org/apache/camel/quarkus/support/spring/deployment/SpringProcessor.java
similarity index 100%
rename from extensions/support/spring/deployment/src/main/java/org/apache/camel/quarkus/support/spring/deployment/SpringProcessor.java
rename to extensions-support/spring/deployment/src/main/java/org/apache/camel/quarkus/support/spring/deployment/SpringProcessor.java
diff --git a/extensions/support/spring/pom.xml b/extensions-support/spring/pom.xml
similarity index 95%
rename from extensions/support/spring/pom.xml
rename to extensions-support/spring/pom.xml
index 4ecc0ee..03646d8 100644
--- a/extensions/support/spring/pom.xml
+++ b/extensions-support/spring/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/support/spring/runtime/pom.xml b/extensions-support/spring/runtime/pom.xml
similarity index 100%
rename from extensions/support/spring/runtime/pom.xml
rename to extensions-support/spring/runtime/pom.xml
diff --git a/extensions/support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringSubstitutions.java b/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringSubstitutions.java
similarity index 100%
rename from extensions/support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringSubstitutions.java
rename to extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringSubstitutions.java
diff --git a/extensions/support/spring/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/spring/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/support/spring/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/spring/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/xalan/deployment/pom.xml b/extensions-support/xalan/deployment/pom.xml
similarity index 100%
rename from extensions/support/xalan/deployment/pom.xml
rename to extensions-support/xalan/deployment/pom.xml
diff --git a/extensions/support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanFeature.java b/extensions-support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanFeature.java
similarity index 100%
rename from extensions/support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanFeature.java
rename to extensions-support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanFeature.java
diff --git a/extensions/support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanNativeImageProcessor.java b/extensions-support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanNativeImageProcessor.java
similarity index 100%
rename from extensions/support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanNativeImageProcessor.java
rename to extensions-support/xalan/deployment/src/main/java/org/apache/camel/quarkus/support/xalan/deployment/XalanNativeImageProcessor.java
diff --git a/extensions/support/xalan/pom.xml b/extensions-support/xalan/pom.xml
similarity index 95%
rename from extensions/support/xalan/pom.xml
rename to extensions-support/xalan/pom.xml
index bb428ec..46e1dbb 100644
--- a/extensions/support/xalan/pom.xml
+++ b/extensions-support/xalan/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/support/xalan/runtime/pom.xml b/extensions-support/xalan/runtime/pom.xml
similarity index 100%
rename from extensions/support/xalan/runtime/pom.xml
rename to extensions-support/xalan/runtime/pom.xml
diff --git a/extensions/support/xalan/runtime/src/main/java/org/apache/camel/quarkus/support/xalan/XalanTransformerFactory.java b/extensions-support/xalan/runtime/src/main/java/org/apache/camel/quarkus/support/xalan/XalanTransformerFactory.java
similarity index 100%
rename from extensions/support/xalan/runtime/src/main/java/org/apache/camel/quarkus/support/xalan/XalanTransformerFactory.java
rename to extensions-support/xalan/runtime/src/main/java/org/apache/camel/quarkus/support/xalan/XalanTransformerFactory.java
diff --git a/extensions/support/xalan/runtime/src/main/java/org/apache/camel/quarkus/support/xalan/graal/SunTemplatesImplSubstitution.java b/extensions-support/xalan/runtime/src/main/java/org/apache/camel/quarkus/support/xalan/graal/SunTemplatesImplSubstitution.java
similarity index 100%
rename from extensions/support/xalan/runtime/src/main/java/org/apache/camel/quarkus/support/xalan/graal/SunTemplatesImplSubstitution.java
rename to extensions-support/xalan/runtime/src/main/java/org/apache/camel/quarkus/support/xalan/graal/SunTemplatesImplSubstitution.java
diff --git a/extensions/support/xalan/runtime/src/main/java/org/apache/camel/quarkus/support/xalan/graal/TemplatesImplSubstitution.java b/extensions-support/xalan/runtime/src/main/java/org/apache/camel/quarkus/support/xalan/graal/TemplatesImplSubstitution.java
similarity index 100%
rename from extensions/support/xalan/runtime/src/main/java/org/apache/camel/quarkus/support/xalan/graal/TemplatesImplSubstitution.java
rename to extensions-support/xalan/runtime/src/main/java/org/apache/camel/quarkus/support/xalan/graal/TemplatesImplSubstitution.java
diff --git a/extensions/support/xalan/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/xalan/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/support/xalan/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/xalan/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/xml/deployment/pom.xml b/extensions-support/xml/deployment/pom.xml
similarity index 100%
rename from extensions/support/xml/deployment/pom.xml
rename to extensions-support/xml/deployment/pom.xml
diff --git a/extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportFeature.java b/extensions-support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportFeature.java
similarity index 100%
rename from extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportFeature.java
rename to extensions-support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportFeature.java
diff --git a/extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportProcessor.java b/extensions-support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportProcessor.java
similarity index 100%
rename from extensions/support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportProcessor.java
rename to extensions-support/xml/deployment/src/main/java/org/apache/camel/quarkus/support/xml/deployment/XmlSupportProcessor.java
diff --git a/extensions/support/xml/pom.xml b/extensions-support/xml/pom.xml
similarity index 95%
rename from extensions/support/xml/pom.xml
rename to extensions-support/xml/pom.xml
index b998123..bc230fa 100644
--- a/extensions/support/xml/pom.xml
+++ b/extensions-support/xml/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/support/xml/runtime/pom.xml b/extensions-support/xml/runtime/pom.xml
similarity index 100%
rename from extensions/support/xml/runtime/pom.xml
rename to extensions-support/xml/runtime/pom.xml
diff --git a/extensions/support/xml/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/xml/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/support/xml/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/xml/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/support/xstream/deployment/pom.xml b/extensions-support/xstream/deployment/pom.xml
similarity index 100%
rename from extensions/support/xstream/deployment/pom.xml
rename to extensions-support/xstream/deployment/pom.xml
diff --git a/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportFeature.java b/extensions-support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportFeature.java
similarity index 100%
rename from extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportFeature.java
rename to extensions-support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportFeature.java
diff --git a/extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java b/extensions-support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
similarity index 100%
rename from extensions/support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
rename to extensions-support/xstream/deployment/src/main/java/org/apache/camel/quarkus/support/xstream/deployment/XStreamSupportProcessor.java
diff --git a/extensions/support/xstream/pom.xml b/extensions-support/xstream/pom.xml
similarity index 95%
rename from extensions/support/xstream/pom.xml
rename to extensions-support/xstream/pom.xml
index 7ba0d88..707b633 100644
--- a/extensions/support/xstream/pom.xml
+++ b/extensions-support/xstream/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.camel.quarkus</groupId>
         <artifactId>camel-quarkus-build-parent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
-        <relativePath>../../../poms/build-parent/pom.xml</relativePath>
+        <relativePath>../../poms/build-parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/extensions/support/xstream/runtime/pom.xml b/extensions-support/xstream/runtime/pom.xml
similarity index 100%
rename from extensions/support/xstream/runtime/pom.xml
rename to extensions-support/xstream/runtime/pom.xml
diff --git a/extensions/support/xstream/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/xstream/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from extensions/support/xstream/runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to extensions-support/xstream/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 655aa41..c6f61c4 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -32,18 +32,6 @@
     <name>Camel Quarkus :: Extensions</name>
 
     <modules>
-        <!-- support extensions -->
-        <module>support</module>
-
-        <!-- common/shared extensions -->
-        <module>core</module>
-        <module>core-cloud</module>
-        <module>http-common</module>
-        <module>reactive-executor</module>
-        <module>xml-io</module>
-        <module>xml-jaxb</module>
-        <module>xml-jaxp</module>
-
         <!-- extensions a..z; do not remove this comment, it is important when sorting via  mvn process-resources -Pformat -->
         <module>activemq</module>
         <module>ahc</module>
@@ -165,44 +153,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>enforce</id>
-            <activation>
-                <property>
-                    <name>enforce</name>
-                    <value>!false</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.gmaven</groupId>
-                        <artifactId>groovy-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>validate-extension-metadata</id>
-                                <inherited>false</inherited>
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                                <phase>verify</phase>
-                                <configuration>
-                                    <source>file:///${project.basedir}/../tooling/scripts/validate-extension-metadata.groovy</source>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.yaml</groupId>
-                                <artifactId>snakeyaml</artifactId>
-                                <version>${snakeyaml.version}</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-    </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 38a3d89..97261c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,8 @@
     <modules>
         <module>poms</module>
         <module>tooling</module>
+        <module>extensions-core</module>
+        <module>extensions-support</module>
         <module>extensions</module>
         <module>catalog</module>
         <module>integration-tests</module>
@@ -347,6 +349,20 @@
                                     <source>file:///${project.basedir}/tooling/scripts/validate-github-workflows.groovy</source>
                                 </configuration>
                             </execution>
+                            <execution>
+                                <id>validate-extension-metadata</id>
+                                <inherited>false</inherited>
+                                <goals>
+                                    <goal>execute</goal>
+                                </goals>
+                                <phase>verify</phase>
+                                <configuration>
+                                    <source>file:///${project.basedir}/tooling/scripts/validate-extension-metadata.groovy</source>
+                                    <properties>
+                                        <extensionDirs>extensions-core,extensions-support,extensions</extensionDirs>
+                                    </properties>
+                                </configuration>
+                            </execution>
                         </executions>
                         <dependencies>
                             <dependency>
diff --git a/tooling/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateDocExtensionsListMojo.java b/tooling/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateDocExtensionsListMojo.java
index b5fac67..3cb0b85 100644
--- a/tooling/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateDocExtensionsListMojo.java
+++ b/tooling/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateDocExtensionsListMojo.java
@@ -95,19 +95,19 @@ public class UpdateDocExtensionsListMojo extends AbstractMojo {
     /**
      * The directory for extensions
      */
-    @Parameter(defaultValue = "${project.directory}/../../../extensions")
+    @Parameter(defaultValue = "${project.directory}/../../extensions")
     protected File readmeExtensionsDir;
 
     /**
      * The website doc base directory
      */
-    @Parameter(defaultValue = "${project.directory}/../../../docs/modules/ROOT/pages")
+    @Parameter(defaultValue = "${project.directory}/../../docs/modules/ROOT/pages")
     protected File websiteDocBaseDir;
 
     /**
      * The website doc for extensions
      */
-    @Parameter(defaultValue = "${project.directory}/../../../docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc")
+    @Parameter(defaultValue = "${project.directory}/../../docs/modules/ROOT/pages/list-of-camel-quarkus-extensions.adoc")
     protected File websiteDocFile;
 
     /**
diff --git a/tooling/scripts/sort-poms.groovy b/tooling/scripts/sort-poms.groovy
index a4a3919..7a67b37 100644
--- a/tooling/scripts/sort-poms.groovy
+++ b/tooling/scripts/sort-poms.groovy
@@ -25,6 +25,7 @@ import java.nio.file.Paths
 import java.nio.file.Files
 import java.util.regex.Matcher
 import java.util.regex.Pattern
+import java.util.stream.Stream
 
 import groovy.util.NodeList
 
@@ -187,14 +188,16 @@ void sortModules(String[] sortModulesPaths) {
 
 void updateMvndRules(String[] updateMvndRuleDirs) {
     final Set<String> extensionArtifactIds = [] as TreeSet
-    Files.list(baseDir.resolve('extensions'))
+    Stream.of('extensions', 'extensions-core')
+            .map { relPath -> baseDir.resolve(relPath) }
+            .flatMap { extensionsDir -> Files.list(extensionsDir) }
             .filter { p -> Files.isDirectory(p) && Files.exists(p.resolve('pom.xml')) && Files.exists(p.resolve('runtime')) }
             .map { p -> p.getFileName().toString() }
-            .filter { dirName -> !dirName.equals('support') }
             .map { dirName -> 'camel-quarkus-' + dirName }
             .forEach { aid -> extensionArtifactIds << aid }
 
-    Files.list(baseDir.resolve('extensions/support'))
+
+    Files.list(baseDir.resolve('extensions-support'))
             .filter { p -> Files.isDirectory(p) && Files.exists(p.resolve('pom.xml')) && Files.exists(p.resolve('runtime')) }
             .map { p -> p.getFileName().toString() }
             .map { dirName -> 'camel-quarkus-support-' + dirName }
diff --git a/tooling/scripts/validate-extension-metadata.groovy b/tooling/scripts/validate-extension-metadata.groovy
index ef0d407..ae6f5f3 100644
--- a/tooling/scripts/validate-extension-metadata.groovy
+++ b/tooling/scripts/validate-extension-metadata.groovy
@@ -16,58 +16,67 @@
  */
 
 import groovy.io.FileType
+import java.nio.file.Files
+import java.nio.file.Path
+
+final String[] extensionDirs = properties['extensionDirs'].split(',')
 
 final String quarkusExtensionRelPath = 'runtime/src/main/resources/META-INF/quarkus-extension.yaml'
 final List<String> messages = []
+final Path basePath = project.basedir.toPath()
 
-project.basedir.eachFile(FileType.DIRECTORIES) {
-    if (new File(it, 'runtime/pom.xml').exists()) {
-        final File extensionFile = new File(it, quarkusExtensionRelPath)
-        final String shortPath = it.name + '/' + quarkusExtensionRelPath
+for (String extensionDir in extensionDirs) {
+    final Path extensionDirPath = basePath.resolve(extensionDir)
+    Files.list(extensionDirPath)
+            .filter { path -> Files.isDirectory(path) }
+            .filter { path -> Files.exists(path.resolve('runtime/pom.xml')) }
+            .map { path -> path.resolve(quarkusExtensionRelPath) }
+            .forEach { extensionFile ->
+                final String shortPath = basePath.relativize(extensionFile).toString()
+                if (!Files.exists(extensionFile)) {
+                    messages.add(shortPath + ' is missing')
+                } else {
+                    def yaml = new org.yaml.snakeyaml.Yaml()
+                    def descriptor = yaml.load(extensionFile.getText("UTF-8"))
 
-        if (!extensionFile.exists()) {
-            messages.add(shortPath + ' is missing')
-        } else {
-            def yaml = new org.yaml.snakeyaml.Yaml()
-            def descriptor = yaml.load(extensionFile.getText("UTF-8"))
+                    if (!descriptor.name) {
+                        messages.add(shortPath + ' must contain name')
+                    }
+                    if (!descriptor.description) {
+                        messages.add(shortPath + ' must contain description')
+                    }
 
-            if (!descriptor.name) {
-                messages.add(shortPath + ' must contain name')
-            }
-            if (!descriptor.description) {
-                messages.add(shortPath + ' must contain description')
-            }
-
-            // metadata
-            if (!descriptor.metadata) {
-                messages.add(shortPath + ' must contain metadata section')
-                return
-            }
-            if (!descriptor.metadata.guide?.equals('https://quarkus.io/guides/camel')) {
-                messages.add(shortPath + ' must contain a link to the guide https://quarkus.io/guides/camel')
-            }
+                    // metadata
+                    if (!descriptor.metadata) {
+                        messages.add(shortPath + ' must contain metadata section')
+                        return
+                    }
+                    if (!descriptor.metadata.guide?.equals('https://quarkus.io/guides/camel')) {
+                        messages.add(shortPath + ' must contain a link to the guide https://quarkus.io/guides/camel')
+                    }
 
-            // keywords
-            if (!descriptor.metadata.keywords) {
-                messages.add(shortPath + ' metadata must contain keywords section')
-                return
-            }
-            if (!descriptor.metadata.keywords?.contains('camel')) {
-                messages.add(shortPath + ' metadata must contain a list of keywords with at least "camel" present')
-            }
+                    // keywords
+                    if (!descriptor.metadata.keywords) {
+                        messages.add(shortPath + ' metadata must contain keywords section')
+                        return
+                    }
+                    if (!descriptor.metadata.keywords?.contains('camel')) {
+                        messages.add(shortPath + ' metadata must contain a list of keywords with at least "camel" present')
+                    }
 
-            // categories
-            if (!descriptor.metadata.categories) {
-                messages.add(shortPath + ' metadata must contain categories section')
-                return
+                    // categories
+                    if (!descriptor.metadata.categories) {
+                        messages.add(shortPath + ' metadata must contain categories section')
+                        return
+                    }
+                    if (!descriptor.metadata.categories?.contains('integration')) {
+                        messages.add(shortPath + ' metadata must contain a list of categories with at least "integration" present')
+                    }
+                }
             }
-            if (!descriptor.metadata.categories?.contains('integration')) {
-                messages.add(shortPath + ' metadata must contain a list of categories with at least "integration" present')
-            }
-        }
-    }
 }
 
+
 if (!messages.isEmpty()) {
     throw new RuntimeException("\nQuarkus extension metadata validation failures:\n\n    "
             + messages.join('\n    '))