You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2019/02/04 07:16:24 UTC

[camel] branch master updated: [CAMEL-13040] Move modules to core/ folder

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 0759e2f  [CAMEL-13040] Move modules to core/ folder
0759e2f is described below

commit 0759e2f9e548ad6af1f58a82a4e06a9134a9382d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Feb 4 08:15:59 2019 +0100

    [CAMEL-13040] Move modules to core/ folder
---
 components/camel-blueprint/pom.xml                 |   4 +-
 components/camel-spring/pom.xml                    |   4 +-
 components/readme.adoc                             |  49 ++-------------------
 {camel-api => core/camel-api}/pom.xml              |   4 +-
 .../apache/camel/AfterPropertiesConfigured.java    |   0
 .../java/org/apache/camel/AggregationStrategy.java |   0
 .../org/apache/camel/AlreadyStoppedException.java  |   0
 .../main/java/org/apache/camel/AsyncCallback.java  |   0
 .../main/java/org/apache/camel/AsyncEndpoint.java  |   0
 .../main/java/org/apache/camel/AsyncProcessor.java |   0
 .../main/java/org/apache/camel/AsyncProducer.java  |   0
 .../src/main/java/org/apache/camel/Attachment.java |   0
 .../java/org/apache/camel/AttachmentObjects.java   |   0
 .../main/java/org/apache/camel/Attachments.java    |   0
 .../main/java/org/apache/camel/BatchConsumer.java  |   0
 .../src/main/java/org/apache/camel/BeanInject.java |   0
 .../java/org/apache/camel/BinaryPredicate.java     |   0
 .../src/main/java/org/apache/camel/Body.java       |   0
 .../src/main/java/org/apache/camel/Builder.java    |   0
 .../main/java/org/apache/camel/BytesSource.java    |   0
 .../apache/camel/CamelAuthorizationException.java  |   0
 .../main/java/org/apache/camel/CamelContext.java   |   0
 .../java/org/apache/camel/CamelContextAware.java   |   0
 .../main/java/org/apache/camel/CamelException.java |   0
 .../org/apache/camel/CamelExchangeException.java   |   0
 .../org/apache/camel/CamelExecutionException.java  |   0
 .../org/apache/camel/CamelUnitOfWorkException.java |   0
 .../src/main/java/org/apache/camel/Channel.java    |   0
 .../src/main/java/org/apache/camel/Component.java  |   0
 .../main/java/org/apache/camel/ComponentAware.java |   0
 .../src/main/java/org/apache/camel/Consume.java    |   0
 .../src/main/java/org/apache/camel/Consumer.java   |   0
 .../java/org/apache/camel/ConsumerTemplate.java    |   0
 .../src/main/java/org/apache/camel/Converter.java  |   0
 .../org/apache/camel/DeferredContextBinding.java   |   0
 .../java/org/apache/camel/DelegateEndpoint.java    |   0
 .../java/org/apache/camel/DelegateProcessor.java   |   0
 .../main/java/org/apache/camel/DynamicRouter.java  |   0
 .../src/main/java/org/apache/camel/Endpoint.java   |   0
 .../main/java/org/apache/camel/EndpointAware.java  |   0
 .../main/java/org/apache/camel/EndpointInject.java |   0
 .../java/org/apache/camel/ErrorHandlerFactory.java |   0
 .../src/main/java/org/apache/camel/Exchange.java   |   0
 .../java/org/apache/camel/ExchangeException.java   |   0
 .../java/org/apache/camel/ExchangePattern.java     |   0
 .../java/org/apache/camel/ExchangeProperties.java  |   0
 .../java/org/apache/camel/ExchangeProperty.java    |   0
 .../apache/camel/ExchangeTimedOutException.java    |   0
 .../org/apache/camel/ExecutorServiceAware.java     |   0
 .../apache/camel/ExpectedBodyTypeException.java    |   0
 .../src/main/java/org/apache/camel/Expression.java |   0
 .../camel/ExpressionEvaluationException.java       |   0
 .../camel/ExpressionIllegalSyntaxException.java    |   0
 .../org/apache/camel/ExtendedStartupListener.java  |   0
 .../camel/FailedToCreateConsumerException.java     |   0
 .../camel/FailedToCreateProducerException.java     |   0
 .../apache/camel/FailedToCreateRouteException.java |   0
 .../apache/camel/FailedToStartRouteException.java  |   0
 .../java/org/apache/camel/FallbackConverter.java   |   0
 .../org/apache/camel/FluentProducerTemplate.java   |   0
 .../src/main/java/org/apache/camel/Handler.java    |   0
 .../src/main/java/org/apache/camel/Header.java     |   0
 .../src/main/java/org/apache/camel/Headers.java    |   0
 .../src/main/java/org/apache/camel/InOnly.java     |   0
 .../src/main/java/org/apache/camel/InOut.java      |   0
 .../org/apache/camel/InvalidPayloadException.java  |   0
 .../camel/InvalidPayloadRuntimeException.java      |   0
 .../org/apache/camel/InvalidPropertyException.java |   0
 .../main/java/org/apache/camel/InvokeOnHeader.java |   0
 .../java/org/apache/camel/InvokeOnHeaders.java     |   0
 .../main/java/org/apache/camel/IsSingleton.java    |   0
 .../org/apache/camel/LoadPropertiesException.java  |   0
 .../main/java/org/apache/camel/LoggingLevel.java   |   0
 .../apache/camel/ManagementStatisticsLevel.java    |   0
 .../src/main/java/org/apache/camel/Message.java    |   0
 .../main/java/org/apache/camel/MessageHistory.java |   0
 .../org/apache/camel/MultipleConsumersSupport.java |   0
 .../src/main/java/org/apache/camel/NamedNode.java  |   0
 .../src/main/java/org/apache/camel/Navigate.java   |   0
 .../apache/camel/NoFactoryAvailableException.java  |   0
 .../java/org/apache/camel/NoSuchBeanException.java |   0
 .../org/apache/camel/NoSuchEndpointException.java  |   0
 .../org/apache/camel/NoSuchHeaderException.java    |   0
 .../org/apache/camel/NoSuchLanguageException.java  |   0
 .../org/apache/camel/NoSuchPropertyException.java  |   0
 .../camel/NoTypeConversionAvailableException.java  |   0
 .../java/org/apache/camel/NonManagedService.java   |   0
 .../src/main/java/org/apache/camel/Ordered.java    |   0
 .../src/main/java/org/apache/camel/OutHeaders.java |   0
 .../src/main/java/org/apache/camel/Pattern.java    |   0
 .../java/org/apache/camel/PollingConsumer.java     |   0
 .../camel/PollingConsumerPollingStrategy.java      |   0
 .../src/main/java/org/apache/camel/Predicate.java  |   0
 .../src/main/java/org/apache/camel/Processor.java  |   0
 .../src/main/java/org/apache/camel/Produce.java    |   0
 .../src/main/java/org/apache/camel/Producer.java   |   0
 .../java/org/apache/camel/ProducerTemplate.java    |   0
 .../main/java/org/apache/camel/PropertyInject.java |   0
 .../apache/camel/ProxyInstantiationException.java  |   0
 .../main/java/org/apache/camel/RecipientList.java  |   0
 .../camel/ResolveEndpointFailedException.java      |   0
 .../apache/camel/RollbackExchangeException.java    |   0
 .../src/main/java/org/apache/camel/Route.java      |   0
 .../src/main/java/org/apache/camel/RouteAware.java |   0
 .../main/java/org/apache/camel/RoutesBuilder.java  |   0
 .../main/java/org/apache/camel/RoutingSlip.java    |   0
 .../org/apache/camel/RuntimeCamelException.java    |   0
 .../org/apache/camel/RuntimeConfiguration.java     |   0
 .../org/apache/camel/RuntimeExchangeException.java |   0
 .../apache/camel/RuntimeExpressionException.java   |   0
 .../apache/camel/RuntimeTransformException.java    |   0
 .../apache/camel/SSLContextParametersAware.java    |   0
 .../src/main/java/org/apache/camel/Service.java    |   0
 .../main/java/org/apache/camel/ServiceStatus.java  |   0
 .../main/java/org/apache/camel/ShutdownRoute.java  |   0
 .../java/org/apache/camel/ShutdownRunningTask.java |   0
 .../java/org/apache/camel/ShutdownableService.java |   0
 .../java/org/apache/camel/StartupListener.java     |   0
 .../java/org/apache/camel/StatefulService.java     |   0
 .../main/java/org/apache/camel/StaticService.java  |   0
 .../main/java/org/apache/camel/StreamCache.java    |   0
 .../main/java/org/apache/camel/StringSource.java   |   0
 .../main/java/org/apache/camel/Suspendable.java    |   0
 .../java/org/apache/camel/SuspendableService.java  |   0
 .../src/main/java/org/apache/camel/TimeoutMap.java |   0
 .../main/java/org/apache/camel/TimerListener.java  |   0
 .../src/main/java/org/apache/camel/Traceable.java  |   0
 .../org/apache/camel/TypeConversionException.java  |   0
 .../main/java/org/apache/camel/TypeConverter.java  |   0
 .../java/org/apache/camel/TypeConverterExists.java |   0
 .../apache/camel/TypeConverterExistsException.java |   0
 .../apache/camel/TypeConverterLoaderException.java |   0
 .../main/java/org/apache/camel/TypeConverters.java |   0
 .../java/org/apache/camel/ValidationException.java |   0
 .../main/java/org/apache/camel/ValueHolder.java    |   0
 .../camel/VetoCamelContextStartException.java      |   0
 .../org/apache/camel/WaitForTaskToComplete.java    |   0
 .../main/java/org/apache/camel/WrappedFile.java    |   0
 .../camel/cluster/CamelClusterEventListener.java   |   0
 .../apache/camel/cluster/CamelClusterMember.java   |   0
 .../apache/camel/cluster/CamelClusterService.java  |   0
 .../org/apache/camel/cluster/CamelClusterView.java |   0
 .../java/org/apache/camel/cluster/package.html     |   0
 .../component/extension/ComponentExtension.java    |   0
 .../extension/ComponentVerifierExtension.java      |   0
 .../ComponentVerifierExtensionHelper.java          |   0
 .../component/extension/MetaDataExtension.java     |   0
 .../apache/camel/component/extension/package.html  |   0
 .../java/org/apache/camel/health/HealthCheck.java  |   0
 .../camel/health/HealthCheckConfiguration.java     |   0
 .../org/apache/camel/health/HealthCheckFilter.java |   0
 .../org/apache/camel/health/HealthCheckHelper.java |   0
 .../apache/camel/health/HealthCheckRegistry.java   |   0
 .../apache/camel/health/HealthCheckRepository.java |   0
 .../camel/health/HealthCheckResultBuilder.java     |   0
 .../apache/camel/health/HealthCheckService.java    |   0
 .../main/java/org/apache/camel/health/package.html |   0
 .../main/java/org/apache/camel/package-info.java   |   0
 .../runtimecatalog/EndpointValidationResult.java   |   0
 .../camel/runtimecatalog/JSonSchemaResolver.java   |   0
 .../runtimecatalog/LanguageValidationResult.java   |   0
 .../camel/runtimecatalog/RuntimeCamelCatalog.java  |   0
 .../org/apache/camel/runtimecatalog/package.html   |   0
 .../apache/camel/spi/AggregationRepository.java    |   0
 .../camel/spi/AsyncProcessorAwaitManager.java      |   0
 .../org/apache/camel/spi/AuthorizationPolicy.java  |   0
 .../main/java/org/apache/camel/spi/Breakpoint.java |   0
 .../org/apache/camel/spi/BrowsableEndpoint.java    |   0
 .../apache/camel/spi/CamelContextNameStrategy.java |   0
 .../org/apache/camel/spi/CamelContextTracker.java  |   0
 .../main/java/org/apache/camel/spi/CamelEvent.java |   0
 .../java/org/apache/camel/spi/CamelLogger.java     |   0
 .../org/apache/camel/spi/ClaimCheckRepository.java |   0
 .../java/org/apache/camel/spi/ClassResolver.java   |   0
 .../org/apache/camel/spi/ComponentCustomizer.java  |   0
 .../org/apache/camel/spi/ComponentResolver.java    |   0
 .../main/java/org/apache/camel/spi/Condition.java  |   0
 .../java/org/apache/camel/spi/ConsumerCache.java   |   0
 .../main/java/org/apache/camel/spi/Contract.java   |   0
 .../main/java/org/apache/camel/spi/DataFormat.java |   0
 .../org/apache/camel/spi/DataFormatCustomizer.java |   0
 .../org/apache/camel/spi/DataFormatFactory.java    |   0
 .../java/org/apache/camel/spi/DataFormatName.java  |   0
 .../org/apache/camel/spi/DataFormatResolver.java   |   0
 .../main/java/org/apache/camel/spi/DataType.java   |   0
 .../java/org/apache/camel/spi/DataTypeAware.java   |   0
 .../main/java/org/apache/camel/spi/Debugger.java   |   0
 .../org/apache/camel/spi/EndpointRegistry.java     |   0
 .../org/apache/camel/spi/EndpointStrategy.java     |   0
 .../camel/spi/EndpointUtilizationStatistics.java   |   0
 .../java/org/apache/camel/spi/EventFactory.java    |   0
 .../java/org/apache/camel/spi/EventNotifier.java   |   0
 .../org/apache/camel/spi/ExceptionHandler.java     |   0
 .../org/apache/camel/spi/ExchangeFormatter.java    |   0
 .../apache/camel/spi/ExecutorServiceManager.java   |   0
 .../java/org/apache/camel/spi/FactoryFinder.java   |   0
 .../apache/camel/spi/FactoryFinderResolver.java    |   0
 .../main/java/org/apache/camel/spi/GroupAware.java |   0
 .../java/org/apache/camel/spi/HasCamelContext.java |   0
 .../main/java/org/apache/camel/spi/HasGroup.java   |   0
 .../src/main/java/org/apache/camel/spi/HasId.java  |   0
 .../org/apache/camel/spi/HeaderFilterStrategy.java |   0
 .../camel/spi/HeaderFilterStrategyAware.java       |   0
 .../org/apache/camel/spi/HeadersMapFactory.java    |   0
 .../main/java/org/apache/camel/spi/IdAware.java    |   0
 .../org/apache/camel/spi/IdempotentRepository.java |   0
 .../org/apache/camel/spi/InflightRepository.java   |   0
 .../main/java/org/apache/camel/spi/Injector.java   |   0
 .../apache/camel/spi/InterceptSendToEndpoint.java  |   0
 .../org/apache/camel/spi/InterceptStrategy.java    |   0
 .../main/java/org/apache/camel/spi/Language.java   |   0
 .../org/apache/camel/spi/LanguageCustomizer.java   |   0
 .../org/apache/camel/spi/LanguageResolver.java     |   0
 .../org/apache/camel/spi/LifecycleStrategy.java    |   0
 .../java/org/apache/camel/spi/LogListener.java     |   0
 .../java/org/apache/camel/spi/ManagementAgent.java |   0
 .../camel/spi/ManagementInterceptStrategy.java     |   0
 .../apache/camel/spi/ManagementMBeanAssembler.java |   0
 .../apache/camel/spi/ManagementNameStrategy.java   |   0
 .../camel/spi/ManagementObjectNameStrategy.java    |   0
 .../apache/camel/spi/ManagementObjectStrategy.java |   0
 .../org/apache/camel/spi/ManagementStrategy.java   |   0
 .../camel/spi/ManagementStrategyFactory.java       |   0
 .../org/apache/camel/spi/MaskingFormatter.java     |   0
 .../apache/camel/spi/MessageHistoryFactory.java    |   0
 .../apache/camel/spi/ModelJAXBContextFactory.java  |   0
 .../java/org/apache/camel/spi/NamespaceAware.java  |   0
 .../java/org/apache/camel/spi/NodeIdFactory.java   |   0
 .../OptimisticLockingAggregationRepository.java    |   0
 .../apache/camel/spi/PackageScanClassResolver.java |   0
 .../org/apache/camel/spi/PackageScanFilter.java    |   0
 .../src/main/java/org/apache/camel/spi/Policy.java |   0
 .../camel/spi/PollingConsumerPollStrategy.java     |   0
 .../org/apache/camel/spi/ProcessorFactory.java     |   0
 .../java/org/apache/camel/spi/ProducerCache.java   |   0
 .../org/apache/camel/spi/PropertiesComponent.java  |   0
 .../spi/RecoverableAggregationRepository.java      |   0
 .../main/java/org/apache/camel/spi/Registry.java   |   0
 .../java/org/apache/camel/spi/ReloadStrategy.java  |   0
 .../apache/camel/spi/RestApiConsumerFactory.java   |   0
 .../apache/camel/spi/RestApiProcessorFactory.java  |   0
 .../org/apache/camel/spi/RestConfiguration.java    |   0
 .../org/apache/camel/spi/RestConsumerFactory.java  |   0
 .../org/apache/camel/spi/RestProducerFactory.java  |   0
 .../java/org/apache/camel/spi/RestRegistry.java    |   0
 .../java/org/apache/camel/spi/RouteContext.java    |   0
 .../java/org/apache/camel/spi/RouteController.java |   0
 .../main/java/org/apache/camel/spi/RouteError.java |   0
 .../java/org/apache/camel/spi/RoutePolicy.java     |   0
 .../org/apache/camel/spi/RoutePolicyFactory.java   |   0
 .../org/apache/camel/spi/RouteStartupOrder.java    |   0
 .../apache/camel/spi/RuntimeEndpointRegistry.java  |   0
 .../camel/spi/ScheduledPollConsumerScheduler.java  |   0
 .../org/apache/camel/spi/SendDynamicAware.java     |   0
 .../java/org/apache/camel/spi/ShutdownAware.java   |   0
 .../org/apache/camel/spi/ShutdownPrepared.java     |   0
 .../org/apache/camel/spi/ShutdownStrategy.java     |   0
 .../java/org/apache/camel/spi/StateRepository.java |   0
 .../apache/camel/spi/StreamCachingStrategy.java    |   0
 .../java/org/apache/camel/spi/SubUnitOfWork.java   |   0
 .../apache/camel/spi/SubUnitOfWorkCallback.java    |   0
 .../java/org/apache/camel/spi/Synchronization.java |   0
 .../camel/spi/SynchronizationRouteAware.java       |   0
 .../apache/camel/spi/SynchronizationVetoable.java  |   0
 .../org/apache/camel/spi/ThreadPoolFactory.java    |   0
 .../org/apache/camel/spi/ThreadPoolProfile.java    |   0
 .../org/apache/camel/spi/TransactedPolicy.java     |   0
 .../java/org/apache/camel/spi/Transformer.java     |   0
 .../org/apache/camel/spi/TransformerRegistry.java  |   0
 .../org/apache/camel/spi/TypeConverterAware.java   |   0
 .../org/apache/camel/spi/TypeConverterLoader.java  |   0
 .../apache/camel/spi/TypeConverterRegistry.java    |   0
 .../main/java/org/apache/camel/spi/UnitOfWork.java |   0
 .../org/apache/camel/spi/UnitOfWorkFactory.java    |   0
 .../java/org/apache/camel/spi/UuidGenerator.java   |   0
 .../main/java/org/apache/camel/spi/Validator.java  |   0
 .../org/apache/camel/spi/ValidatorRegistry.java    |   0
 .../main/java/org/apache/camel/spi/package.html    |   0
 .../jsse/AliasedX509ExtendedKeyManager.java        |   0
 .../support/jsse/BaseSSLContextParameters.java     |   0
 .../camel/support/jsse/CipherSuitesParameters.java |   0
 .../camel/support/jsse/ClientAuthentication.java   |   0
 .../camel/support/jsse/FilterParameters.java       |   0
 .../jsse/GlobalSSLContextParametersSupplier.java   |   0
 .../apache/camel/support/jsse/JsseParameters.java  |   0
 .../camel/support/jsse/KeyManagersParameters.java  |   0
 .../camel/support/jsse/KeyStoreParameters.java     |   0
 .../support/jsse/SSLContextClientParameters.java   |   0
 .../camel/support/jsse/SSLContextParameters.java   |   0
 .../support/jsse/SSLContextServerParameters.java   |   0
 .../camel/support/jsse/SecureRandomParameters.java |   0
 .../jsse/SecureSocketProtocolsParameters.java      |   0
 .../support/jsse/TrustManagersParameters.java      |   0
 .../org/apache/camel/support/jsse/package.html     |   0
 .../camel/support/service/ServiceHelper.java       |   0
 .../camel/support/service/ServiceSupport.java      |   0
 {camel-base => core/camel-base}/pom.xml            |   4 +-
 .../apache/camel/cloud/DiscoverableService.java    |   0
 .../apache/camel/cloud/ServiceCallConstants.java   |   0
 .../camel/cloud/ServiceCallExpressionSupport.java  |   0
 .../org/apache/camel/cloud/ServiceChooser.java     |   0
 .../apache/camel/cloud/ServiceChooserAware.java    |   0
 .../apache/camel/cloud/ServiceChooserFactory.java  |   0
 .../org/apache/camel/cloud/ServiceDefinition.java  |   0
 .../org/apache/camel/cloud/ServiceDiscovery.java   |   0
 .../apache/camel/cloud/ServiceDiscoveryAware.java  |   0
 .../camel/cloud/ServiceDiscoveryFactory.java       |   0
 .../camel/cloud/ServiceExpressionFactory.java      |   0
 .../org/apache/camel/cloud/ServiceFactory.java     |   0
 .../java/org/apache/camel/cloud/ServiceFilter.java |   0
 .../org/apache/camel/cloud/ServiceFilterAware.java |   0
 .../apache/camel/cloud/ServiceFilterFactory.java   |   0
 .../java/org/apache/camel/cloud/ServiceHealth.java |   0
 .../apache/camel/cloud/ServiceLoadBalancer.java    |   0
 .../camel/cloud/ServiceLoadBalancerFactory.java    |   0
 .../camel/cloud/ServiceLoadBalancerFunction.java   |   0
 .../org/apache/camel/cloud/ServiceRegistry.java    |   0
 .../main/java/org/apache/camel/cloud/package.html  |   0
 .../camel/converter/AttachmentConverter.java       |   0
 .../org/apache/camel/converter/CamelConverter.java |   0
 .../camel/converter/CollectionConverter.java       |   0
 .../apache/camel/converter/DateTimeConverter.java  |   0
 .../apache/camel/converter/DurationConverter.java  |   0
 .../org/apache/camel/converter/IOConverter.java    |   0
 .../org/apache/camel/converter/NIOConverter.java   |   0
 .../apache/camel/converter/ObjectConverter.java    |   0
 .../org/apache/camel/converter/SQLConverter.java   |   0
 .../camel/converter/TimePatternConverter.java      |   0
 .../apache/camel/converter/jaxp/DomConverter.java  |   0
 .../apache/camel/converter/jaxp/StaxConverter.java |   0
 .../converter/jaxp/StreamSourceConverter.java      |   0
 .../camel/converter/jaxp/ThreadSafeNodeList.java   |   0
 .../apache/camel/converter/jaxp/XMLReaderPool.java |   0
 .../converter/jaxp/XMLStreamReaderInputStream.java |   0
 .../converter/jaxp/XMLStreamReaderReader.java      |   0
 .../apache/camel/converter/jaxp/XmlConverter.java  |   0
 .../camel/converter/jaxp/XmlErrorListener.java     |   0
 .../org/apache/camel/converter/jaxp/package.html   |   0
 .../java/org/apache/camel/converter/package.html   |   0
 .../converter/AnnotationTypeConverterLoader.java   |   0
 .../camel/impl/converter/ArrayTypeConverter.java   |   0
 .../converter/AsyncProcessorTypeConverter.java     |   0
 .../impl/converter/BaseTypeConverterRegistry.java  |   0
 .../camel/impl/converter/CachingInjector.java      |   0
 .../camel/impl/converter/DefaultTypeConverter.java |   0
 .../org/apache/camel/impl/converter/DoubleMap.java |   0
 .../camel/impl/converter/EnumTypeConverter.java    |   0
 .../camel/impl/converter/FutureTypeConverter.java  |   0
 .../InstanceMethodFallbackTypeConverter.java       |   0
 .../converter/InstanceMethodTypeConverter.java     |   0
 .../StaticMethodFallbackTypeConverter.java         |   0
 .../impl/converter/StaticMethodTypeConverter.java  |   0
 .../impl/converter/ToStringTypeConverter.java      |   0
 .../camel/impl/converter/TypeConvertersLoader.java |   0
 .../TypeConvertersPackageScanClassResolver.java    |   0
 .../camel/impl/converter/UriTypeConverter.java     |   0
 .../org/apache/camel/impl/converter/package.html   |   0
 .../camel/impl/event/AbstractContextEvent.java     |   0
 .../camel/impl/event/AbstractExchangeEvent.java    |   0
 .../camel/impl/event/AbstractRouteEvent.java       |   0
 .../impl/event/CamelContextResumeFailureEvent.java |   0
 .../camel/impl/event/CamelContextResumedEvent.java |   0
 .../impl/event/CamelContextResumingEvent.java      |   0
 .../camel/impl/event/CamelContextStartedEvent.java |   0
 .../impl/event/CamelContextStartingEvent.java      |   0
 .../event/CamelContextStartupFailureEvent.java     |   0
 .../impl/event/CamelContextStopFailureEvent.java   |   0
 .../camel/impl/event/CamelContextStoppedEvent.java |   0
 .../impl/event/CamelContextStoppingEvent.java      |   0
 .../impl/event/CamelContextSuspendedEvent.java     |   0
 .../impl/event/CamelContextSuspendingEvent.java    |   0
 .../camel/impl/event/DefaultEventFactory.java      |   0
 .../camel/impl/event/ExchangeCompletedEvent.java   |   0
 .../camel/impl/event/ExchangeCreatedEvent.java     |   0
 .../camel/impl/event/ExchangeFailedEvent.java      |   0
 .../impl/event/ExchangeFailureHandledEvent.java    |   0
 .../impl/event/ExchangeFailureHandlingEvent.java   |   0
 .../camel/impl/event/ExchangeRedeliveryEvent.java  |   0
 .../camel/impl/event/ExchangeSendingEvent.java     |   0
 .../apache/camel/impl/event/ExchangeSentEvent.java |   0
 .../apache/camel/impl/event/RouteAddedEvent.java   |   0
 .../apache/camel/impl/event/RouteRemovedEvent.java |   0
 .../apache/camel/impl/event/RouteStartedEvent.java |   0
 .../apache/camel/impl/event/RouteStoppedEvent.java |   0
 .../impl/event/ServiceStartupFailureEvent.java     |   0
 .../camel/impl/event/ServiceStopFailureEvent.java  |   0
 .../java/org/apache/camel/impl/event/package.html  |   0
 .../camel/impl/health/AbstractHealthCheck.java     |   0
 .../camel/impl/health/ContextHealthCheck.java      |   0
 .../impl/health/DefaultHealthCheckRegistry.java    |   0
 .../impl/health/DefaultHealthCheckService.java     |   0
 .../impl/health/PerformanceCounterEvaluator.java   |   0
 .../camel/impl/health/RegistryRepository.java      |   0
 .../apache/camel/impl/health/RouteHealthCheck.java |   0
 .../health/RoutePerformanceCounterEvaluators.java  |   0
 .../impl/health/RoutesHealthCheckRepository.java   |   0
 .../java/org/apache/camel/impl/health/package.html |   0
 .../camel/impl/saga/InMemorySagaCoordinator.java   |   0
 .../camel/impl/saga/InMemorySagaService.java       |   0
 .../java/org/apache/camel/impl/saga/package.html   |   0
 .../scan/AnnotatedWithAnyPackageScanFilter.java    |   0
 .../impl/scan/AnnotatedWithPackageScanFilter.java  |   0
 .../impl/scan/AssignableToPackageScanFilter.java   |   0
 .../impl/scan/CompositePackageScanFilter.java      |   0
 .../impl/scan/InvertingPackageScanFilter.java      |   0
 .../java/org/apache/camel/impl/scan/package.html   |   0
 .../camel/impl/validator/ProcessorValidator.java   |   0
 .../apache/camel/impl/validator/ValidatorKey.java  |   0
 .../org/apache/camel/impl/validator/package.html   |   0
 .../runtimecatalog/impl/AbstractCamelCatalog.java  |   0
 .../impl/CamelContextJSonSchemaResolver.java       |   0
 .../camel/runtimecatalog/impl/CatalogHelper.java   |   0
 .../impl/DefaultRuntimeCamelCatalog.java           |   0
 .../org/apache/camel/runtimecatalog/impl/Pair.java |   0
 .../runtimecatalog/impl/SuggestionStrategy.java    |   0
 .../runtimecatalog/impl/TimePatternConverter.java  |   0
 .../camel/runtimecatalog/impl/URISupport.java      |   0
 .../impl/UnsafeUriCharactersEncoder.java           |   0
 .../camel/support/dump/CamelContextStatDump.java   |   0
 .../org/apache/camel/support/dump/MessageDump.java |   0
 .../camel/support/dump/ProcessorStatDump.java      |   0
 .../apache/camel/support/dump/RouteStatDump.java   |   0
 .../ThrottlingExceptionHalfOpenHandler.java        |   0
 .../throttling/ThrottlingExceptionRoutePolicy.java |   0
 .../throttling/ThrottlingInflightRoutePolicy.java  |   0
 {camel-core => core/camel-core}/pom.xml            |   4 +-
 {camel-core => core/camel-core}/readme-eip.adoc    |   0
 {camel-core => core/camel-core}/readme.adoc        |   0
 .../camel-core}/src/main/docs/ControlBus.gif       | Bin
 .../camel-core}/src/main/docs/bean-component.adoc  |   0
 .../camel-core}/src/main/docs/bean-language.adoc   |   0
 .../camel-core}/src/main/docs/class-component.adoc |   0
 .../camel-core}/src/main/docs/clustering.adoc      |   0
 .../src/main/docs/constant-language.adoc           |   0
 .../src/main/docs/dataset-component.adoc           |   0
 .../camel-core}/src/main/docs/dynamic-router.adoc  |   0
 .../src/main/docs/eips/aggregate-eip.adoc          |   0
 .../src/main/docs/eips/batch-config-eip.adoc       |   0
 .../camel-core}/src/main/docs/eips/bean-eip.adoc   |   0
 .../camel-core}/src/main/docs/eips/choice-eip.adoc |   0
 .../src/main/docs/eips/circuitBreaker-eip.adoc     |   0
 .../src/main/docs/eips/claimCheck-eip.adoc         |   0
 .../main/docs/eips/content-based-router-eip.adoc   |   0
 .../src/main/docs/eips/content-filter-eip.adoc     |   0
 .../src/main/docs/eips/convertBodyTo-eip.adoc      |   0
 .../src/main/docs/eips/correlation-identifier.adoc |   0
 .../src/main/docs/eips/customLoadBalancer-eip.adoc |   0
 .../src/main/docs/eips/dead-letter-channel.adoc    |   0
 .../camel-core}/src/main/docs/eips/delay-eip.adoc  |   0
 .../src/main/docs/eips/dynamicRouter-eip.adoc      |   0
 .../camel-core}/src/main/docs/eips/enrich-eip.adoc |   0
 .../src/main/docs/eips/event-message.adoc          |   0
 .../main/docs/eips/eventDrivenConsumer-eip.adoc    |   0
 .../src/main/docs/eips/failover-eip.adoc           |   0
 .../camel-core}/src/main/docs/eips/filter-eip.adoc |   0
 .../camel-core}/src/main/docs/eips/from-eip.adoc   |   0
 .../src/main/docs/eips/guaranteed-delivery.adoc    |   0
 .../src/main/docs/eips/hystrix-eip.adoc            |   0
 .../main/docs/eips/hystrixConfiguration-eip.adoc   |   0
 .../src/main/docs/eips/idempotentConsumer-eip.adoc |   0
 .../camel-core}/src/main/docs/eips/inOnly-eip.adoc |   0
 .../camel-core}/src/main/docs/eips/inOut-eip.adoc  |   0
 .../src/main/docs/eips/loadBalance-eip.adoc        |   0
 .../camel-core}/src/main/docs/eips/log-eip.adoc    |   0
 .../camel-core}/src/main/docs/eips/loop-eip.adoc   |   0
 .../src/main/docs/eips/marshal-eip.adoc            |   0
 .../src/main/docs/eips/message-bus.adoc            |   0
 .../src/main/docs/eips/message-channel.adoc        |   0
 .../src/main/docs/eips/message-endpoint.adoc       |   0
 .../src/main/docs/eips/message-router.adoc         |   0
 .../src/main/docs/eips/message-translator.adoc     |   0
 .../camel-core}/src/main/docs/eips/message.adoc    |   0
 .../src/main/docs/eips/multicast-eip.adoc          |   0
 .../src/main/docs/eips/onFallback-eip.adoc         |   0
 .../src/main/docs/eips/otherwise-eip.adoc          |   0
 .../src/main/docs/eips/pipeline-eip.adoc           |   0
 .../src/main/docs/eips/point-to-point-channel.adoc |   0
 .../src/main/docs/eips/pollEnrich-eip.adoc         |   0
 .../src/main/docs/eips/process-eip.adoc            |   0
 .../main/docs/eips/publish-subscribe-channel.adoc  |   0
 .../camel-core}/src/main/docs/eips/random-eip.adoc |   0
 .../src/main/docs/eips/recipientList-eip.adoc      |   0
 .../src/main/docs/eips/removeHeader-eip.adoc       |   0
 .../src/main/docs/eips/removeHeaders-eip.adoc      |   0
 .../src/main/docs/eips/removeProperties-eip.adoc   |   0
 .../src/main/docs/eips/removeProperty-eip.adoc     |   0
 .../src/main/docs/eips/requestReply-eip.adoc       |   0
 .../src/main/docs/eips/resequence-eip.adoc         |   0
 .../src/main/docs/eips/rollback-eip.adoc           |   0
 .../src/main/docs/eips/roundRobin-eip.adoc         |   0
 .../src/main/docs/eips/routingSlip-eip.adoc        |   0
 .../camel-core}/src/main/docs/eips/saga-eip.adoc   |   0
 .../camel-core}/src/main/docs/eips/sample-eip.adoc |   0
 .../camel-core}/src/main/docs/eips/script-eip.adoc |   0
 .../src/main/docs/eips/serviceCall-eip.adoc        |   0
 .../src/main/docs/eips/setBody-eip.adoc            |   0
 .../src/main/docs/eips/setFaultBody-eip.adoc       |   0
 .../src/main/docs/eips/setHeader-eip.adoc          |   0
 .../src/main/docs/eips/setOutHeader-eip.adoc       |   0
 .../src/main/docs/eips/setProperty-eip.adoc        |   0
 .../camel-core}/src/main/docs/eips/sort-eip.adoc   |   0
 .../camel-core}/src/main/docs/eips/split-eip.adoc  |   0
 .../camel-core}/src/main/docs/eips/sticky-eip.adoc |   0
 .../camel-core}/src/main/docs/eips/stop-eip.adoc   |   0
 .../src/main/docs/eips/stream-config-eip.adoc      |   0
 .../src/main/docs/eips/threads-eip.adoc            |   0
 .../src/main/docs/eips/throttle-eip.adoc           |   0
 .../camel-core}/src/main/docs/eips/to-eip.adoc     |   0
 .../camel-core}/src/main/docs/eips/toD-eip.adoc    |   0
 .../camel-core}/src/main/docs/eips/topic-eip.adoc  |   0
 .../src/main/docs/eips/transactional-client.adoc   |   0
 .../src/main/docs/eips/transform-eip.adoc          |   0
 .../src/main/docs/eips/unmarshal-eip.adoc          |   0
 .../src/main/docs/eips/validate-eip.adoc           |   0
 .../src/main/docs/eips/weighted-eip.adoc           |   0
 .../camel-core}/src/main/docs/eips/when-eip.adoc   |   0
 .../src/main/docs/eips/wireTap-eip.adoc            |   0
 .../src/main/docs/exchangeProperty-language.adoc   |   0
 .../camel-core}/src/main/docs/file-language.adoc   |   0
 .../camel-core}/src/main/docs/gzip-dataformat.adoc |   0
 .../camel-core}/src/main/docs/header-language.adoc |   0
 .../camel-core}/src/main/docs/health-check.adoc    |   0
 .../camel-core}/src/main/docs/mock-component.adoc  |   0
 .../camel-core}/src/main/docs/ref-language.adoc    |   0
 .../camel-core}/src/main/docs/rest-dsl.adoc        |   0
 .../camel-core}/src/main/docs/return-address.adoc  |   0
 .../src/main/docs/serialization-dataformat.adoc    |   0
 .../src/main/docs/service-registry.adoc            |   0
 .../camel-core}/src/main/docs/simple-language.adoc |   0
 .../src/main/docs/string-dataformat.adoc           |   0
 .../camel-core}/src/main/docs/test-component.adoc  |   0
 .../src/main/docs/tokenize-language.adoc           |   0
 .../camel-core}/src/main/docs/transformer.adoc     |   0
 .../camel-core}/src/main/docs/validator.adoc       |   0
 .../camel-core}/src/main/docs/xpath-language.adoc  |   0
 .../src/main/docs/xtokenize-language.adoc          |   0
 .../camel-core}/src/main/docs/zip-dataformat.adoc  |   0
 .../apache/camel/builder/AdviceWithBuilder.java    |   0
 .../camel/builder/AdviceWithRouteBuilder.java      |   0
 .../org/apache/camel/builder/AdviceWithTask.java   |   0
 .../org/apache/camel/builder/AdviceWithTasks.java  |   0
 .../camel/builder/AggregationStrategies.java       |   0
 .../camel/builder/AggregationStrategyClause.java   |   0
 .../camel/builder/BinaryPredicateSupport.java      |   0
 .../java/org/apache/camel/builder/Builder.java     |   0
 .../org/apache/camel/builder/BuilderSupport.java   |   0
 .../org/apache/camel/builder/DataFormatClause.java |   0
 .../camel/builder/DeadLetterChannelBuilder.java    |   0
 .../camel/builder/DefaultErrorHandlerBuilder.java  |   0
 .../builder/DefaultFluentProducerTemplate.java     |   0
 .../org/apache/camel/builder/EnrichClause.java     |   0
 .../apache/camel/builder/ErrorHandlerBuilder.java  |   0
 .../camel/builder/ErrorHandlerBuilderRef.java      |   0
 .../camel/builder/ErrorHandlerBuilderSupport.java  |   0
 .../org/apache/camel/builder/ExchangeBuilder.java  |   0
 .../apache/camel/builder/ExpressionBuilder.java    |   0
 .../org/apache/camel/builder/ExpressionClause.java |   0
 .../camel/builder/ExpressionClauseSupport.java     |   0
 .../camel/builder/FlexibleAggregationStrategy.java |   0
 .../camel/builder/NoErrorHandlerBuilder.java       |   0
 .../org/apache/camel/builder/NotifyBuilder.java    |   0
 .../org/apache/camel/builder/PredicateBuilder.java |   0
 .../org/apache/camel/builder/PredicateClause.java  |   0
 .../org/apache/camel/builder/ProcessClause.java    |   0
 .../org/apache/camel/builder/ProxyBuilder.java     |   0
 .../camel/builder/RecordableInputStream.java       |   0
 .../org/apache/camel/builder/RecordableReader.java |   0
 .../org/apache/camel/builder/RouteBuilder.java     |   0
 .../org/apache/camel/builder/ScriptHelper.java     |   0
 .../org/apache/camel/builder/SimpleBuilder.java    |   0
 .../apache/camel/builder/ThreadPoolBuilder.java    |   0
 .../camel/builder/ThreadPoolProfileBuilder.java    |   0
 .../camel/builder/TokenPairExpressionIterator.java |   0
 .../camel/builder/TokenXMLExpressionIterator.java  |   0
 .../apache/camel/builder/TransformerBuilder.java   |   0
 .../org/apache/camel/builder/ValidatorBuilder.java |   0
 .../org/apache/camel/builder/ValueBuilder.java     |   0
 .../camel/builder/XMLTokenExpressionIterator.java  |   0
 .../java/org/apache/camel/builder/package.html     |   0
 .../camel/builder/xml/DefaultNamespaceContext.java |   0
 .../camel/builder/xml/InvalidXPathExpression.java  |   0
 .../camel/builder/xml/MessageVariableResolver.java |   0
 .../org/apache/camel/builder/xml/Namespaces.java   |   0
 .../org/apache/camel/builder/xml/XPathBuilder.java |   0
 .../java/org/apache/camel/builder/xml/package.html |   0
 .../component/bean/AbstractBeanProcessor.java      |   0
 .../bean/AbstractCamelInvocationHandler.java       |   0
 .../bean/AmbiguousMethodCallException.java         |   0
 .../bean/AnnotationExpressionFactory.java          |   0
 .../bean/BeanAnnotationExpressionFactory.java      |   0
 .../apache/camel/component/bean/BeanComponent.java |   0
 .../apache/camel/component/bean/BeanConstants.java |   0
 .../apache/camel/component/bean/BeanConverter.java |   0
 .../apache/camel/component/bean/BeanEndpoint.java  |   0
 .../component/bean/BeanExpressionProcessor.java    |   0
 .../apache/camel/component/bean/BeanHelper.java    |   0
 .../apache/camel/component/bean/BeanHolder.java    |   0
 .../org/apache/camel/component/bean/BeanInfo.java  |   0
 .../camel/component/bean/BeanInfoCacheKey.java     |   0
 .../camel/component/bean/BeanInvocation.java       |   0
 .../apache/camel/component/bean/BeanProcessor.java |   0
 .../apache/camel/component/bean/BeanProducer.java  |   0
 .../camel/component/bean/BeanTypeHolder.java       |   0
 .../component/bean/CamelInvocationHandler.java     |   0
 .../camel/component/bean/ConstantBeanHolder.java   |   0
 .../bean/ConstantStaticTypeBeanHolder.java         |   0
 .../component/bean/ConstantTypeBeanHolder.java     |   0
 .../bean/DefaultAnnotationExpressionFactory.java   |   0
 .../bean/DefaultParameterMappingStrategy.java      |   0
 .../apache/camel/component/bean/MethodBean.java    |   0
 .../apache/camel/component/bean/MethodInfo.java    |   0
 .../camel/component/bean/MethodInfoCache.java      |   0
 .../camel/component/bean/MethodInvocation.java     |   0
 .../component/bean/MethodNotFoundException.java    |   0
 .../apache/camel/component/bean/MethodsFilter.java |   0
 .../component/bean/ParameterBindingException.java  |   0
 .../apache/camel/component/bean/ParameterInfo.java |   0
 .../component/bean/ParameterMappingStrategy.java   |   0
 .../bean/PojoMessageInvocationHandler.java         |   0
 .../camel/component/bean/PojoProxyHelper.java      |   0
 .../apache/camel/component/bean/ProxyHelper.java   |   0
 .../apache/camel/component/bean/RegistryBean.java  |   0
 .../bean/XPathAnnotationExpressionFactory.java     |   0
 .../org/apache/camel/component/bean/package.html   |   0
 .../camel/component/beanclass/ClassComponent.java  |   0
 .../camel/component/beanclass/ClassEndpoint.java   |   0
 .../apache/camel/component/beanclass/package.html  |   0
 .../apache/camel/component/dataset/DataSet.java    |   0
 .../camel/component/dataset/DataSetComponent.java  |   0
 .../camel/component/dataset/DataSetConsumer.java   |   0
 .../camel/component/dataset/DataSetEndpoint.java   |   0
 .../camel/component/dataset/DataSetSupport.java    |   0
 .../camel/component/dataset/FileDataSet.java       |   0
 .../camel/component/dataset/ListDataSet.java       |   0
 .../camel/component/dataset/SimpleDataSet.java     |   0
 .../apache/camel/component/dataset/package.html    |   0
 .../camel/component/mock/AssertionClause.java      |   0
 .../apache/camel/component/mock/MockComponent.java |   0
 .../apache/camel/component/mock/MockEndpoint.java  |   0
 .../java/org/apache/camel/component/mock/Time.java |   0
 .../apache/camel/component/mock/TimeClause.java    |   0
 .../org/apache/camel/component/mock/package.html   |   0
 .../java/org/apache/camel/component/package.html   |   0
 .../apache/camel/component/test/TestComponent.java |   0
 .../apache/camel/component/test/TestEndpoint.java  |   0
 .../org/apache/camel/component/test/package.html   |   0
 .../apache/camel/impl/AbstractCamelContext.java    |   0
 .../apache/camel/impl/AbstractDynamicRegistry.java |   0
 .../org/apache/camel/impl/BreakpointSupport.java   |   0
 .../camel/impl/CamelPostProcessorHelper.java       |   0
 .../org/apache/camel/impl/CompositeRegistry.java   |   0
 .../org/apache/camel/impl/CompoundIterator.java    |   0
 .../impl/DefaultAsyncProcessorAwaitManager.java    |   0
 .../camel/impl/DefaultCamelBeanPostProcessor.java  |   0
 .../org/apache/camel/impl/DefaultCamelContext.java |   0
 .../impl/DefaultCamelContextNameStrategy.java      |   0
 .../camel/impl/DefaultClaimCheckRepository.java    |   0
 .../apache/camel/impl/DefaultClassResolver.java    |   0
 .../camel/impl/DefaultComponentResolver.java       |   0
 .../apache/camel/impl/DefaultConsumerCache.java    |   0
 .../apache/camel/impl/DefaultConsumerTemplate.java |   0
 .../camel/impl/DefaultDataFormatResolver.java      |   0
 .../org/apache/camel/impl/DefaultDebugger.java     |   0
 .../apache/camel/impl/DefaultEndpointRegistry.java |   0
 .../impl/DefaultEndpointUtilizationStatistics.java |   0
 .../camel/impl/DefaultExecutorServiceManager.java  |   0
 .../apache/camel/impl/DefaultFactoryFinder.java    |   0
 .../camel/impl/DefaultFactoryFinderResolver.java   |   0
 .../camel/impl/DefaultHeadersMapFactory.java       |   0
 .../camel/impl/DefaultInflightRepository.java      |   0
 .../org/apache/camel/impl/DefaultInjector.java     |   0
 .../camel/impl/DefaultInterceptSendToEndpoint.java |   0
 .../apache/camel/impl/DefaultLanguageResolver.java |   0
 .../camel/impl/DefaultManagementNameStrategy.java  |   0
 .../camel/impl/DefaultManagementStrategy.java      |   0
 .../impl/DefaultManagementStrategyFactory.java     |   0
 .../camel/impl/DefaultMessageHistoryFactory.java   |   0
 .../camel/impl/DefaultModelJAXBContextFactory.java |   0
 .../apache/camel/impl/DefaultNodeIdFactory.java    |   0
 .../impl/DefaultPackageScanClassResolver.java      |   0
 .../apache/camel/impl/DefaultProcessorFactory.java |   0
 .../apache/camel/impl/DefaultProducerCache.java    |   0
 .../apache/camel/impl/DefaultProducerTemplate.java |   0
 .../org/apache/camel/impl/DefaultRestRegistry.java |   0
 .../java/org/apache/camel/impl/DefaultRoute.java   |   0
 .../org/apache/camel/impl/DefaultRouteContext.java |   0
 .../apache/camel/impl/DefaultRouteController.java  |   0
 .../org/apache/camel/impl/DefaultRouteError.java   |   0
 .../camel/impl/DefaultRouteStartupOrder.java       |   0
 .../camel/impl/DefaultRuntimeEndpointRegistry.java |   0
 .../apache/camel/impl/DefaultShutdownStrategy.java |   0
 .../camel/impl/DefaultStreamCachingStrategy.java   |   0
 .../apache/camel/impl/DefaultSubUnitOfWork.java    |   0
 .../camel/impl/DefaultTransformerRegistry.java     |   0
 .../org/apache/camel/impl/DefaultUnitOfWork.java   |   0
 .../camel/impl/DefaultUnitOfWorkFactory.java       |   0
 .../apache/camel/impl/DefaultUuidGenerator.java    |   0
 .../camel/impl/DefaultValidatorRegistry.java       |   0
 .../java/org/apache/camel/impl/DeferProducer.java  |   0
 .../camel/impl/DeferServiceStartupListener.java    |   0
 .../org/apache/camel/impl/DurationRoutePolicy.java |   0
 .../camel/impl/DurationRoutePolicyFactory.java     |   0
 .../java/org/apache/camel/impl/EndpointKey.java    |   0
 .../camel/impl/EventDrivenConsumerRoute.java       |   0
 .../apache/camel/impl/EventNotifierCallback.java   |   0
 .../impl/ExplicitCamelContextNameStrategy.java     |   0
 .../org/apache/camel/impl/FileStateRepository.java |   0
 .../camel/impl/FileWatcherReloadStrategy.java      |   0
 .../java/org/apache/camel/impl/GzipDataFormat.java |   0
 .../camel/impl/HashMapHeadersMapFactory.java       |   0
 .../camel/impl/HeadersMapFactoryResolver.java      |   0
 .../impl/InterceptSendToEndpointProcessor.java     |   0
 .../impl/InterceptSendToMockEndpointStrategy.java  |   0
 .../org/apache/camel/impl/JavaUuidGenerator.java   |   0
 .../java/org/apache/camel/impl/JndiRegistry.java   |   0
 .../impl/LimitedPollingConsumerPollStrategy.java   |   0
 .../java/org/apache/camel/impl/MDCUnitOfWork.java  |   0
 .../apache/camel/impl/MemoryStateRepository.java   |   0
 .../impl/PropertyPlaceholderDelegateRegistry.java  |   0
 .../camel/impl/ProvisionalEndpointRegistry.java    |   0
 .../apache/camel/impl/ReloadStrategySupport.java   |   0
 .../java/org/apache/camel/impl/RouteIdFactory.java |   0
 .../java/org/apache/camel/impl/RouteService.java   |   0
 .../apache/camel/impl/SerializationDataFormat.java |   0
 .../java/org/apache/camel/impl/ServicePool.java    |   0
 .../java/org/apache/camel/impl/SimpleRegistry.java |   0
 .../org/apache/camel/impl/StringDataFormat.java    |   0
 .../camel/impl/SubscribeMethodProcessor.java       |   0
 .../camel/impl/SupervisingRouteController.java     |   0
 .../impl/SupervisingRouteControllerFilters.java    |   0
 .../apache/camel/impl/TypedProcessorFactory.java   |   0
 .../impl/WebSpherePackageScanClassResolver.java    |   0
 .../java/org/apache/camel/impl/ZipDataFormat.java  |   0
 .../camel/impl/cloud/AbstractServiceRegistry.java  |   0
 .../camel/impl/cloud/BlacklistServiceFilter.java   |   0
 .../impl/cloud/BlacklistServiceFilterFactory.java  |   0
 .../camel/impl/cloud/CachingServiceDiscovery.java  |   0
 .../impl/cloud/CachingServiceDiscoveryFactory.java |   0
 .../camel/impl/cloud/CombinedServiceDiscovery.java |   0
 .../cloud/CombinedServiceDiscoveryFactory.java     |   0
 .../camel/impl/cloud/CombinedServiceFilter.java    |   0
 .../impl/cloud/CombinedServiceFilterFactory.java   |   0
 .../impl/cloud/DefaultServiceCallExpression.java   |   0
 .../impl/cloud/DefaultServiceCallProcessor.java    |   0
 .../camel/impl/cloud/DefaultServiceDefinition.java |   0
 .../camel/impl/cloud/DefaultServiceDiscovery.java  |   0
 .../camel/impl/cloud/DefaultServiceFilter.java     |   0
 .../camel/impl/cloud/DefaultServiceHealth.java     |   0
 .../impl/cloud/DefaultServiceLoadBalancer.java     |   0
 .../cloud/DefaultServiceLoadBalancerFactory.java   |   0
 .../camel/impl/cloud/HealthyServiceFilter.java     |   0
 .../impl/cloud/HealthyServiceFilterFactory.java    |   0
 .../camel/impl/cloud/PassThroughServiceFilter.java |   0
 .../cloud/PassThroughServiceFilterFactory.java     |   0
 .../camel/impl/cloud/RandomServiceChooser.java     |   0
 .../camel/impl/cloud/RoundRobinServiceChooser.java |   0
 .../impl/cloud/ServiceRegistrationRoutePolicy.java |   0
 .../ServiceRegistrationRoutePolicyFactory.java     |   0
 .../camel/impl/cloud/ServiceRegistryHelper.java    |   0
 .../camel/impl/cloud/ServiceRegistrySelectors.java |   0
 .../camel/impl/cloud/StaticServiceDiscovery.java   |   0
 .../impl/cloud/StaticServiceDiscoveryFactory.java  |   0
 .../java/org/apache/camel/impl/cloud/package.html  |   0
 .../impl/cluster/ClusteredRouteConfiguration.java  |   0
 .../impl/cluster/ClusteredRouteController.java     |   0
 .../camel/impl/cluster/ClusteredRouteFilter.java   |   0
 .../camel/impl/cluster/ClusteredRouteFilters.java  |   0
 .../camel/impl/cluster/ClusteredRoutePolicy.java   |   0
 .../impl/cluster/ClusteredRoutePolicyFactory.java  |   0
 .../org/apache/camel/impl/cluster/package.html     |   0
 .../main/java/org/apache/camel/impl/package.html   |   0
 .../impl/transformer/DataFormatTransformer.java    |   0
 .../impl/transformer/ProcessorTransformer.java     |   0
 .../camel/impl/transformer/TransformerKey.java     |   0
 .../org/apache/camel/impl/transformer/package.html |   0
 .../main/java/org/apache/camel/language/Bean.java  |   0
 .../java/org/apache/camel/language/Constant.java   |   0
 .../apache/camel/language/LanguageAnnotation.java  |   0
 .../apache/camel/language/LanguageExpression.java  |   0
 .../org/apache/camel/language/NamespacePrefix.java |   0
 .../java/org/apache/camel/language/Simple.java     |   0
 .../main/java/org/apache/camel/language/SpEL.java  |   0
 .../main/java/org/apache/camel/language/XPath.java |   0
 .../apache/camel/language/bean/BeanExpression.java |   0
 .../apache/camel/language/bean/BeanLanguage.java   |   0
 .../bean/RuntimeBeanExpressionException.java       |   0
 .../org/apache/camel/language/bean/package.html    |   0
 .../camel/language/constant/ConstantLanguage.java  |   0
 .../apache/camel/language/constant/package.html    |   0
 .../camel/language/header/HeaderLanguage.java      |   0
 .../org/apache/camel/language/header/package.html  |   0
 .../java/org/apache/camel/language/package.html    |   0
 .../property/ExchangePropertyLanguage.java         |   0
 .../apache/camel/language/property/package.html    |   0
 .../org/apache/camel/language/ref/RefLanguage.java |   0
 .../org/apache/camel/language/ref/package.html     |   0
 .../camel/language/simple/BaseSimpleParser.java    |   0
 .../apache/camel/language/simple/FileLanguage.java |   0
 .../language/simple/SimpleExpressionParser.java    |   0
 .../camel/language/simple/SimpleLanguage.java      |   0
 .../language/simple/SimplePredicateParser.java     |   0
 .../camel/language/simple/SimpleTokenizer.java     |   0
 .../camel/language/simple/ast/BaseSimpleNode.java  |   0
 .../language/simple/ast/BinaryExpression.java      |   0
 .../apache/camel/language/simple/ast/Block.java    |   0
 .../apache/camel/language/simple/ast/BlockEnd.java |   0
 .../camel/language/simple/ast/BlockStart.java      |   0
 .../camel/language/simple/ast/CompositeNodes.java  |   0
 .../camel/language/simple/ast/DoubleQuoteEnd.java  |   0
 .../language/simple/ast/DoubleQuoteStart.java      |   0
 .../language/simple/ast/LiteralExpression.java     |   0
 .../camel/language/simple/ast/LiteralNode.java     |   0
 .../language/simple/ast/LogicalExpression.java     |   0
 .../camel/language/simple/ast/NullExpression.java  |   0
 .../language/simple/ast/SimpleFunctionEnd.java     |   0
 .../simple/ast/SimpleFunctionExpression.java       |   0
 .../language/simple/ast/SimpleFunctionStart.java   |   0
 .../camel/language/simple/ast/SimpleNode.java      |   0
 .../camel/language/simple/ast/SingleQuoteEnd.java  |   0
 .../language/simple/ast/SingleQuoteStart.java      |   0
 .../camel/language/simple/ast/UnaryExpression.java |   0
 .../apache/camel/language/simple/ast/package.html  |   0
 .../org/apache/camel/language/simple/package.html  |   0
 .../language/simple/types/BinaryOperatorType.java  |   0
 .../language/simple/types/LogicalOperatorType.java |   0
 .../simple/types/SimpleIllegalSyntaxException.java |   0
 .../simple/types/SimpleParserException.java        |   0
 .../camel/language/simple/types/SimpleToken.java   |   0
 .../language/simple/types/SimpleTokenType.java     |   0
 .../camel/language/simple/types/TokenType.java     |   0
 .../language/simple/types/UnaryOperatorType.java   |   0
 .../camel/language/simple/types/package.html       |   0
 .../camel/language/tokenizer/TokenizeLanguage.java |   0
 .../language/tokenizer/XMLTokenizeLanguage.java    |   0
 .../apache/camel/language/tokenizer/package.html   |   0
 .../apache/camel/language/xpath/XPathLanguage.java |   0
 .../org/apache/camel/language/xpath/package.html   |   0
 .../src/main/java/org/apache/camel/main/Main.java  |   0
 .../camel/main/MainDurationEventNotifier.java      |   0
 .../apache/camel/main/MainLifecycleStrategy.java   |   0
 .../java/org/apache/camel/main/MainListener.java   |   0
 .../org/apache/camel/main/MainListenerSupport.java |   0
 .../java/org/apache/camel/main/MainSupport.java    |   0
 .../main/java/org/apache/camel/main/package.html   |   0
 .../apache/camel/model/AggregateDefinition.java    |   0
 .../org/apache/camel/model/BeanDefinition.java     |   0
 .../main/java/org/apache/camel/model/Block.java    |   0
 .../org/apache/camel/model/CatchDefinition.java    |   0
 .../org/apache/camel/model/ChoiceDefinition.java   |   0
 .../apache/camel/model/ClaimCheckDefinition.java   |   0
 .../apache/camel/model/ClaimCheckOperation.java    |   0
 .../java/org/apache/camel/model/Constants.java     |   0
 .../apache/camel/model/ContextScanDefinition.java  |   0
 .../apache/camel/model/ConvertBodyDefinition.java  |   0
 .../apache/camel/model/DataFormatDefinition.java   |   0
 .../org/apache/camel/model/DelayDefinition.java    |   0
 .../apache/camel/model/DescriptionDefinition.java  |   0
 .../camel/model/DynamicRouterDefinition.java       |   0
 .../camel/model/EndpointRequiredDefinition.java    |   0
 .../org/apache/camel/model/EnrichDefinition.java   |   0
 .../model/ExecutorServiceAwareDefinition.java      |   0
 .../org/apache/camel/model/ExpressionNode.java     |   0
 .../apache/camel/model/ExpressionNodeHelper.java   |   0
 .../model/ExpressionSubElementDefinition.java      |   0
 .../org/apache/camel/model/FilterDefinition.java   |   0
 .../org/apache/camel/model/FinallyDefinition.java  |   0
 .../org/apache/camel/model/FromDefinition.java     |   0
 .../apache/camel/model/GlobalOptionDefinition.java |   0
 .../camel/model/GlobalOptionsDefinition.java       |   0
 .../camel/model/HystrixConfigurationCommon.java    |   0
 .../model/HystrixConfigurationDefinition.java      |   0
 .../org/apache/camel/model/HystrixDefinition.java  |   0
 .../camel/model/IdempotentConsumerDefinition.java  |   0
 .../org/apache/camel/model/IdentifiedType.java     |   0
 .../org/apache/camel/model/InOnlyDefinition.java   |   0
 .../org/apache/camel/model/InOutDefinition.java    |   0
 .../apache/camel/model/InputTypeDefinition.java    |   0
 .../apache/camel/model/InterceptDefinition.java    |   0
 .../camel/model/InterceptFromDefinition.java       |   0
 .../model/InterceptSendToEndpointDefinition.java   |   0
 .../apache/camel/model/LoadBalanceDefinition.java  |   0
 .../apache/camel/model/LoadBalancerDefinition.java |   0
 .../java/org/apache/camel/model/LogDefinition.java |   0
 .../org/apache/camel/model/LoopDefinition.java     |   0
 .../org/apache/camel/model/MarshalDefinition.java  |   0
 .../org/apache/camel/model/ModelCamelContext.java  |   0
 .../java/org/apache/camel/model/ModelChannel.java  |   0
 .../java/org/apache/camel/model/ModelHelper.java   |   0
 .../apache/camel/model/MulticastDefinition.java    |   0
 .../org/apache/camel/model/NoOutputDefinition.java |   0
 .../apache/camel/model/NoOutputExpressionNode.java |   0
 .../apache/camel/model/OnCompletionDefinition.java |   0
 .../org/apache/camel/model/OnCompletionMode.java   |   0
 .../apache/camel/model/OnExceptionDefinition.java  |   0
 .../apache/camel/model/OnFallbackDefinition.java   |   0
 .../model/OptimisticLockRetryPolicyDefinition.java |   0
 .../camel/model/OptionalIdentifiedDefinition.java  |   0
 .../apache/camel/model/OtherAttributesAware.java   |   0
 .../apache/camel/model/OtherwiseDefinition.java    |   0
 .../org/apache/camel/model/OutputDefinition.java   |   0
 .../apache/camel/model/OutputTypeDefinition.java   |   0
 .../apache/camel/model/PackageScanDefinition.java  |   0
 .../org/apache/camel/model/PipelineDefinition.java |   0
 .../org/apache/camel/model/PolicyDefinition.java   |   0
 .../apache/camel/model/PollEnrichDefinition.java   |   0
 .../org/apache/camel/model/ProcessDefinition.java  |   0
 .../apache/camel/model/ProcessorDefinition.java    |   0
 .../camel/model/ProcessorDefinitionHelper.java     |   0
 .../org/apache/camel/model/PropertyDefinition.java |   0
 .../camel/model/RecipientListDefinition.java       |   0
 .../camel/model/RedeliveryPolicyDefinition.java    |   0
 .../apache/camel/model/RemoveHeaderDefinition.java |   0
 .../camel/model/RemoveHeadersDefinition.java       |   0
 .../camel/model/RemovePropertiesDefinition.java    |   0
 .../camel/model/RemovePropertyDefinition.java      |   0
 .../apache/camel/model/ResequenceDefinition.java   |   0
 .../camel/model/RestContextRefDefinition.java      |   0
 .../model/RestContextRefDefinitionHelper.java      |   0
 .../org/apache/camel/model/RollbackDefinition.java |   0
 .../apache/camel/model/RouteBuilderDefinition.java |   0
 .../org/apache/camel/model/RouteContainer.java     |   0
 .../camel/model/RouteContextRefDefinition.java     |   0
 .../model/RouteContextRefDefinitionHelper.java     |   0
 .../org/apache/camel/model/RouteDefinition.java    |   0
 .../apache/camel/model/RouteDefinitionHelper.java  |   0
 .../org/apache/camel/model/RoutesDefinition.java   |   0
 .../apache/camel/model/RoutingSlipDefinition.java  |   0
 .../camel/model/SagaActionUriDefinition.java       |   0
 .../org/apache/camel/model/SagaCompletionMode.java |   0
 .../org/apache/camel/model/SagaDefinition.java     |   0
 .../apache/camel/model/SagaOptionDefinition.java   |   0
 .../org/apache/camel/model/SagaPropagation.java    |   0
 .../org/apache/camel/model/SamplingDefinition.java |   0
 .../org/apache/camel/model/ScriptDefinition.java   |   0
 .../org/apache/camel/model/SendDefinition.java     |   0
 .../org/apache/camel/model/SetBodyDefinition.java  |   0
 .../camel/model/SetExchangePatternDefinition.java  |   0
 .../apache/camel/model/SetFaultBodyDefinition.java |   0
 .../apache/camel/model/SetHeaderDefinition.java    |   0
 .../apache/camel/model/SetPropertyDefinition.java  |   0
 .../org/apache/camel/model/SortDefinition.java     |   0
 .../org/apache/camel/model/SplitDefinition.java    |   0
 .../org/apache/camel/model/StopDefinition.java     |   0
 .../camel/model/ThreadPoolProfileDefinition.java   |   0
 .../org/apache/camel/model/ThreadsDefinition.java  |   0
 .../org/apache/camel/model/ThrottleDefinition.java |   0
 .../camel/model/ThrowExceptionDefinition.java      |   0
 .../org/apache/camel/model/TimeUnitAdapter.java    |   0
 .../java/org/apache/camel/model/ToDefinition.java  |   0
 .../apache/camel/model/ToDynamicDefinition.java    |   0
 .../apache/camel/model/TransactedDefinition.java   |   0
 .../apache/camel/model/TransformDefinition.java    |   0
 .../java/org/apache/camel/model/TryDefinition.java |   0
 .../apache/camel/model/UnmarshalDefinition.java    |   0
 .../org/apache/camel/model/ValidateDefinition.java |   0
 .../org/apache/camel/model/WhenDefinition.java     |   0
 .../model/WhenSkipSendToEndpointDefinition.java    |   0
 .../org/apache/camel/model/WireTapDefinition.java  |   0
 ...klistServiceCallServiceFilterConfiguration.java |   0
 ...ngServiceCallServiceDiscoveryConfiguration.java |   0
 ...edServiceCallServiceDiscoveryConfiguration.java |   0
 ...binedServiceCallServiceFilterConfiguration.java |   0
 ...ulServiceCallServiceDiscoveryConfiguration.java |   0
 ...ustomServiceCallServiceFilterConfiguration.java |   0
 ...erviceCallServiceLoadBalancerConfiguration.java |   0
 ...nsServiceCallServiceDiscoveryConfiguration.java |   0
 ...cdServiceCallServiceDiscoveryConfiguration.java |   0
 ...althyServiceCallServiceFilterConfiguration.java |   0
 ...esServiceCallServiceDiscoveryConfiguration.java |   0
 ...roughServiceCallServiceFilterConfiguration.java |   0
 ...erviceCallServiceLoadBalancerConfiguration.java |   0
 .../cloud/ServiceCallConfigurationDefinition.java  |   0
 .../camel/model/cloud/ServiceCallDefinition.java   |   0
 .../cloud/ServiceCallDefinitionConstants.java      |   0
 .../cloud/ServiceCallExpressionConfiguration.java  |   0
 .../ServiceCallServiceChooserConfiguration.java    |   0
 .../ServiceCallServiceDiscoveryConfiguration.java  |   0
 .../ServiceCallServiceFilterConfiguration.java     |   0
 ...erviceCallServiceLoadBalancerConfiguration.java |   0
 ...icServiceCallServiceDiscoveryConfiguration.java |   0
 ...erServiceCallServiceDiscoveryConfiguration.java |   0
 .../org/apache/camel/model/cloud/package-info.java |   0
 .../camel/model/config/BatchResequencerConfig.java |   0
 .../camel/model/config/ResequencerConfig.java      |   0
 .../model/config/StreamResequencerConfig.java      |   0
 .../apache/camel/model/config/package-info.java    |   0
 .../camel/model/dataformat/ASN1DataFormat.java     |   0
 .../camel/model/dataformat/AvroDataFormat.java     |   0
 .../camel/model/dataformat/BarcodeDataFormat.java  |   0
 .../camel/model/dataformat/Base64DataFormat.java   |   0
 .../camel/model/dataformat/BeanioDataFormat.java   |   0
 .../camel/model/dataformat/BindyDataFormat.java    |   0
 .../apache/camel/model/dataformat/BindyType.java   |   0
 .../camel/model/dataformat/BoonDataFormat.java     |   0
 .../camel/model/dataformat/CryptoDataFormat.java   |   0
 .../camel/model/dataformat/CsvDataFormat.java      |   0
 .../camel/model/dataformat/CustomDataFormat.java   |   0
 .../model/dataformat/DataFormatsDefinition.java    |   0
 .../camel/model/dataformat/FhirDataformat.java     |   0
 .../camel/model/dataformat/FhirJsonDataFormat.java |   0
 .../camel/model/dataformat/FhirXmlDataFormat.java  |   0
 .../camel/model/dataformat/FlatpackDataFormat.java |   0
 .../camel/model/dataformat/GzipDataFormat.java     |   0
 .../camel/model/dataformat/HL7DataFormat.java      |   0
 .../camel/model/dataformat/IcalDataFormat.java     |   0
 .../model/dataformat/JacksonXMLDataFormat.java     |   0
 .../camel/model/dataformat/JaxbDataFormat.java     |   0
 .../camel/model/dataformat/JibxDataFormat.java     |   0
 .../camel/model/dataformat/JsonDataFormat.java     |   0
 .../apache/camel/model/dataformat/JsonLibrary.java |   0
 .../camel/model/dataformat/LZFDataFormat.java      |   0
 .../model/dataformat/MimeMultipartDataFormat.java  |   0
 .../camel/model/dataformat/PGPDataFormat.java      |   0
 .../camel/model/dataformat/ProtobufDataFormat.java |   0
 .../camel/model/dataformat/RssDataFormat.java      |   0
 .../model/dataformat/SerializationDataFormat.java  |   0
 .../camel/model/dataformat/SoapJaxbDataFormat.java |   0
 .../camel/model/dataformat/StringDataFormat.java   |   0
 .../camel/model/dataformat/SyslogDataFormat.java   |   0
 .../camel/model/dataformat/TarFileDataFormat.java  |   0
 .../camel/model/dataformat/ThriftDataFormat.java   |   0
 .../model/dataformat/TidyMarkupDataFormat.java     |   0
 .../dataformat/UniVocityAbstractDataFormat.java    |   0
 .../model/dataformat/UniVocityCsvDataFormat.java   |   0
 .../dataformat/UniVocityFixedWidthDataFormat.java  |   0
 .../camel/model/dataformat/UniVocityHeader.java    |   0
 .../model/dataformat/UniVocityTsvDataFormat.java   |   0
 .../model/dataformat/XMLSecurityDataFormat.java    |   0
 .../camel/model/dataformat/XStreamDataFormat.java  |   0
 .../camel/model/dataformat/XmlRpcDataFormat.java   |   0
 .../camel/model/dataformat/YAMLDataFormat.java     |   0
 .../apache/camel/model/dataformat/YAMLLibrary.java |   0
 .../model/dataformat/YAMLTypeFilterDefinition.java |   0
 .../camel/model/dataformat/YAMLTypeFilterType.java |   0
 .../camel/model/dataformat/ZipDataFormat.java      |   0
 .../camel/model/dataformat/ZipFileDataFormat.java  |   0
 .../camel/model/dataformat/package-info.java       |   0
 .../camel/model/language/ConstantExpression.java   |   0
 .../model/language/ExchangePropertyExpression.java |   0
 .../camel/model/language/ExpressionDefinition.java |   0
 .../camel/model/language/GroovyExpression.java     |   0
 .../camel/model/language/HeaderExpression.java     |   0
 .../camel/model/language/JavaScriptExpression.java |   0
 .../camel/model/language/JsonPathExpression.java   |   0
 .../camel/model/language/LanguageExpression.java   |   0
 .../camel/model/language/MethodCallExpression.java |   0
 .../camel/model/language/MvelExpression.java       |   0
 .../model/language/NamespaceAwareExpression.java   |   0
 .../camel/model/language/OgnlExpression.java       |   0
 .../apache/camel/model/language/RefExpression.java |   0
 .../camel/model/language/SimpleExpression.java     |   0
 .../camel/model/language/SpELExpression.java       |   0
 .../camel/model/language/TerserExpression.java     |   0
 .../camel/model/language/TokenizerExpression.java  |   0
 .../model/language/XMLTokenizerExpression.java     |   0
 .../camel/model/language/XPathExpression.java      |   0
 .../camel/model/language/XQueryExpression.java     |   0
 .../apache/camel/model/language/package-info.java  |   0
 .../loadbalancer/CustomLoadBalancerDefinition.java |   0
 .../FailoverLoadBalancerDefinition.java            |   0
 .../loadbalancer/RandomLoadBalancerDefinition.java |   0
 .../RoundRobinLoadBalancerDefinition.java          |   0
 .../loadbalancer/StickyLoadBalancerDefinition.java |   0
 .../loadbalancer/TopicLoadBalancerDefinition.java  |   0
 .../WeightedLoadBalancerDefinition.java            |   0
 .../camel/model/loadbalancer/package-info.java     |   0
 .../java/org/apache/camel/model/package-info.java  |   0
 .../apache/camel/model/rest/CollectionFormat.java  |   0
 .../camel/model/rest/DeleteVerbDefinition.java     |   0
 .../apache/camel/model/rest/GetVerbDefinition.java |   0
 .../camel/model/rest/HeadVerbDefinition.java       |   0
 .../camel/model/rest/PatchVerbDefinition.java      |   0
 .../camel/model/rest/PostVerbDefinition.java       |   0
 .../apache/camel/model/rest/PutVerbDefinition.java |   0
 .../camel/model/rest/RestBindingDefinition.java    |   0
 .../apache/camel/model/rest/RestBindingMode.java   |   0
 .../model/rest/RestConfigurationDefinition.java    |   0
 .../org/apache/camel/model/rest/RestConstants.java |   0
 .../org/apache/camel/model/rest/RestContainer.java |   0
 .../apache/camel/model/rest/RestDefinition.java    |   0
 .../camel/model/rest/RestHostNameResolver.java     |   0
 .../model/rest/RestOperationParamDefinition.java   |   0
 .../RestOperationResponseHeaderDefinition.java     |   0
 .../rest/RestOperationResponseMsgDefinition.java   |   0
 .../org/apache/camel/model/rest/RestParamType.java |   0
 .../camel/model/rest/RestPropertyDefinition.java   |   0
 .../camel/model/rest/RestSecuritiesDefinition.java |   0
 .../camel/model/rest/RestSecurityApiKey.java       |   0
 .../camel/model/rest/RestSecurityBasicAuth.java    |   0
 .../camel/model/rest/RestSecurityDefinition.java   |   0
 .../camel/model/rest/RestSecurityOAuth2.java       |   0
 .../apache/camel/model/rest/RestsDefinition.java   |   0
 .../camel/model/rest/SecurityDefinition.java       |   0
 .../apache/camel/model/rest/VerbDefinition.java    |   0
 .../org/apache/camel/model/rest/package-info.java  |   0
 .../transformer/CustomTransformerDefinition.java   |   0
 .../DataFormatTransformerDefinition.java           |   0
 .../transformer/EndpointTransformerDefinition.java |   0
 .../model/transformer/TransformerDefinition.java   |   0
 .../model/transformer/TransformersDefinition.java  |   0
 .../camel/model/transformer/package-info.java      |   0
 .../model/validator/CustomValidatorDefinition.java |   0
 .../validator/EndpointValidatorDefinition.java     |   0
 .../validator/PredicateValidatorDefinition.java    |   0
 .../camel/model/validator/ValidatorDefinition.java |   0
 .../model/validator/ValidatorsDefinition.java      |   0
 .../apache/camel/model/validator/package-info.java |   0
 .../camel/processor/CamelInternalProcessor.java    |   0
 .../processor/CamelInternalProcessorAdvice.java    |   0
 .../org/apache/camel/processor/CatchProcessor.java |   0
 .../apache/camel/processor/ChoiceProcessor.java    |   0
 .../processor/ClaimCheckAggregationStrategy.java   |   0
 .../camel/processor/ClaimCheckProcessor.java       |   0
 .../org/apache/camel/processor/ContractAdvice.java |   0
 .../camel/processor/ConvertBodyProcessor.java      |   0
 .../apache/camel/processor/DeadLetterChannel.java  |   0
 .../camel/processor/DefaultErrorHandler.java       |   0
 .../camel/processor/DeferServiceFactory.java       |   0
 .../camel/processor/DelayProcessorSupport.java     |   0
 .../java/org/apache/camel/processor/Delayer.java   |   0
 .../org/apache/camel/processor/DynamicRouter.java  |   0
 .../java/org/apache/camel/processor/Enricher.java  |   0
 .../org/apache/camel/processor/ErrorHandler.java   |   0
 .../camel/processor/ErrorHandlerSupport.java       |   0
 .../processor/EvaluateExpressionProcessor.java     |   0
 .../camel/processor/ExchangePatternProcessor.java  |   0
 .../camel/processor/FatalFallbackErrorHandler.java |   0
 .../apache/camel/processor/FilterProcessor.java    |   0
 .../apache/camel/processor/FinallyProcessor.java   |   0
 .../processor/InterceptEndpointProcessor.java      |   0
 .../InterceptorToAsyncProcessorBridge.java         |   0
 .../org/apache/camel/processor/LogProcessor.java   |   0
 .../org/apache/camel/processor/LoopProcessor.java  |   0
 .../apache/camel/processor/MulticastProcessor.java |   0
 .../camel/processor/OnCompletionProcessor.java     |   0
 .../java/org/apache/camel/processor/Pipeline.java  |   0
 .../org/apache/camel/processor/PipelineHelper.java |   0
 .../org/apache/camel/processor/PollEnricher.java   |   0
 .../camel/processor/ProcessorExchangePair.java     |   0
 .../org/apache/camel/processor/RecipientList.java  |   0
 .../camel/processor/RecipientListProcessor.java    |   0
 .../camel/processor/RedeliveryErrorHandler.java    |   0
 .../apache/camel/processor/RedeliveryPolicy.java   |   0
 .../camel/processor/RemoveHeaderProcessor.java     |   0
 .../camel/processor/RemoveHeadersProcessor.java    |   0
 .../camel/processor/RemovePropertiesProcessor.java |   0
 .../camel/processor/RemovePropertyProcessor.java   |   0
 .../org/apache/camel/processor/Resequencer.java    |   0
 .../apache/camel/processor/RestBindingAdvice.java  |   0
 .../apache/camel/processor/RollbackProcessor.java  |   0
 .../org/apache/camel/processor/RoutingSlip.java    |   0
 .../apache/camel/processor/SamplingThrottler.java  |   0
 .../apache/camel/processor/ScriptProcessor.java    |   0
 .../camel/processor/SendDynamicAwareResolver.java  |   0
 .../camel/processor/SendDynamicProcessor.java      |   0
 .../org/apache/camel/processor/SendProcessor.java  |   0
 .../apache/camel/processor/SetBodyProcessor.java   |   0
 .../apache/camel/processor/SetHeaderProcessor.java |   0
 .../camel/processor/SetPropertyProcessor.java      |   0
 .../processor/SharedCamelInternalProcessor.java    |   0
 .../org/apache/camel/processor/SortProcessor.java  |   0
 .../java/org/apache/camel/processor/Splitter.java  |   0
 .../org/apache/camel/processor/StopProcessor.java  |   0
 .../apache/camel/processor/StreamResequencer.java  |   0
 .../apache/camel/processor/ThreadsProcessor.java   |   0
 .../java/org/apache/camel/processor/Throttler.java |   0
 .../ThrottlerRejectedExecutionException.java       |   0
 .../camel/processor/ThrowExceptionProcessor.java   |   0
 .../apache/camel/processor/TransformProcessor.java |   0
 .../org/apache/camel/processor/TryProcessor.java   |   0
 .../apache/camel/processor/UnitOfWorkProducer.java |   0
 .../apache/camel/processor/WireTapProcessor.java   |   0
 .../org/apache/camel/processor/WrapProcessor.java  |   0
 .../aggregate/AbstractListAggregationStrategy.java |   0
 .../processor/aggregate/AggregateController.java   |   0
 .../processor/aggregate/AggregateProcessor.java    |   0
 .../aggregate/AggregateProcessorStatistics.java    |   0
 .../aggregate/AggregationStrategyBeanAdapter.java  |   0
 .../aggregate/AggregationStrategyBeanInfo.java     |   0
 .../aggregate/AggregationStrategyMethodInfo.java   |   0
 .../aggregate/ClosedCorrelationKeyException.java   |   0
 .../aggregate/DefaultAggregateController.java      |   0
 .../aggregate/GroupedBodyAggregationStrategy.java  |   0
 .../GroupedExchangeAggregationStrategy.java        |   0
 .../GroupedMessageAggregationStrategy.java         |   0
 .../aggregate/MemoryAggregationRepository.java     |   0
 .../aggregate/OptimisticLockRetryPolicy.java       |   0
 .../ShareUnitOfWorkAggregationStrategy.java        |   0
 .../aggregate/UseLatestAggregationStrategy.java    |   0
 .../aggregate/UseOriginalAggregationStrategy.java  |   0
 .../apache/camel/processor/aggregate/package.html  |   0
 .../DefaultExceptionPolicyStrategy.java            |   0
 .../exceptionpolicy/ExceptionPolicyKey.java        |   0
 .../exceptionpolicy/ExceptionPolicyStrategy.java   |   0
 .../camel/processor/exceptionpolicy/package.html   |   0
 .../processor/idempotent/IdempotentConsumer.java   |   0
 .../idempotent/IdempotentOnCompletion.java         |   0
 .../processor/idempotent/NoMessageIdException.java |   0
 .../apache/camel/processor/idempotent/package.html |   0
 .../processor/interceptor/BacklogDebugger.java     |   0
 .../camel/processor/interceptor/BacklogTracer.java |   0
 .../apache/camel/processor/interceptor/Debug.java  |   0
 .../DefaultBacklogTracerEventMessage.java          |   0
 .../processor/interceptor/DefaultChannel.java      |   0
 .../camel/processor/interceptor/HandleFault.java   |   0
 .../interceptor/HandleFaultInterceptor.java        |   0
 .../camel/processor/interceptor/package.html       |   0
 .../processor/loadbalancer/DistributionRatio.java  |   0
 .../loadbalancer/ExceptionFailureStatistics.java   |   0
 .../loadbalancer/FailOverLoadBalancer.java         |   0
 .../camel/processor/loadbalancer/LoadBalancer.java |   0
 .../loadbalancer/LoadBalancerConsumer.java         |   0
 .../loadbalancer/LoadBalancerSupport.java          |   0
 .../processor/loadbalancer/QueueLoadBalancer.java  |   0
 .../processor/loadbalancer/RandomLoadBalancer.java |   0
 .../loadbalancer/RoundRobinLoadBalancer.java       |   0
 .../processor/loadbalancer/StickyLoadBalancer.java |   0
 .../processor/loadbalancer/TopicLoadBalancer.java  |   0
 .../loadbalancer/WeightedLoadBalancer.java         |   0
 .../loadbalancer/WeightedRandomLoadBalancer.java   |   0
 .../WeightedRoundRobinLoadBalancer.java            |   0
 .../camel/processor/loadbalancer/package.html      |   0
 .../java/org/apache/camel/processor/package.html   |   0
 .../resequencer/DefaultExchangeComparator.java     |   0
 .../camel/processor/resequencer/Element.java       |   0
 .../processor/resequencer/ElementComparator.java   |   0
 .../resequencer/ExpressionResultComparator.java    |   0
 .../resequencer/MessageRejectedException.java      |   0
 .../processor/resequencer/ResequencerEngine.java   |   0
 .../camel/processor/resequencer/Sequence.java      |   0
 .../resequencer/SequenceElementComparator.java     |   0
 .../processor/resequencer/SequenceSender.java      |   0
 .../camel/processor/resequencer/Timeout.java       |   0
 .../processor/resequencer/TimeoutHandler.java      |   0
 .../camel/processor/resequencer/package.html       |   0
 .../processor/saga/MandatorySagaProcessor.java     |   0
 .../camel/processor/saga/NeverSagaProcessor.java   |   0
 .../processor/saga/NotSupportedSagaProcessor.java  |   0
 .../processor/saga/RequiredSagaProcessor.java      |   0
 .../processor/saga/RequiresNewSagaProcessor.java   |   0
 .../apache/camel/processor/saga/SagaProcessor.java |   0
 .../camel/processor/saga/SagaProcessorBuilder.java |   0
 .../processor/saga/SupportsSagaProcessor.java      |   0
 .../org/apache/camel/processor/saga/package.html   |   0
 .../org/apache/camel/reifier/AggregateReifier.java |   0
 .../java/org/apache/camel/reifier/BeanReifier.java |   0
 .../org/apache/camel/reifier/CatchReifier.java     |   0
 .../org/apache/camel/reifier/ChoiceReifier.java    |   0
 .../apache/camel/reifier/ClaimCheckReifier.java    |   0
 .../apache/camel/reifier/ConvertBodyReifier.java   |   0
 .../org/apache/camel/reifier/DelayReifier.java     |   0
 .../apache/camel/reifier/DynamicRouterReifier.java |   0
 .../org/apache/camel/reifier/EnrichReifier.java    |   0
 .../apache/camel/reifier/ErrorHandlerReifier.java  |   0
 .../apache/camel/reifier/ExpressionReifier.java    |   0
 .../org/apache/camel/reifier/FilterReifier.java    |   0
 .../org/apache/camel/reifier/FinallyReifier.java   |   0
 .../org/apache/camel/reifier/HystrixReifier.java   |   0
 .../camel/reifier/IdempotentConsumerReifier.java   |   0
 .../apache/camel/reifier/InterceptFromReifier.java |   0
 .../org/apache/camel/reifier/InterceptReifier.java |   0
 .../reifier/InterceptSendToEndpointReifier.java    |   0
 .../apache/camel/reifier/LoadBalanceReifier.java   |   0
 .../java/org/apache/camel/reifier/LogReifier.java  |   0
 .../java/org/apache/camel/reifier/LoopReifier.java |   0
 .../org/apache/camel/reifier/MarshalReifier.java   |   0
 .../org/apache/camel/reifier/MulticastReifier.java |   0
 .../apache/camel/reifier/OnCompletionReifier.java  |   0
 .../apache/camel/reifier/OnExceptionReifier.java   |   0
 .../apache/camel/reifier/OnFallbackReifier.java    |   0
 .../org/apache/camel/reifier/OtherwiseReifier.java |   0
 .../org/apache/camel/reifier/PipelineReifier.java  |   0
 .../org/apache/camel/reifier/PolicyReifier.java    |   0
 .../apache/camel/reifier/PollEnrichReifier.java    |   0
 .../org/apache/camel/reifier/ProcessReifier.java   |   0
 .../org/apache/camel/reifier/ProcessorReifier.java |   0
 .../apache/camel/reifier/RecipientListReifier.java |   0
 .../apache/camel/reifier/RemoveHeaderReifier.java  |   0
 .../apache/camel/reifier/RemoveHeadersReifier.java |   0
 .../camel/reifier/RemovePropertiesReifier.java     |   0
 .../camel/reifier/RemovePropertyReifier.java       |   0
 .../apache/camel/reifier/ResequenceReifier.java    |   0
 .../org/apache/camel/reifier/RollbackReifier.java  |   0
 .../org/apache/camel/reifier/RouteReifier.java     |   0
 .../apache/camel/reifier/RoutingSlipReifier.java   |   0
 .../java/org/apache/camel/reifier/SagaReifier.java |   0
 .../org/apache/camel/reifier/SamplingReifier.java  |   0
 .../org/apache/camel/reifier/ScriptReifier.java    |   0
 .../java/org/apache/camel/reifier/SendReifier.java |   0
 .../apache/camel/reifier/ServiceCallReifier.java   |   0
 .../org/apache/camel/reifier/SetBodyReifier.java   |   0
 .../camel/reifier/SetExchangePatternReifier.java   |   0
 .../apache/camel/reifier/SetFaultBodyReifier.java  |   0
 .../org/apache/camel/reifier/SetHeaderReifier.java |   0
 .../apache/camel/reifier/SetPropertyReifier.java   |   0
 .../java/org/apache/camel/reifier/SortReifier.java |   0
 .../org/apache/camel/reifier/SplitReifier.java     |   0
 .../java/org/apache/camel/reifier/StopReifier.java |   0
 .../org/apache/camel/reifier/ThreadsReifier.java   |   0
 .../org/apache/camel/reifier/ThrottleReifier.java  |   0
 .../camel/reifier/ThrowExceptionReifier.java       |   0
 .../org/apache/camel/reifier/ToDynamicReifier.java |   0
 .../apache/camel/reifier/TransactedReifier.java    |   0
 .../org/apache/camel/reifier/TransformReifier.java |   0
 .../java/org/apache/camel/reifier/TryReifier.java  |   0
 .../org/apache/camel/reifier/UnmarshalReifier.java |   0
 .../org/apache/camel/reifier/ValidateReifier.java  |   0
 .../java/org/apache/camel/reifier/WhenReifier.java |   0
 .../reifier/WhenSkipSendToEndpointReifier.java     |   0
 .../org/apache/camel/reifier/WireTapReifier.java   |   0
 .../loadbalancer/CustomLoadBalancerReifier.java    |   0
 .../loadbalancer/FailoverLoadBalancerReifier.java  |   0
 .../reifier/loadbalancer/LoadBalancerReifier.java  |   0
 .../loadbalancer/RandomLoadBalancerReifier.java    |   0
 .../RoundRobinLoadBalancerReifier.java             |   0
 .../loadbalancer/StickyLoadBalancerReifier.java    |   0
 .../loadbalancer/TopicLoadBalancerReifier.java     |   0
 .../loadbalancer/WeightedLoadBalancerReifier.java  |   0
 .../camel/reifier/rest/RestBindingReifier.java     |   0
 .../transformer/CustomTransformeReifier.java       |   0
 .../transformer/DataFormatTransformeReifier.java   |   0
 .../transformer/EndpointTransformeReifier.java     |   0
 .../reifier/transformer/TransformerReifier.java    |   0
 .../reifier/validator/CustomValidatorReifier.java  |   0
 .../validator/EndpointValidatorReifier.java        |   0
 .../validator/PredicateValidatorReifier.java       |   0
 .../camel/reifier/validator/ValidatorReifier.java  |   0
 .../camel-core}/src/revapi/ignore.json             |   0
 .../camel-core}/src/test/data/bar.xml              |   0
 .../camel-core}/src/test/data/crm.sample.csv       |   0
 .../src/test/data/file-dataset-test.txt            |   0
 .../camel-core}/src/test/data/foo.xml              |   0
 .../camel-core}/src/test/data/message1.xml         |   0
 .../camel-core}/src/test/data/message2.xml         |   0
 .../camel-core}/src/test/data/staff.xml            |   0
 .../camel-core}/src/test/data/terminate.xml        |   0
 .../camel-core}/src/test/data/xml_with_entity.xml  |   0
 .../org/apache/camel/BodyAndHeaderConvertTest.java |   0
 .../java/org/apache/camel/CamelExceptionsTest.java |   0
 .../java/org/apache/camel/ContextTestSupport.java  |   0
 .../java/org/apache/camel/ExchangePatternTest.java |   0
 .../java/org/apache/camel/ExchangeTestSupport.java |   0
 .../org/apache/camel/InjectorDefaultsTest.java     |   0
 .../java/org/apache/camel/LanguageTestSupport.java |   0
 .../java/org/apache/camel/LoggingLevelTest.java    |   0
 .../test/java/org/apache/camel/MyBarSingleton.java |   0
 .../src/test/java/org/apache/camel/MyFoo.java      |   0
 .../org/apache/camel/SuspendableServiceTest.java   |   0
 .../test/java/org/apache/camel/TestSupport.java    |   0
 .../org/apache/camel/TestSupportJmxCleanup.java    |   0
 .../org/apache/camel/TestSupportNodeIdFactory.java |   0
 .../apache/camel/ThreadPoolRejectedPolicyTest.java |   0
 .../camel/builder/AddRoutesAtRuntimeTest.java      |   0
 .../apache/camel/builder/AttributedQNameTest.java  |   0
 .../camel/builder/BuilderWithScopesTest.java       |   0
 .../camel/builder/ContextErrorHandlerTest.java     |   0
 .../camel/builder/ErrorHandlerBuilderRefTest.java  |   0
 .../org/apache/camel/builder/ErrorHandlerTest.java |   0
 .../apache/camel/builder/ExceptionBuilderTest.java |   0
 .../ExceptionBuilderWithHandledExceptionTest.java  |   0
 .../apache/camel/builder/ExchangeBuilderTest.java  |   0
 .../camel/builder/ExpressionBuilderTest.java       |   0
 .../builder/ExpressionClauseSupplierTest.java      |   0
 .../apache/camel/builder/ExpressionClauseTest.java |   0
 .../camel/builder/ExpressionFunctionTest.java      |   0
 .../camel/builder/FluentProducerTemplateTest.java  |   0
 .../camel/builder/MyInterceptorProcessor.java      |   0
 .../java/org/apache/camel/builder/MyProcessor.java |   0
 .../camel/builder/NotifyBuilderFromRouteTest.java  |   0
 .../apache/camel/builder/NotifyBuilderTest.java    |   0
 .../builder/NotifyBuilderWhenDoneByIndexTest.java  |   0
 .../builder/PredicateBinaryCoerceRouteTest.java    |   0
 .../builder/PredicateBinaryCoerceTypeTest.java     |   0
 .../builder/PredicateBuilderConcurrentTest.java    |   0
 .../apache/camel/builder/PredicateBuilderTest.java |   0
 .../ProxyBuilderSkipJavaLangObjectMethodsTest.java |   0
 .../org/apache/camel/builder/ProxyBuilderTest.java |   0
 .../camel/builder/RecordableInputStreamTest.java   |   0
 .../apache/camel/builder/RecordableReaderTest.java |   0
 .../RouteBuilderAddRoutesOnlyInterceptTest.java    |   0
 .../camel/builder/RouteBuilderAddRoutesTest.java   |   0
 .../org/apache/camel/builder/RouteBuilderTest.java |   0
 .../apache/camel/builder/SimpleBuilderTest.java    |   0
 .../camel/builder/ThreadPoolBuilderTest.java       |   0
 .../camel/builder/TransformerBuilderTest.java      |   0
 .../org/apache/camel/builder/ValueBuilderTest.java |   0
 .../XMLTokenExpressionIteratorCharsetTest.java     |   0
 .../XMLTokenExpressionIteratorGroupingTest.java    |   0
 .../XMLTokenExpressionIteratorInvalidXMLTest.java  |   0
 .../builder/XMLTokenExpressionIteratorTest.java    |   0
 .../builder/xml/DefaultNamespaceContextTest.java   |   0
 .../builder/xml/ExtractXPathWithNamespaceTest.java |   0
 .../camel/builder/xml/NodeListToDocumentTest.java  |   0
 .../builder/xml/XPathContentBasedRouterTest.java   |   0
 .../apache/camel/builder/xml/XPathFeatureTest.java |   0
 .../camel/builder/xml/XPathFunctionsTest.java      |   0
 .../XPathHeaderNameResultTypeAndNamespaceTest.java |   0
 .../camel/builder/xml/XPathHeaderNameTest.java     |   0
 .../apache/camel/builder/xml/XPathHeaderTest.java  |   0
 .../apache/camel/builder/xml/XPathMockTest.java    |   0
 .../builder/xml/XPathNamespaceResultTypeTest.java  |   0
 .../camel/builder/xml/XPathNamespaceTest.java      |   0
 .../builder/xml/XPathNestedNamespaceTest.java      |   0
 .../org/apache/camel/builder/xml/XPathTest.java    |   0
 .../camel/builder/xml/XPathTransformRouteTest.java |   0
 .../camel/builder/xml/XPathTransformTest.java      |   0
 .../xml/XPathWithNamespacesFromDomTest.java        |   0
 .../apache/camel/builder/xml/XsltBuilderTest.java  |   0
 .../camel/builder/xml/XsltOutputFileTest.java      |   0
 .../org/apache/camel/builder/xml/XsltTest.java     |   0
 .../camel/builder/xml/XsltUriResolverTest.java     |   0
 .../camel/component/ComponentDiscoveryTest.java    |   0
 .../apache/camel/component/bar/BarComponent.java   |   0
 .../apache/camel/component/bar/BarConstants.java   |   0
 .../apache/camel/component/bar/BarEndpoint.java    |   0
 .../apache/camel/component/bar/BarProducer.java    |   0
 .../camel/component/bar/BarSendDynamicAware.java   |   0
 ...AmbiguousMethodCallExceptionSimplifiedTest.java |   0
 .../component/bean/BeanByteArrayBodyTest.java      |   0
 ...seMethodWithMatchingTypeAndSkipSettersTest.java |   0
 .../bean/BeanComponentMissingParenthesisTest.java  |   0
 .../camel/component/bean/BeanConcurrentTest.java   |   0
 .../camel/component/bean/BeanEndpointTest.java     |   0
 .../BeanExchangeAsReturnTypeNotAllowedTest.java    |   0
 .../component/bean/BeanExcludedMethodTest.java     |   0
 .../bean/BeanExplicitMethodAmbiguousTest.java      |   0
 .../component/bean/BeanExplicitMethodTest.java     |   0
 .../bean/BeanExpressionConcurrentTest.java         |   0
 .../bean/BeanHandlerMethodPredicateTest.java       |   0
 .../component/bean/BeanHandlerMethodTest.java      |   0
 .../component/bean/BeanImplicitMethodTest.java     |   0
 .../camel/component/bean/BeanInPipelineTest.java   |   0
 .../bean/BeanInfoAMoreComplexOverloadedTest.java   |   0
 .../component/bean/BeanInfoInheritanceTest.java    |   0
 .../component/bean/BeanInfoOverloadedTest.java     |   0
 .../BeanInfoOverloadedWithSubTypeParamTest.java    |   0
 .../component/bean/BeanInfoSelectMethodTest.java   |   0
 .../apache/camel/component/bean/BeanInfoTest.java  |   0
 .../bean/BeanInfoWithBridgedMethodTest.java        |   0
 .../bean/BeanInvocationSerializeTest.java          |   0
 .../camel/component/bean/BeanInvokeAsyncTest.java  |   0
 .../BeanInvokeSimpleOgnlToStringMethodTest.java    |   0
 .../bean/BeanInvokeSingleMethodNoBodyTest.java     |   0
 .../camel/component/bean/BeanInvokeStaticTest.java |   0
 .../camel/component/bean/BeanInvokeTest.java       |   0
 .../bean/BeanInvokeToStringMethodTest.java         |   0
 .../component/bean/BeanInvokeWithNullBodyTest.java |   0
 .../camel/component/bean/BeanLifecycleTest.java    |   0
 .../bean/BeanLookupUsingJndiRegistryIssueTest.java |   0
 .../camel/component/bean/BeanMapPutTest.java       |   0
 .../camel/component/bean/BeanMethodBeanTest.java   |   0
 .../bean/BeanMethodNameHeaderIssueTest.java        |   0
 .../bean/BeanMethodValueWithCommaTest.java         |   0
 .../bean/BeanMethodValueWithExchangeTest.java      |   0
 ...rameterAndNoMethodWithNoParameterIssueTest.java |   0
 .../component/bean/BeanMethodWithExchangeTest.java |   0
 .../bean/BeanMethodWithStringParameterTest.java    |   0
 .../camel/component/bean/BeanNoCacheTest.java      |   0
 .../bean/BeanNoTypeConvertionPossibleTest.java     |   0
 ...BeanNoTypeConvertionPossibleWhenHeaderTest.java |   0
 .../BeanOgnlBodyMethodReturnNullValueTest.java     |   0
 .../component/bean/BeanOgnlPerformanceTest.java    |   0
 .../component/bean/BeanOnglStaticMethodTest.java   |   0
 .../bean/BeanOverloadedCovariantMethodTest.java    |   0
 .../bean/BeanOverloadedMethodFQNTest.java          |   0
 .../BeanOverloadedMethodParameterValueTest.java    |   0
 .../component/bean/BeanOverloadedMethodTest.java   |   0
 .../bean/BeanOverloadsWithAssignableParamTest.java |   0
 .../BeanParameterBindingStreamCachingTest.java     |   0
 .../component/bean/BeanParameterInfoTest.java      |   0
 .../bean/BeanParameterInvalidSyntaxTest.java       |   0
 .../bean/BeanParameterInvalidValueTest.java        |   0
 .../BeanParameterMethodCallThreeBodyOgnlTest.java  |   0
 .../bean/BeanParameterNoBeanBindingTest.java       |   0
 .../bean/BeanParameterThreeBodyOgnlTest.java       |   0
 .../component/bean/BeanParameterValueOgnlTest.java |   0
 .../bean/BeanParameterValueOverloadedTest.java     |   0
 .../component/bean/BeanParameterValueTest.java     |   0
 .../camel/component/bean/BeanPerformanceTest.java  |   0
 .../camel/component/bean/BeanPipelineTest.java     |   0
 .../BeanPrivateClassWithInterfaceMethodTest.java   |   0
 .../component/bean/BeanPropagateHeaderTest.java    |   0
 .../component/bean/BeanProxyNoBindingTest.java     |   0
 .../apache/camel/component/bean/BeanProxyTest.java |   0
 .../component/bean/BeanRefMethodNotFoundTest.java  |   0
 .../camel/component/bean/BeanRefNoCacheTest.java   |   0
 .../camel/component/bean/BeanRefNotFoundTest.java  |   0
 .../camel/component/bean/BeanRegistryBeanTest.java |   0
 .../bean/BeanReturnCallableReturnNullTest.java     |   0
 .../component/bean/BeanReturnCallableTest.java     |   0
 .../camel/component/bean/BeanReturnNullTest.java   |   0
 .../bean/BeanWithAnnotationAndExchangeTest.java    |   0
 .../bean/BeanWithAnnotationInheritedTest.java      |   0
 .../bean/BeanWithAttachmentAnnotationTest.java     |   0
 .../BeanWithExchangeExceptionAnnotationTest.java   |   0
 ...ngeExceptionAnnotationWrappedExceptionTest.java |   0
 .../BeanWithExpressionInjectionPredicateTest.java  |   0
 .../bean/BeanWithExpressionInjectionTest.java      |   0
 .../component/bean/BeanWithHeaderAnnotation.java   |   0
 .../camel/component/bean/BeanWithHeaderTest.java   |   0
 .../bean/BeanWithHeadersAndBodyInject2Test.java    |   0
 .../bean/BeanWithHeadersAndBodyInject3Test.java    |   0
 .../bean/BeanWithHeadersAndBodyInjectionTest.java  |   0
 .../bean/BeanWithInputStreamBodyTest.java          |   0
 .../component/bean/BeanWithMethodHeaderTest.java   |   0
 ...thPropertiesAndHeadersAndBodyInjectionTest.java |   0
 .../BeanWithPropertiesAndHeadersInjectionTest.java |   0
 ...BeanWithXPathInjectionUsingHeaderValueTest.java |   0
 .../BeanWithXPathInjectionUsingResultTypeTest.java |   0
 .../BodyAnnotationToDisambiguateMethodsTest.java   |   0
 .../apache/camel/component/bean/CamelCustomer.java |   0
 .../bean/CamelSimpleExpressionPerfTestRunner.java  |   0
 .../ClassComponentInvalidConfigurationTest.java    |   0
 .../camel/component/bean/ClassComponentTest.java   |   0
 ...entWithPropertiesLookupSetFromEndpointTest.java |   0
 ...ComponentWithPropertiesSetFromEndpointTest.java |   0
 .../bean/CustomParameterMappingStrategyTest.java   |   0
 .../bean/DefaultParameterMappingStrategyTest.java  |   0
 ...ressionAnnotationToDisambiguateMethodsTest.java |   0
 .../bean/FileBeanParameterBindingTest.java         |   0
 .../bean/MethodCallBeanRefMethodNotFoundTest.java  |   0
 .../bean/MethodCallBeanRefNotFoundTest.java        |   0
 .../bean/MethodCallMissingParenthesisTest.java     |   0
 .../bean/MethodCallRefOrBeanPrefixTest.java        |   0
 .../component/bean/MethodCallStaticMethodTest.java |   0
 .../MethodNotFoundExceptionSimplifiedTest.java     |   0
 .../component/bean/MyApplicationException.java     |   0
 .../camel/component/bean/MyAuditService.java       |   0
 .../component/bean/MyAuditServiceProxyTest.java    |   0
 .../apache/camel/component/bean/MyContactBean.java |   0
 .../apache/camel/component/bean/MyCurrency.java    |   0
 .../camel/component/bean/MyCurrencyBean.java       |   0
 .../camel/component/bean/MyCurrencyBeanTest.java   |   0
 .../camel/component/bean/MyCustomException.java    |   0
 .../apache/camel/component/bean/MyDummyBean.java   |   0
 .../org/apache/camel/component/bean/MyFooBean.java |   0
 .../component/bean/MyHandlerPredicateBean.java     |   0
 .../camel/component/bean/MyOtherFooBean.java       |   0
 .../apache/camel/component/bean/MyPrefixBean.java  |   0
 .../org/apache/camel/component/bean/MyRequest.java |   0
 .../apache/camel/component/bean/MyResponse.java    |   0
 .../org/apache/camel/component/bean/MyService.java |   0
 .../camel/component/bean/MyServiceProxyTest.java   |   0
 .../component/bean/MySingleMethodNoBodyBean.java   |   0
 .../apache/camel/component/bean/MyStaticClass.java |   0
 .../camel/component/bean/NewInstanceTest.java      |   0
 .../apache/camel/component/bean/OrderService.java  |   0
 .../camel/component/bean/OrderServiceBean.java     |   0
 .../camel/component/bean/PredicateAsBeanTest.java  |   0
 .../bean/ProxyReturnFutureExceptionTest.java       |   0
 .../component/bean/ProxyReturnFutureListTest.java  |   0
 .../component/bean/ProxyReturnFutureTest.java      |   0
 .../component/bean/RouteMethodCallStaticTest.java  |   0
 .../SimpleLanguageBeanBodyParenthesisTest.java     |   0
 ...nguageBeanFunctionMethodValueWithCommaTest.java |   0
 ...BeanFunctionMethodValueWithParenthesisTest.java |   0
 .../component/bean/issues/AbstractTransformer.java |   0
 .../camel/component/bean/issues/BaseClass.java     |   0
 .../component/bean/issues/BaseFoundationClass.java |   0
 .../camel/component/bean/issues/BaseSomething.java |   0
 .../bean/issues/BeanAbstractMethodIssueTest.java   |   0
 .../issues/BeanInfoSingleMethodServiceTest.java    |   0
 .../BeanParameterBestTypeMatchIssueTest.java       |   0
 .../bean/issues/BeanRouteToDerivedClassTest.java   |   0
 .../issues/BeanVsProcessorPerformanceTest.java     |   0
 .../apache/camel/component/bean/issues/ClassA.java |   0
 .../apache/camel/component/bean/issues/ClassB.java |   0
 ...efaultMethodCalledFromSimpleExpressionTest.java |   0
 .../camel/component/bean/issues/DerivedClass.java  |   0
 .../issues/FilterBeanLanguageNonRegistryTest.java  |   0
 .../bean/issues/FilterBeanNonRegistryTest.java     |   0
 .../bean/issues/FilterBeanRegistryTest.java        |   0
 .../component/bean/issues/FilterPojoIssueTest.java |   0
 .../camel/component/bean/issues/MyLittleBean.java  |   0
 .../component/bean/issues/MyLittleProcessor.java   |   0
 .../camel/component/bean/issues/MyMessage.java     |   0
 .../component/bean/issues/MyMessageListener.java   |   0
 .../bean/issues/MyMessageToProcessorConverter.java |   0
 .../component/bean/issues/PrivateClasses.java      |   0
 .../camel/component/bean/issues/RealSomething.java |   0
 .../bean/issues/SingleMethodAbstractService.java   |   0
 .../component/bean/issues/SingleMethodService.java |   0
 .../bean/issues/SingleMethodServiceImpl.java       |   0
 .../camel/component/bean/issues/Transformer.java   |   0
 .../component/bean/issues/TransformerImpl.java     |   0
 .../bean/issues/TransformerIssueTest.java          |   0
 .../camel/component/bean/pojomessage/Person.java   |   0
 .../pojomessage/PojoProxyHelperOneWayTest.java     |   0
 .../PojoProxyHelperRequestReplyTest.java           |   0
 .../camel/component/browse/BrowseEndpointTest.java |   0
 .../component/browse/BrowseRouteConsumeTest.java   |   0
 .../camel/component/browse/BrowseRouteTest.java    |   0
 .../apache/camel/component/browse/BrowseTest.java  |   0
 .../ControlBusLanguageSimpleStartRouteTest.java    |   0
 .../controlbus/ControlBusRestartRouteTest.java     |   0
 .../controlbus/ControlBusStartRouteAsyncTest.java  |   0
 .../controlbus/ControlBusStartRouteTest.java       |   0
 .../DataFormatEndpointSerializationTest.java       |   0
 .../dataformat/DataFormatEndpointStringTest.java   |   0
 .../camel/component/dataset/BigDataSetTest.java    |   0
 .../camel/component/dataset/CustomDataSetTest.java |   0
 .../component/dataset/DataSetConsumerTest.java     |   0
 .../component/dataset/DataSetEndpointTest.java     |   0
 .../component/dataset/DataSetPreloadTest.java      |   0
 .../component/dataset/DataSetProducerTest.java     |   0
 .../camel/component/dataset/DataSetSedaTest.java   |   0
 .../camel/component/dataset/DataSetTest.java       |   0
 .../component/dataset/FileDataSetConsumerTest.java |   0
 .../dataset/FileDataSetConsumerWithSplitTest.java  |   0
 .../component/dataset/FileDataSetProducerTest.java |   0
 .../dataset/FileDataSetProducerWithSplitTest.java  |   0
 .../component/dataset/ListDataSetConsumerTest.java |   0
 .../component/dataset/ListDataSetProducerTest.java |   0
 .../direct/DirectEndpointRouteInlinedTest.java     |   0
 .../camel/component/direct/DirectEndpointTest.java |   0
 .../component/direct/DirectNoConsumerTest.java     |   0
 .../direct/DirectNoMultipleConsumersTest.java      |   0
 .../camel/component/direct/DirectNoToTypeTest.java |   0
 .../direct/DirectProducerBlockingTest.java         |   0
 .../camel/component/direct/DirectQueueTest.java    |   0
 .../camel/component/direct/DirectRouteTest.java    |   0
 .../direct/DirectShouldUseSameThreadTest.java      |   0
 .../SendToNonExistingDirectEndpointTest.java       |   0
 ...SendingToAlotOfDifferentDirectEndpointTest.java |   0
 .../direct/TwoCamelContextDirectEndpointTest.java  |   0
 .../directvm/AbstractDirectVmTestSupport.java      |   0
 .../directvm/DirectVmConsumerExpressionTest.java   |   0
 .../directvm/DirectVmHeaderFilterStrategyTest.java |   0
 .../component/directvm/DirectVmNoConsumerTest.java |   0
 ...DirectVmNoPropertyPropagationComponentTest.java |   0
 .../DirectVmNoPropertyPropagationTest.java         |   0
 .../directvm/DirectVmProducerBlockingTest.java     |   0
 .../directvm/DirectVmShouldUseSameThreadTest.java  |   0
 .../DirectVmTwoCamelContextAdviceWithTest.java     |   0
 ...rectVmTwoCamelContextDuplicateConsumerTest.java |   0
 .../directvm/DirectVmTwoCamelContextTest.java      |   0
 .../extension/verifier/ComponentVerifierTest.java  |   0
 .../file/AntPathMatcherGenericFileFilterTest.java  |   0
 .../camel/component/file/BeanToFileTest.java       |   0
 .../file/ConsumerTemplateFileShutdownTest.java     |   0
 .../component/file/DirectoryCreateIssueTest.java   |   0
 .../file/FileAbsoluteAndRelativeConsumerTest.java  |   0
 .../component/file/FileAbsolutePathIssueTest.java  |   0
 .../file/FileBatchConsumerMemoryLeakTest.java      |   0
 .../file/FileBeginFailureOneTimeTest.java          |   0
 .../component/file/FileBrowsableEndpointTest.java  |   0
 .../FileConcurrentWriteAppendSameFileTest.java     |   0
 .../camel/component/file/FileConfigureTest.java    |   0
 .../FileConsumeAlterFileNameHeaderIssueTest.java   |   0
 .../file/FileConsumeBackoffMultiplierTest.java     |   0
 .../component/file/FileConsumeCharsetTest.java     |   0
 .../file/FileConsumeDoneFileIssueTest.java         |   0
 ...eConsumeDynamicDoneFileNameWithTwoDotsTest.java |   0
 .../file/FileConsumeFilesAndDeleteTest.java        |   0
 .../file/FileConsumeMaxMessagesPerPollTest.java    |   0
 .../file/FileConsumeMoveRelativeNameTest.java      |   0
 .../file/FileConsumeMultipleDirectoriesTest.java   |   0
 .../file/FileConsumeNoopIdempotentAutoTest.java    |   0
 .../FileConsumeNoopIdempotentDisabledTest.java     |   0
 .../file/FileConsumeNoopIdempotentEnabledTest.java |   0
 .../FileConsumeNotEagerMaxMessagesPerPollTest.java |   0
 .../file/FileConsumePollEnrichFileTest.java        |   0
 ...ileConsumePollEnrichFileUsingProcessorTest.java |   0
 .../file/FileConsumeRootDirManualTest.java         |   0
 .../file/FileConsumeRunLoggingLevelTest.java       |   0
 ...ileConsumeSimpleAbsoluteMoveToAbsoluteTest.java |   0
 ...ileConsumeSimpleAbsoluteMoveToRelativeTest.java |   0
 ...meSimpleDynamicDoneFileNameWithTwoDotsTest.java |   0
 ...ileConsumeSimpleRelativeMoveToAbsoluteTest.java |   0
 ...ileConsumeSimpleRelativeMoveToRelativeTest.java |   0
 .../file/FileConsumeSingleDirectoryOnlyTest.java   |   0
 .../component/file/FileConsumeTemplateTest.java    |   0
 .../file/FileConsumeWithDollarInPathTest.java      |   0
 .../FileConsumerAbsolutePathDefaultMoveTest.java   |   0
 .../file/FileConsumerAbsolutePathTest.java         |   0
 ...leConsumerAbsolutePathWithAbsoluteMoveTest.java |   0
 ...leConsumerAbsolutePathWithRelativeMoveTest.java |   0
 ...ileConsumerAbsoluteRootPathDefaultMoveTest.java |   0
 .../file/FileConsumerAutoCreateDirectoryTest.java  |   0
 .../component/file/FileConsumerBatchTest.java      |   0
 ...BeginAndCommitExpressionRenameStrategyTest.java |   0
 ...leConsumerBeginAndCommitRenameStrategyTest.java |   0
 ...eConsumerBeginExpressionRenameStrategyTest.java |   0
 .../file/FileConsumerBeginRenameStrategyTest.java  |   0
 ...ileConsumerBridgeRouteExceptionHandlerTest.java |   0
 ...nsumerCommitRenameAbsolutePathStrategyTest.java |   0
 .../file/FileConsumerCommitRenameStrategyTest.java |   0
 .../file/FileConsumerConsumedFileNameTest.java     |   0
 .../FileConsumerCustomExceptionHandlerTest.java    |   0
 .../file/FileConsumerCustomSchedulerTest.java      |   0
 .../file/FileConsumerDeleteAndFailureTest.java     |   0
 .../file/FileConsumerDeleteAndMoveFailedTest.java  |   0
 .../file/FileConsumerDirectoryFilterTest.java      |   0
 .../file/FileConsumerDirectoryNotMatchedTest.java  |   0
 .../file/FileConsumerExcludeNameTest.java          |   0
 .../file/FileConsumerExtendedAttributesTest.java   |   0
 .../file/FileConsumerFailureHandledTest.java       |   0
 .../file/FileConsumerFileExpressionTest.java       |   0
 ...leConsumerFileExpressionThrowExceptionTest.java |   0
 .../component/file/FileConsumerFileFilterTest.java |   0
 .../file/FileConsumerFilterDirectoryTest.java      |   0
 .../component/file/FileConsumerFilterFileTest.java |   0
 ...FileConsumerIdempotentKeyChangedIssue2Test.java |   0
 .../FileConsumerIdempotentKeyChangedIssueTest.java |   0
 .../FileConsumerIdempotentKeyNameAndSizeTest.java  |   0
 .../file/FileConsumerIdempotentKeyTest.java        |   0
 ...leConsumerIdempotentOnExceptionHandledTest.java |   0
 .../file/FileConsumerIdempotentRefTest.java        |   0
 .../component/file/FileConsumerIdempotentTest.java |   0
 .../file/FileConsumerIdleMessageTest.java          |   0
 .../FileConsumerIncludeAndExcludeNameTest.java     |   0
 .../file/FileConsumerIncludeNameTest.java          |   0
 .../file/FileConsumerInterceptEmptyFileTest.java   |   0
 .../file/FileConsumerMoveAndMoveFailureTest.java   |   0
 .../file/FileConsumerMoveExpressionTest.java       |   0
 .../FileConsumerMoveFailureOnCompletionTest.java   |   0
 .../file/FileConsumerMoveFailureTest.java          |   0
 .../camel/component/file/FileConsumerNoopTest.java |   0
 .../file/FileConsumerPathWithAmpersandTest.java    |   0
 .../file/FileConsumerPollStrategyNotBeginTest.java |   0
 ...FileConsumerPollStrategyPolledMessagesTest.java |   0
 ...umerPollStrategyRollbackThrowExceptionTest.java |   0
 ...FileConsumerPollStrategyStopOnRollbackTest.java |   0
 .../file/FileConsumerPollStrategyTest.java         |   0
 ...rPreMoveCopyAndDeleteOnRenameFailFalseTest.java |   0
 .../file/FileConsumerPreMoveDeleteTest.java        |   0
 .../file/FileConsumerPreMoveIssueTest.java         |   0
 .../file/FileConsumerPreMoveLastModifiedTest.java  |   0
 .../file/FileConsumerPreMoveNoopTest.java          |   0
 .../component/file/FileConsumerPreMoveTest.java    |   0
 ...ileConsumerPreMoveWithProbeContentTypeTest.java |   0
 .../file/FileConsumerProducerRouteTest.java        |   0
 .../file/FileConsumerRelativeFileNameTest.java     |   0
 .../file/FileConsumerRestartNotLeakThreadTest.java |   0
 .../FileConsumerSharedThreadPollStopRouteTest.java |   0
 .../file/FileConsumerSharedThreadPollTest.java     |   0
 .../file/FileConsumerSkipDotFilesTest.java         |   0
 .../file/FileConsumerSpringSchedulerTest.java      |   0
 .../file/FileConsumerSuspendAndResumeTest.java     |   0
 .../component/file/FileConsumerSuspendTest.java    |   0
 .../component/file/FileConsumerTemplateTest.java   |   0
 .../FileConsumerThreadsInProgressIssueTest.java    |   0
 .../component/file/FileContentBasedRouterTest.java |   0
 .../component/file/FileConvertBodyToUTF8Test.java  |   0
 .../file/FileEagerDeleteTargetFileTest.java        |   0
 .../file/FileExclusiveReadManuelTest.java          |   0
 .../file/FileExclusiveReadNoneStrategyTest.java    |   0
 .../file/FileHeaderFileNameProducedTest.java       |   0
 .../file/FileIdempotentReadSameFileAgainTest.java  |   0
 .../file/FileInvalidStartingPathTest.java          |   0
 .../component/file/FileKeepLastModifiedTest.java   |   0
 .../camel/component/file/FileLanguageCBRTest.java  |   0
 .../camel/component/file/FileMEPInOutTest.java     |   0
 .../file/FileMarkerFileDeleteOldLockFilesTest.java |   0
 ...eMarkerFileRecursiveDeleteOldLockFilesTest.java |   0
 ...erFileRecursiveDoNotDeleteOldLockFilesTest.java |   0
 ...cursiveFilterDeleteOldLockFilesIncludeTest.java |   0
 ...rFileRecursiveFilterDeleteOldLockFilesTest.java |   0
 .../file/FileMoveAndMoveFailedIssueTest.java       |   0
 .../FileMoveErrorOnExceptionNotHandledTest.java    |   0
 .../component/file/FileMulticastDeleteTest.java    |   0
 .../camel/component/file/FileNoOpLockFileTest.java |   0
 .../component/file/FilePollEnrichNoWaitTest.java   |   0
 .../camel/component/file/FilePollEnrichTest.java   |   0
 .../component/file/FilePollingConsumerTest.java    |   0
 .../component/file/FileProduceAppendTest.java      |   0
 .../file/FileProduceGeneratedFileNameTest.java     |   0
 .../file/FileProduceOverruleExpressionTest.java    |   0
 .../file/FileProduceOverruleOnlyOnceTest.java      |   0
 .../component/file/FileProduceOverruleTest.java    |   0
 .../file/FileProduceTempFileNameTest.java          |   0
 .../component/file/FileProduceTempPrefixTest.java  |   0
 ...ProducerAllowNullBodyFileAlreadyExistsTest.java |   0
 .../file/FileProducerAllowNullBodyTest.java        |   0
 .../file/FileProducerCharsetUTFOptimizedTest.java  |   0
 .../FileProducerCharsetUTFtoISOConfiguredTest.java |   0
 ...leProducerCharsetUTFtoISOConvertBodyToTest.java |   0
 .../file/FileProducerCharsetUTFtoISOTest.java      |   0
 .../file/FileProducerCharsetUTFtoUTFTest.java      |   0
 .../file/FileProducerChmodOptionTest.java          |   0
 .../file/FileProducerDirectoryChmodOptionTest.java |   0
 .../component/file/FileProducerExpressionTest.java |   0
 .../file/FileProducerFileBodyGetsMoved.java        |   0
 ...ileProducerFileExistAppendNoFileBeforeTest.java |   0
 .../file/FileProducerFileExistAppendTest.java      |   0
 .../file/FileProducerFileExistFailTest.java        |   0
 .../file/FileProducerFileExistIgnoreTest.java      |   0
 ...eProducerFileExistOverrideNoFileBeforeTest.java |   0
 .../file/FileProducerFileExistOverrideTest.java    |   0
 .../file/FileProducerFileExistTryRenameTest.java   |   0
 .../file/FileProducerFilenameConstantTest.java     |   0
 .../FileProducerJailStartingDirectoryTest.java     |   0
 .../file/FileProducerMoveExistingStrategyTest.java |   0
 .../file/FileProducerMoveExistingTest.java         |   0
 .../file/FileProducerNoForcedWritesTest.java       |   0
 .../file/FileProducerRenameUsingCopyTest.java      |   0
 .../file/FileProducerTempFileExistsIssueTest.java  |   0
 .../component/file/FileRecursiveDepthTest.java     |   0
 .../component/file/FileRecursiveNoopTest.java      |   0
 .../file/FileRenameFileOnCommitIssueTest.java      |   0
 .../FileRenameReadLockMustUseMarkerFileTest.java   |   0
 .../file/FileRouteOnDosWithNoVolTest.java          |   0
 .../component/file/FileSortByExpressionTest.java   |   0
 .../file/FileSortByIgnoreCaseExpressionTest.java   |   0
 .../file/FileSortByNestedExpressionTest.java       |   0
 .../camel/component/file/FileSorterRefTest.java    |   0
 .../camel/component/file/FileSplitInSplitTest.java |   0
 .../component/file/FileToFileNioLowBufferTest.java |   0
 .../component/file/FileToFileWithFlattenTest.java  |   0
 .../camel/component/file/FileURLDecodingTest.java  |   0
 .../file/FilerConsumerDoneFileNameDeleteTest.java  |   0
 .../file/FilerConsumerDoneFileNamePrefixTest.java  |   0
 .../FilerConsumerDoneFileNameSimplePrefixTest.java |   0
 .../file/FilerConsumerDoneFileNameSuffixTest.java  |   0
 .../file/FilerConsumerDoneFileNameTest.java        |   0
 .../file/FilerConsumerDoneFileNoopTest.java        |   0
 .../file/FilerConsumerDualDoneFileNameTest.java    |   0
 .../FilerConsumerMoveFailedDoneFileNameTest.java   |   0
 .../file/FilerConsumerPreMoveDoneFileNameTest.java |   0
 .../file/FilerConsumerRetryDoneFileNameTest.java   |   0
 .../FilerConsumerShouldSkipDoneFilePrefixTest.java |   0
 .../FilerConsumerShouldSkipDoneFileSuffixTest.java |   0
 .../file/FilerConsumerShouldSkipDoneFileTest.java  |   0
 .../component/file/FilerProducerAbsoluteTest.java  |   0
 .../file/FilerProducerDoneFileNameRouteTest.java   |   0
 .../file/FilerProducerDoneFileNameTest.java        |   0
 .../component/file/FilerProducerFileNamesTest.java |   0
 .../FromFileDoNotDeleteFileIfProcessFailsTest.java |   0
 .../FromFileDoNotMoveFileIfProcessFailsTest.java   |   0
 .../file/FromFileMoveDoneCustomHeaderTest.java     |   0
 .../file/FromFileMoveFileIfProcessFailsTest.java   |   0
 .../file/FromFileMulticastToFilesTest.java         |   0
 .../file/FromFilePollThirdTimeOkTest.java          |   0
 .../component/file/GenericFileConverterTest.java   |   0
 .../component/file/GenericFileMessageTest.java     |   0
 ...kerFileExclusiveReadLockStrategyUnlockTest.java |   0
 .../camel/component/file/MyFileTypeDetector.java   |   0
 .../camel/component/file/NewFileConsumeTest.java   |   0
 .../camel/component/file/NewFileConsumerTest.java  |   0
 .../camel/component/file/NewFileProduceTest.java   |   0
 .../camel/component/file/ToFileRouteTest.java      |   0
 .../camel/component/file/XPathToFileTest.java      |   0
 .../FileLockClusteredRoutePolicyFactoryTest.java   |   0
 .../cluster/FileLockClusteredRoutePolicyTest.java  |   0
 .../FileChangedReadLockLoggingLevelTest.java       |   0
 .../FileChangedReadLockMarkerFileFalseTest.java    |   0
 .../FileChangedReadLockMinAgeShortCircuitTest.java |   0
 .../strategy/FileChangedReadLockMinAgeTest.java    |   0
 .../file/strategy/FileChangedReadLockTest.java     |   0
 .../strategy/FileChangedReadLockTimeoutTest.java   |   0
 .../FileChangedReadLockZeroTimeoutTest.java        |   0
 .../FileChangedZeroLengthReadLockTest.java         |   0
 .../FileIdempotentChangedReadLockTest.java         |   0
 .../FileIdempotentReadLockDelayedAsyncTest.java    |   0
 .../FileIdempotentReadLockDelayedTest.java         |   0
 .../file/strategy/FileIdempotentReadLockTest.java  |   0
 .../strategy/FileIdempotentRenameReadLockTest.java |   0
 .../GenericFileDeleteProcessStrategyTest.java      |   0
 .../MarkerFileExclusiveReadLockStrategyTest.java   |   0
 .../file/stress/FileAsyncStressFileDropper.java    |   0
 .../file/stress/FileAsyncStressManually.java       |   0
 .../FileAsyncStressReadLockLockFileTest.java       |   0
 .../stress/FileAsyncStressReadLockNoneTest.java    |   0
 .../stress/FileAsyncStressReadLockRenameTest.java  |   0
 .../component/file/stress/FileAsyncStressTest.java |   0
 .../file/stress/FileConsumerPollManyFilesTest.java |   0
 .../FileProducerAppendManyMessagesFastTest.java    |   0
 .../stress/FileProducerAppendManyMessagesTest.java |   0
 .../language/LanguageCacheScriptTest.java          |   0
 .../language/LanguageEndpointScriptRouteTest.java  |   0
 .../language/LanguageHeaderRouteTest.java          |   0
 .../LanguageLoadScriptFromClasspathHeaderTest.java |   0
 .../LanguageLoadScriptFromClasspathTest.java       |   0
 .../LanguageLoadScriptFromFileUpdateTest.java      |   0
 .../language/LanguageNoCacheScriptTest.java        |   0
 ...guageResourceLoadConstantFromClasspathTest.java |   0
 ...anguageResourceLoadScriptFromClasspathTest.java |   0
 .../language/LanguageRouteConvertBodyTest.java     |   0
 .../language/LanguageRouteNoTransformTest.java     |   0
 .../component/language/LanguageRouteTest.java      |   0
 ...guageScriptInHeaderRouteTakePrecedenceTest.java |   0
 .../language/LanguageScriptInHeaderRouteTest.java  |   0
 .../language/LanguageScriptRouteTest.java          |   0
 .../component/language/LanguageXPathRouteTest.java |   0
 .../camel/component/log/ConsumingAppender.java     |   0
 .../log/DefaultExchangeFormatterTest.java          |   0
 .../component/log/LogBodyWithNewLineTest.java      |   0
 .../component/log/LogCustomFormatterTest.java      |   0
 .../camel/component/log/LogCustomLoggerTest.java   |   0
 .../component/log/LogEndpointOptionsTest.java      |   0
 .../camel/component/log/LogEndpointTest.java       |   0
 .../camel/component/log/LogInputStreamTest.java    |   0
 .../camel/component/log/LogListenerTest.java       |   0
 .../apache/camel/component/log/LogMaskTest.java    |   0
 .../apache/camel/component/log/LogRouteTest.java   |   0
 .../camel/component/log/ThroughputLoggerTest.java  |   0
 .../camel/component/mock/MockAsBeanTest.java       |   0
 .../component/mock/MockAssertionClauseTest.java    |   0
 .../camel/component/mock/MockEndpointTest.java     |   0
 .../component/mock/MockEndpointTimeClauseTest.java |   0
 .../mock/MockEndpointWithParametersTest.java       |   0
 .../mock/MockExpectedBodiesAsListTest.java         |   0
 .../component/mock/MockPredicateEqualityTest.java  |   0
 .../camel/component/mock/MockPredicateTest.java    |   0
 .../component/mock/MockStreamCachingTest.java      |   0
 .../camel/component/mock/MockThroughtputTest.java  |   0
 .../apache/camel/component/mock/MockXpathTest.java |   0
 .../org/apache/camel/component/mock/TimeTest.java  |   0
 .../java/org/apache/camel/component/pojo/ISay.java |   0
 .../apache/camel/component/pojo/PojoRouteTest.java |   0
 .../apache/camel/component/pojo/SayService.java    |   0
 .../ComponentResolvePropertyPlaceholdersTest.java  |   0
 .../OptionalPropertiesDslInvalidSyntaxTest.java    |   0
 .../properties/OptionalPropertiesDslTest.java      |   0
 ...onentAdviceWithInterceptSendToEndpointTest.java |   0
 ...opertiesComponentConcatenatePropertiesTest.java |   0
 .../PropertiesComponentDefaultFunctionsTest.java   |   0
 .../properties/PropertiesComponentDefaultTest.java |   0
 .../PropertiesComponentDisableDefaultsTest.java    |   0
 ...pertiesComponentEIPChoiceConvertBodyToTest.java |   0
 .../PropertiesComponentEIPChoiceSimpleTest.java    |   0
 .../PropertiesComponentEIPConvertBodyToTest.java   |   0
 .../PropertiesComponentEIPRoutingSlipTest.java     |   0
 .../PropertiesComponentEncodingTest.java           |   0
 .../PropertiesComponentEndpointTest.java           |   0
 .../PropertiesComponentFunctionTest.java           |   0
 .../PropertiesComponentGetOrElseTest.java          |   0
 .../PropertiesComponentInitialPropertiesTest.java  |   0
 .../PropertiesComponentInterceptFromTest.java      |   0
 ...ertiesComponentInterceptSendToEndpointTest.java |   0
 ...pertiesComponentLoadPropertiesFromFileTest.java |   0
 ...ponentLoadPropertiesFromFileTrimValuesTest.java |   0
 ...ertiesComponentLocationWithJvmPropertyTest.java |   0
 ...iesComponentLocationWithTwoJvmPropertyTest.java |   0
 .../PropertiesComponentNestPropertiesTest.java     |   0
 ...ertiesComponentOnExceptionDelayPatternTest.java |   0
 .../PropertiesComponentOnExceptionTest.java        |   0
 ...ropertiesComponentOnlyUseDefaultValuesTest.java |   0
 .../PropertiesComponentOverridePropertiesTest.java |   0
 .../properties/PropertiesComponentRefTest.java     |   0
 .../PropertiesComponentRegistryTest.java           |   0
 .../properties/PropertiesComponentRestartTest.java |   0
 .../PropertiesComponentServiceHostPortTest.java    |   0
 .../PropertiesComponentServiceHostTest.java        |   0
 .../PropertiesComponentServicePortTest.java        |   0
 .../properties/PropertiesComponentServiceTest.java |   0
 .../PropertiesComponentSetHeaderSimpleTest.java    |   0
 .../PropertiesComponentSimpleLanguageTest.java     |   0
 ...rtiesComponentSomethingElseBoundToJndiTest.java |   0
 .../properties/PropertiesComponentTest.java        |   0
 .../PropertiesEnvironmentVariableOverrideTest.java |   0
 .../properties/PropertiesResolverTest.java         |   0
 .../properties/PropertiesRouteFromTest.java        |   0
 .../properties/PropertiesRouteIdTest.java          |   0
 .../camel/component/ref/RefComponentTest.java      |   0
 .../camel/component/ref/RefFileEndpointTest.java   |   0
 .../apache/camel/component/ref/RefInvalidTest.java |   0
 .../component/rest/DummyRestConsumerFactory.java   |   0
 .../component/rest/DummyRestProcessorFactory.java  |   0
 .../camel/component/rest/FromRestApiTest.java      |   0
 .../component/rest/FromRestConfigurationTest.java  |   0
 .../component/rest/FromRestDefaultValueTest.java   |   0
 .../component/rest/FromRestDuplicateTest.java      |   0
 .../rest/FromRestExplicitComponentTest.java        |   0
 .../component/rest/FromRestGetContentTypeTest.java |   0
 .../rest/FromRestGetCorsAllowCredentialsTest.java  |   0
 .../component/rest/FromRestGetCorsCustomTest.java  |   0
 .../camel/component/rest/FromRestGetCorsTest.java  |   0
 .../rest/FromRestGetEmbeddedRouteTest.java         |   0
 .../component/rest/FromRestGetEndPathTest.java     |   0
 .../rest/FromRestGetHttpErrorCodeTest.java         |   0
 .../component/rest/FromRestGetInterceptTest.java   |   0
 .../component/rest/FromRestGetOnExceptionTest.java |   0
 .../component/rest/FromRestGetPolicyTest.java      |   0
 .../rest/FromRestGetRouteOnExceptionTest.java      |   0
 .../camel/component/rest/FromRestGetTest.java      |   0
 .../rest/FromRestIdAndDescriptionTest.java         |   0
 .../component/rest/FromRestUriPrefixTest.java      |   0
 .../camel/component/rest/RestComponentTest.java    |   0
 .../rest/RestComponentVerifierExtensionTest.java   |   0
 .../component/rest/RestComponentVerifierTest.java  |   0
 .../camel/component/rest/RestEndpointTest.java     |   0
 .../rest/RestProducerBindingProcessorTest.java     |   0
 .../camel/component/rest/RestProducerTest.java     |   0
 .../camel/component/saga/SagaComponentTest.java    |   0
 .../scheduler/SchedulerNoPolledMessagesTest.java   |   0
 .../component/scheduler/SchedulerRouteTest.java    |   0
 .../TwoSchedulerConcurrentTasksOneRouteTest.java   |   0
 .../scheduler/TwoSchedulerConcurrentTasksTest.java |   0
 .../component/scheduler/TwoSchedulerTest.java      |   0
 .../seda/DirectRequestReplyAndSedaInOnlyTest.java  |   0
 .../seda/FileSedaShutdownCompleteAllTasksTest.java |   0
 ...meSedaQueueMultipleConsumersDifferenceTest.java |   0
 .../seda/SameSedaQueueSizeAndNoSizeTest.java       |   0
 .../component/seda/SedaAsyncProducerTest.java      |   0
 .../camel/component/seda/SedaAsyncRouteTest.java   |   0
 .../SedaBlockWhenFullInvalidConfigurationTest.java |   0
 .../component/seda/SedaBlockWhenFullTest.java      |   0
 .../camel/component/seda/SedaComplexInOutTest.java |   0
 .../seda/SedaComponentReferenceEndpointTest.java   |   0
 .../seda/SedaConcurrentConsumersNPEIssueTest.java  |   0
 .../seda/SedaConcurrentConsumersTest.java          |   0
 .../camel/component/seda/SedaConcurrentTest.java   |   0
 .../camel/component/seda/SedaConfigureTest.java    |   0
 .../seda/SedaConsumerSuspendResumeTest.java        |   0
 .../seda/SedaDefaultBlockWhenFullTest.java         |   0
 .../seda/SedaDefaultUnboundedQueueSizeTest.java    |   0
 .../seda/SedaDiscardIfNoConsumerTest.java          |   0
 .../camel/component/seda/SedaEndpointTest.java     |   0
 .../apache/camel/component/seda/SedaErrorTest.java |   0
 .../camel/component/seda/SedaFromRouteIdTest.java  |   0
 .../component/seda/SedaInOnlyChainedTest.java      |   0
 .../camel/component/seda/SedaInOnlyTest.java       |   0
 .../component/seda/SedaInOutBigChainedTest.java    |   0
 .../camel/component/seda/SedaInOutChainedTest.java |   0
 .../seda/SedaInOutChainedTimeoutTest.java          |   0
 .../seda/SedaInOutChainedWithOnCompletionTest.java |   0
 .../apache/camel/component/seda/SedaInOutTest.java |   0
 .../SedaInOutWithErrorDeadLetterChannelTest.java   |   0
 .../component/seda/SedaInOutWithErrorTest.java     |   0
 .../component/seda/SedaMultipleConsumersTest.java  |   0
 .../camel/component/seda/SedaNoConsumerTest.java   |   0
 .../component/seda/SedaPurgeWhenStoppingTest.java  |   0
 .../camel/component/seda/SedaQueueFactoryTest.java |   0
 .../apache/camel/component/seda/SedaQueueTest.java |   0
 .../seda/SedaRemoveRouteThenAddAgainTest.java      |   0
 .../apache/camel/component/seda/SedaRouteTest.java |   0
 .../seda/SedaShouldNotUseSameThreadTest.java       |   0
 .../camel/component/seda/SedaSimpleSizeTest.java   |   0
 .../seda/SedaSuspendConsumerStopRouteTest.java     |   0
 .../component/seda/SedaTimeoutDisabledTest.java    |   0
 .../camel/component/seda/SedaTimeoutTest.java      |   0
 .../camel/component/seda/SedaUnitOfWorkTest.java   |   0
 .../seda/SedaWaitForTaskAsPropertyTest.java        |   0
 .../SedaWaitForTaskCompleteOnCompletionTest.java   |   0
 .../seda/SedaWaitForTaskCompleteTest.java          |   0
 .../seda/SedaWaitForTaskIfReplyExpectedTest.java   |   0
 .../seda/SedaWaitForTaskNewerOnCompletionTest.java |   0
 .../component/seda/SedaWaitForTaskNewerTest.java   |   0
 .../camel/component/seda/TracingWithDelayTest.java |   0
 .../camel/component/stub/StubConsumerTest.java     |   0
 .../camel/component/stub/StubInOnlyTest.java       |   0
 .../apache/camel/component/stub/StubInOutTest.java |   0
 .../org/apache/camel/component/stub/StubTest.java  |   0
 .../camel/component/test/TestAnyOrderTest.java     |   0
 .../camel/component/test/TestEndpointTest.java     |   0
 .../camel/component/test/TestFileSplitTest.java    |   0
 .../apache/camel/component/test/TestFileTest.java  |   0
 .../apache/camel/component/test/TestSedaTest.java  |   0
 .../camel/component/timer/TimerAsyncTest.java      |   0
 .../camel/component/timer/TimerDelayTest.java      |   0
 .../camel/component/timer/TimerEndpointTest.java   |   0
 .../camel/component/timer/TimerFiredTimeTest.java  |   0
 .../component/timer/TimerGracefulShutdownTest.java |   0
 .../timer/TimerMultipleConsumerStopRouteTest.java  |   0
 .../component/timer/TimerMultipleConsumerTest.java |   0
 .../camel/component/timer/TimerNameTest.java       |   0
 .../component/timer/TimerNegativeDelayTest.java    |   0
 .../timer/TimerNegativeNoRepeatCountDelayTest.java |   0
 .../timer/TimerReferenceConfigurationTest.java     |   0
 .../component/timer/TimerRepeatCountTest.java      |   0
 .../camel/component/timer/TimerRestartTest.java    |   0
 .../camel/component/timer/TimerRouteTest.java      |   0
 .../component/timer/TimerRouteWithTracerTest.java  |   0
 .../timer/TimerSuspendCamelContextTest.java        |   0
 .../component/timer/TimerWithTimeOptionTest.java   |   0
 .../validator/CustomSchemaFactoryFeatureTest.java  |   0
 .../validator/FileValidatorRouteTest.java          |   0
 .../component/validator/ValidatorBeanCallTest.java |   0
 .../validator/ValidatorDtdAccessAbstractTest.java  |   0
 .../validator/ValidatorDtdAccessOffTest.java       |   0
 .../validator/ValidatorDtdAccessOnTest.java        |   0
 .../ValidatorEndpointClearCachedSchemaTest.java    |   0
 .../validator/ValidatorIllegalImportTest.java      |   0
 .../ValidatorIncludeEncodingRouteTest.java         |   0
 .../ValidatorIncludeRelativeRouteTest.java         |   0
 .../validator/ValidatorIncludeRouteTest.java       |   0
 .../ValidatorResourceResolverFactoryTest.java      |   0
 .../component/validator/ValidatorRootPathTest.java |   0
 .../component/validator/ValidatorRouteTest.java    |   0
 .../ValidatorWithResourceResolverRouteTest.java    |   0
 .../camel/component/vm/AbstractVmTestSupport.java  |   0
 .../component/vm/ConsumerCamelContextAware.java    |   0
 .../component/vm/SameVmQueueSizeAndNoSizeTest.java |   0
 .../apache/camel/component/vm/VMSplitterTest.java  |   0
 .../vm/VmComponentReferenceEndpointTest.java       |   0
 .../component/vm/VmConcurrentConsumersTest.java    |   0
 ...mDifferentOptionsOnConsumerAndProducerTest.java |   0
 .../component/vm/VmDiscardIfNoConsumerTest.java    |   0
 .../camel/component/vm/VmInOnlyChainedTest.java    |   0
 .../apache/camel/component/vm/VmInOnlyTest.java    |   0
 .../camel/component/vm/VmInOutChainedTest.java     |   0
 .../component/vm/VmInOutChainedTimeoutTest.java    |   0
 .../org/apache/camel/component/vm/VmInOutTest.java |   0
 .../camel/component/vm/VmInOutWithErrorTest.java   |   0
 .../component/vm/VmMultipleConsumersIssueTest.java |   0
 .../vm/VmMultipleConsumersKeepRouteTest.java       |   0
 .../vm/VmMultipleConsumersMultipleContextTest.java |   0
 .../vm/VmMultipleConsumersRemoteRouteTest.java     |   0
 .../vm/VmMultipleContextsStartStopTest.java        |   0
 .../org/apache/camel/component/vm/VmQueueTest.java |   0
 .../component/vm/VmShouldNotUseSameThreadTest.java |   0
 .../component/vm/VmShouldUseConsumerContext.java   |   0
 .../camel/component/vm/VmTimeoutIssueTest.java     |   0
 .../camel/component/vm/VmUseSameQueueTest.java     |   0
 .../component/vm/VmWaitForTaskCompleteTest.java    |   0
 .../vm/VmWaitForTaskIfReplyExpectedTest.java       |   0
 .../camel/component/vm/VmWaitForTaskNewerTest.java |   0
 .../camel/component/xslt/InvalidXsltFileTest.java  |   0
 .../org/apache/camel/component/xslt/MyEcho.java    |   0
 .../org/apache/camel/component/xslt/MyXPath.java   |   0
 .../camel/component/xslt/SAXSourceLogBodyTest.java |   0
 .../org/apache/camel/component/xslt/TestBean.java  |   0
 .../xslt/XsltCustomErrorListenerTest.java          |   0
 .../xslt/XsltCustomizeEntityResolverTest.java      |   0
 .../xslt/XsltCustomizeURIResolverTest.java         |   0
 .../apache/camel/component/xslt/XsltDTDTest.java   |   0
 .../camel/component/xslt/XsltFeatureRouteTest.java |   0
 .../camel/component/xslt/XsltFileNotFoundTest.java |   0
 .../component/xslt/XsltFromFileExceptionTest.java  |   0
 .../XsltIncludeClasspathDotInDirectoryTest.java    |   0
 .../component/xslt/XsltIncludeClasspathTest.java   |   0
 .../xslt/XsltIncludeRelativeFileSchemeTest.java    |   0
 .../xslt/XsltIncludeRelativeNestedTest.java        |   0
 .../xslt/XsltIncludeRelativeOtherTest.java         |   0
 .../component/xslt/XsltIncludeRelativeTest.java    |   0
 .../camel/component/xslt/XsltIncludeTest.java      |   0
 .../component/xslt/XsltMessageTerminateTest.java   |   0
 .../camel/component/xslt/XsltOutputBytesTest.java  |   0
 .../camel/component/xslt/XsltOutputDOMTest.java    |   0
 .../component/xslt/XsltOutputFileDeleteTest.java   |   0
 .../camel/component/xslt/XsltOutputFileTest.java   |   0
 .../camel/component/xslt/XsltOutputStringTest.java |   0
 .../component/xslt/XsltRouteAllowStAXTest.java     |   0
 .../camel/component/xslt/XsltRouteFileTest.java    |   0
 .../apache/camel/component/xslt/XsltRouteTest.java |   0
 .../component/xslt/XsltRouteXsltWithErrorTest.java |   0
 .../apache/camel/component/xslt/XsltSaxonTest.java |   0
 .../xslt/XsltTransformingExceptionTest.java        |   0
 .../component/xslt/XsltUriResolverFactoryTest.java |   0
 .../apache/camel/converter/CamelConverterTest.java |   0
 .../camel/converter/CollectionConverterTest.java   |   0
 .../apache/camel/converter/ConverterBenchmark.java |   0
 .../org/apache/camel/converter/ConverterTest.java  |   0
 .../camel/converter/DateTimeConverterTest.java     |   0
 .../camel/converter/DurationConverterTest.java     |   0
 .../apache/camel/converter/EnumConverterTest.java  |   0
 .../camel/converter/FallbackPromoteTest.java       |   0
 .../camel/converter/FutureConverterTest.java       |   0
 .../camel/converter/IOConverterCharsetTest.java    |   0
 .../apache/camel/converter/IOConverterTest.java    |   0
 .../converter/InstanceFallbackConverterTest.java   |   0
 .../java/org/apache/camel/converter/JaxpTest.java  |   0
 .../java/org/apache/camel/converter/MyBean.java    |   0
 .../org/apache/camel/converter/MyCoolBean.java     |   0
 .../apache/camel/converter/NIOConverterTest.java   |   0
 .../camel/converter/ObjectConverterNaNTest.java    |   0
 .../camel/converter/ObjectConverterTest.java       |   0
 .../converter/PrimitiveTypeConverterIssueTest.java |   0
 .../PropertyEditorTypeConverterIssueTest.java      |   0
 .../org/apache/camel/converter/PurchaseOrder.java  |   0
 .../apache/camel/converter/SQLConverterTest.java   |   0
 .../converter/StaticFallbackConverterTest.java     |   0
 .../apache/camel/converter/StringSourceTest.java   |   0
 .../camel/converter/TimePatternConverterTest.java  |   0
 .../converter/TimePatternTypeConversionTest.java   |   0
 .../TimerDrivenTimePatternConverterTest.java       |   0
 .../camel/converter/TypeConverterAwareTest.java    |   0
 .../camel/converter/jaxp/BytesSourceTest.java      |   0
 .../camel/converter/jaxp/DomConverterTest.java     |   0
 .../camel/converter/jaxp/StAX2SAXSourceTest.java   |   0
 .../camel/converter/jaxp/StaxConverterTest.java    |   0
 .../converter/jaxp/StreamSourceConverterTest.java  |   0
 .../camel/converter/jaxp/XmlConverterTest.java     |   0
 .../InstanceDummyFallbackConverter.java            |   0
 .../InstanceMethodWithExchangeTestConverter.java   |   0
 .../myconverter/MyFallbackPromoteConverter.java    |   0
 .../myconverter/PurchaseOrderConverter.java        |   0
 .../myconverter/StaticDummyFallbackConverter.java  |   0
 .../StaticMethodWithExchangeTestConverter.java     |   0
 .../stream/ByteArrayInputStreamCacheTest.java      |   0
 .../converter/stream/CachedOutputStreamTest.java   |   0
 .../converter/stream/FileInputStreamCacheTest.java |   0
 .../converter/stream/InputStreamCacheTest.java     |   0
 .../camel/converter/stream/ReaderCacheTest.java    |   0
 .../camel/converter/stream/SourceCacheTest.java    |   0
 .../converter/stream/StreamCacheConverterTest.java |   0
 .../converter/stream/StreamSourceCacheTest.java    |   0
 .../camel/impl/BeanInjectRouteBuilderTest.java     |   0
 .../CamelContextAddRestDefinitionsFromXmlTest.java |   0
 ...CamelContextAddRouteDefinitionsFromXmlTest.java |   0
 .../camel/impl/CamelContextDeadlockTest.java       |   0
 .../apache/camel/impl/CamelContextTrackerTest.java |   0
 .../CamelCustomDefaultThreadPoolProfileTest.java   |   0
 ...melPostProcessorHelperConsumePredicateTest.java |   0
 ...amelPostProcessorHelperConsumePropertyTest.java |   0
 ...ostProcessorHelperSedaConsumePredicateTest.java |   0
 .../camel/impl/CamelPostProcessorHelperTest.java   |   0
 .../camel/impl/CamelProduceInterfaceTest.java      |   0
 .../apache/camel/impl/CompositeRegistryTest.java   |   0
 .../camel/impl/ConsumerCacheZeroCapacityTest.java  |   0
 .../impl/CustomHeadersMapFactoryRouteTest.java     |   0
 .../org/apache/camel/impl/CustomIdFactoryTest.java |   0
 .../camel/impl/CustomThreadPoolFactoryTest.java    |   0
 .../camel/impl/CustomUnitOfWorkFactoryTest.java    |   0
 .../camel/impl/DataFormatContextAwareTest.java     |   0
 .../DefaultAsyncProcessorAwaitManagerTest.java     |   0
 .../impl/DefaultCamelBeanPostProcessorTest.java    |   0
 ...melContextAllowUseOriginalMessageFalseTest.java |   0
 ...amelContextAllowUseOriginalMessageTrueTest.java |   0
 .../impl/DefaultCamelContextAutoStartupTest.java   |   0
 .../impl/DefaultCamelContextResolverTest.java      |   0
 .../camel/impl/DefaultCamelContextRestartTest.java |   0
 .../impl/DefaultCamelContextStopFailureTest.java   |   0
 ...lContextSuspendResumeRouteStartupOrderTest.java |   0
 .../DefaultCamelContextSuspendResumeRouteTest.java |   0
 .../apache/camel/impl/DefaultCamelContextTest.java |   0
 ...melContextWithLifecycleStrategyRestartTest.java |   0
 .../camel/impl/DefaultClassResolverTest.java       |   0
 .../DefaultComponentReferencePropertiesTest.java   |   0
 .../apache/camel/impl/DefaultComponentTest.java    |   0
 .../impl/DefaultComponentValidateURITest.java      |   0
 .../camel/impl/DefaultConsumerCacheTest.java       |   0
 .../camel/impl/DefaultConsumerTemplateTest.java    |   0
 ...ConsumerTemplateWithCustomCacheMaxSizeTest.java |   0
 .../camel/impl/DefaultEndpointRegistryTest.java    |   0
 .../camel/impl/DefaultExchangeHolderTest.java      |   0
 .../org/apache/camel/impl/DefaultExchangeTest.java |   0
 .../impl/DefaultExecutorServiceManagerTest.java    |   0
 .../camel/impl/DefaultFactoryFinderTest.java       |   0
 .../impl/DefaultHeaderFilterStrategyTest.java      |   0
 .../camel/impl/DefaultHeadersMapFactoryTest.java   |   0
 .../camel/impl/DefaultInflightRepositoryTest.java  |   0
 .../org/apache/camel/impl/DefaultInjectorTest.java |   0
 .../camel/impl/DefaultMessageHeaderTest.java       |   0
 .../camel/impl/DefaultProducerCacheTest.java       |   0
 .../impl/DefaultProducerTemplateAsyncTest.java     |   0
 ...efaultProducerTemplateNonBlockingAsyncTest.java |   0
 .../camel/impl/DefaultProducerTemplateTest.java    |   0
 ...ProducerTemplateWithCustomCacheMaxSizeTest.java |   0
 .../apache/camel/impl/DefaultUnitOfWorkTest.java   |   0
 .../camel/impl/DefaultUuidGeneratorTest.java       |   0
 .../apache/camel/impl/DummyLifecycleStrategy.java  |   0
 .../camel/impl/DurationRoutePolicyFactoryTest.java |   0
 .../impl/DurationRoutePolicyMaxMessagesTest.java   |   0
 .../impl/DurationRoutePolicyMaxSecondsTest.java    |   0
 .../src/test/java/org/apache/camel/impl/Echo.java  |   0
 .../apache/camel/impl/EmptyProducerCacheTest.java  |   0
 ...outeEndpointsRemoteRouteSharedEndpointTest.java |   0
 ...tRegistryKeepRouteEndpointsRemoteRouteTest.java |   0
 .../EndpointRegistryKeepRouteEndpointsTest.java    |   0
 .../camel/impl/EndpointShutdownOnceTest.java       |   0
 .../EventDrivenPollingConsumerQueueSizeTest.java   |   0
 .../apache/camel/impl/ExpressionAdapterTest.java   |   0
 .../apache/camel/impl/ExpressionSupportTest.java   |   0
 .../impl/ExtendedStartupListenerComponentTest.java |   0
 .../apache/camel/impl/FileStateRepositoryTest.java |   0
 .../camel/impl/FileWatcherReloadStrategyTest.java  |   0
 .../test/java/org/apache/camel/impl/FooBar.java    |   0
 .../org/apache/camel/impl/FromEndpointTest.java    |   0
 .../camel/impl/FromHasNoOutputRouteTest.java       |   0
 .../camel/impl/FromMultipleEndpointTest.java       |   0
 .../apache/camel/impl/GetRegistryAsTypeTest.java   |   0
 .../GracefulShutdownNoAutoStartOrderClashTest.java |   0
 .../camel/impl/GzipDataFormatFileDeleteTest.java   |   0
 .../GzipDataFormatFileUnmarshalDeleteTest.java     |   0
 .../org/apache/camel/impl/GzipDataFormatTest.java  |   0
 .../impl/HashMapHeadersMapFactoryRouteTest.java    |   0
 .../impl/HeaderFilterStrategyComponentTest.java    |   0
 .../InflightRepositoryBrowseFromRouteTest.java     |   0
 .../camel/impl/InflightRepositoryBrowseTest.java   |   0
 .../camel/impl/InflightRepositoryRouteTest.java    |   0
 ...erceptSendToMockEndpointStrategyCustomTest.java |   0
 .../InterceptSendToMockEndpointStrategyTest.java   |   0
 .../apache/camel/impl/JavaUuidGeneratorTest.java   |   0
 .../org/apache/camel/impl/JndiRegistryTest.java    |   0
 .../camel/impl/LanguageCamelContextAwareTest.java  |   0
 .../impl/LifecycleStrategyFailOnStartupTest.java   |   0
 .../camel/impl/LifecycleStrategyServiceTest.java   |   0
 .../LimitedPollingConsumerPollStrategyTest.java    |   0
 .../camel/impl/LogDebugBodyMaxCharsOffTest.java    |   0
 .../camel/impl/LogDebugBodyMaxCharsTest.java       |   0
 .../apache/camel/impl/LogDebugBodyStreamsTest.java |   0
 .../org/apache/camel/impl/MainSupportTest.java     |   0
 .../camel/impl/MemoryStateRepositoryTest.java      |   0
 .../org/apache/camel/impl/MessageSupportTest.java  |   0
 .../camel/impl/Mock321ScheduledPollConsumer.java   |   0
 .../camel/impl/MockScheduledPollConsumer.java      |   0
 .../apache/camel/impl/ModelCamelContextTest.java   |   0
 .../camel/impl/MultipleConsumersSupportTest.java   |   0
 .../camel/impl/MultipleLifecycleStrategyTest.java  |   0
 .../java/org/apache/camel/impl/MySerialBean.java   |   0
 .../camel/impl/OriginalMessageProcessor.java       |   0
 ...ingExchangesAsyncDelayShutdownGracefulTest.java |   0
 .../impl/PendingExchangesShutdownGracefulTest.java |   0
 ...ndingExchangesTwoRouteShutdownGracefulTest.java |   0
 .../impl/PojoProduceInterceptEndpointTest.java     |   0
 .../PojoProduceProxyInterceptEndpointTest.java     |   0
 .../camel/impl/ProducerCacheNonSingletonTest.java  |   0
 .../impl/ProxyInstantiationExceptionTest.java      |   0
 .../org/apache/camel/impl/RefDataFormatTest.java   |   0
 .../RegistryLookupTypeClassCastExceptionTest.java  |   0
 .../java/org/apache/camel/impl/RegistryTest.java   |   0
 .../camel/impl/RemoveRouteStopEndpointTest.java    |   0
 .../camel/impl/RouteDirectSuspendResumeTest.java   |   0
 .../org/apache/camel/impl/RouteIdFactoryTest.java  |   0
 .../camel/impl/RouteIdRestDefinitionTest.java      |   0
 .../impl/RouteMustHaveOutputOnExceptionTest.java   |   0
 .../org/apache/camel/impl/RouteNoOutputTest.java   |   0
 .../apache/camel/impl/RoutePolicyCallbackTest.java |   0
 .../apache/camel/impl/RoutePolicyFactoryTest.java  |   0
 .../camel/impl/RoutePolicyRefCallbackTest.java     |   0
 .../apache/camel/impl/RoutePolicySupportTest.java  |   0
 .../org/apache/camel/impl/RoutePolicyTest.java     |   0
 .../org/apache/camel/impl/RouteRemove2Test.java    |   0
 .../org/apache/camel/impl/RouteRemoveTest.java     |   0
 .../apache/camel/impl/RouteSedaStopStartTest.java  |   0
 .../camel/impl/RouteSedaSuspendResumeTest.java     |   0
 .../camel/impl/RouteSuspendResumeWarmUpTest.java   |   0
 .../impl/RouteWithMistypedComponentNameTest.java   |   0
 .../camel/impl/RuntimeEndpointRegistryTest.java    |   0
 .../impl/ScheduledPollConsumerBackoffTest.java     |   0
 .../impl/ScheduledPollConsumerGreedyTest.java      |   0
 .../camel/impl/ScheduledPollConsumerTest.java      |   0
 ...edPollEndpointConfigureConsumerRestartTest.java |   0
 .../camel/impl/SerializationDataFormatTest.java    |   0
 .../ShutdownGracefulNoAutoStartedRoutesTest.java   |   0
 .../impl/ShutdownGracefulTimeoutTriggerTest.java   |   0
 ...ownStrategyNotSuppressLoggingOnTimeoutTest.java |   0
 ...utdownStrategySuppressLoggingOnTimeoutTest.java |   0
 .../org/apache/camel/impl/SimpleRegistryTest.java  |   0
 .../SimpleShutdownGracefulNoAtuoStartedTest.java   |   0
 .../camel/impl/SimpleShutdownGracefulTest.java     |   0
 .../apache/camel/impl/SimpleUuidGeneratorTest.java |   0
 .../apache/camel/impl/StartAndStopRoutesTest.java  |   0
 .../camel/impl/StartStopAndShutdownRouteTest.java  |   0
 .../StartupListenerComponentFromRegistryTest.java  |   0
 .../camel/impl/StartupListenerComponentTest.java   |   0
 .../org/apache/camel/impl/StartupListenerTest.java |   0
 .../camel/impl/StopRouteAbortAfterTimeoutTest.java |   0
 .../apache/camel/impl/StringDataFormatTest.java    |   0
 .../apache/camel/impl/TraceExchangeFormatter.java  |   0
 .../camel/impl/TwoRouteSuspendResumeTest.java      |   0
 .../camel/impl/TypeConverterAllowNullTest.java     |   0
 .../TypeConverterRegistryMissesThenAddTest.java    |   0
 .../impl/TypeConverterRegistryPerformanceTest.java |   0
 ...TypeConverterRegistryStatisticsEnabledTest.java |   0
 .../camel/impl/TypeConverterRegistryTest.java      |   0
 .../camel/impl/VetoCamelContextStartTest.java      |   0
 .../camel/impl/ZipDataFormatFileDeleteTest.java    |   0
 .../impl/ZipDataFormatFileUnmarshalDeleteTest.java |   0
 .../org/apache/camel/impl/ZipDataFormatTest.java   |   0
 .../impl/cloud/CachingServiceDiscoveryTest.java    |   0
 .../impl/cloud/CombinedServiceDiscoveryTest.java   |   0
 .../impl/cloud/CombinedServiceFilterTest.java      |   0
 .../apache/camel/impl/cloud/LoadBalancerTest.java  |   0
 .../impl/cloud/ServiceCallConfigurationTest.java   |   0
 .../camel/impl/cloud/ServiceDefinitionTest.java    |   0
 .../camel/impl/cloud/ServiceRegistryTest.java      |   0
 .../impl/cluster/ClusterServiceSelectorTest.java   |   0
 .../camel/impl/cluster/ClusterServiceViewTest.java |   0
 .../org/apache/camel/impl/converter/Country.java   |   0
 .../apache/camel/impl/converter/MyConverters.java  |   0
 .../camel/impl/converter/TypeConvertersTest.java   |   0
 .../camel/impl/converter/UriTypeConverterTest.java |   0
 .../camel/impl/event/EventNotifierEventsTest.java  |   0
 .../event/EventNotifierExchangeCompletedTest.java  |   0
 .../EventNotifierExchangeSentParallelTest.java     |   0
 .../impl/event/EventNotifierExchangeSentTest.java  |   0
 .../EventNotifierFailureHandledEventsTest.java     |   0
 .../event/EventNotifierRedeliveryEventsTest.java   |   0
 ...ventNotifierServiceStoppingFailedEventTest.java |   0
 .../event/MultipleEventNotifierEventsTest.java     |   0
 .../health/DefaultHealthCheckRegistryTest.java     |   0
 .../impl/health/DefaultHealthCheckServiceTest.java |   0
 .../apache/camel/impl/health/HealthCheckTest.java  |   0
 .../impl/transformer/TransformerContractTest.java  |   0
 .../impl/transformer/TransformerRouteTest.java     |   0
 .../validator/BeanValidatorInputValidateTest.java  |   0
 .../validator/BeanValidatorOutputValidateTest.java |   0
 .../impl/validator/ValidatorContractTest.java      |   0
 .../camel/impl/validator/ValidatorRouteTest.java   |   0
 .../impl/validator/ValidatorXmlSchemaTest.java     |   0
 .../verifier/DefaultComponentVerifierTest.java     |   0
 .../camel/impl/verifier/ResultErrorHelperTest.java |   0
 .../org/apache/camel/issues/AdviceWithCBRTest.java |   0
 ...viceWithContextScopedErrorHandlerIssueTest.java |   0
 ...nterceptSendToEndpointWithLoadbalancerTest.java |   0
 .../camel/issues/AdviceWithInterceptTest.java      |   0
 .../issues/AdviceWithInvalidConfiguredTest.java    |   0
 .../apache/camel/issues/AdviceWithIssueTest.java   |   0
 .../camel/issues/AdviceWithOnCompletionTest.java   |   0
 .../AdviceWithOnExceptionAndInterceptTest.java     |   0
 .../AdviceWithOnExceptionMultipleIssueTest.java    |   0
 .../issues/AdviceWithOnExceptionRemoveTest.java    |   0
 .../camel/issues/AdviceWithOnExceptionTest.java    |   0
 .../apache/camel/issues/AdviceWithPolicyTest.java  |   0
 .../camel/issues/AdviceWithRoutePolicyTest.java    |   0
 ...AdviceWithRouteScopedErrorHandlerIssueTest.java |   0
 .../issues/AdviceWithStartTargetIssueTest.java     |   0
 .../camel/issues/AdviceWithTransactedTest.java     |   0
 .../AdviceWithTwoRoutesOnExceptionIssueTest.java   |   0
 .../camel/issues/AdviceWithUrlIssueTest.java       |   0
 .../issues/AdviceWithWeaveByToUriCBRTest.java      |   0
 .../camel/issues/AdviceWithWeaveByTypeCBRTest.java |   0
 .../AggregatorWithBatchConsumingIssueTest.java     |   0
 .../apache/camel/issues/AmahDeadLetterTest.java    |   0
 .../camel/issues/CBRConcurrencyIssueTest.java      |   0
 .../apache/camel/issues/CBRContainsIssueTest.java  |   0
 .../issues/CBRCustomPredicateAsFilterTest.java     |   0
 .../CacheInputStreamInDeadLetterIssue520Test.java  |   0
 .../apache/camel/issues/Camel4857UriIssueTest.java |   0
 .../camel/issues/ChangeHeaderCaseIssueTest.java    |   0
 .../CharlesSplitAndTryCatchRollbackIssueTest.java  |   0
 ...CharlesSplitUseBeanAsErrorHandlerIssueTest.java |   0
 .../issues/ChoiceEndOrEndChoiceIssueTest.java      |   0
 .../issues/ChoicePredicateSimpleHeaderTest.java    |   0
 .../camel/issues/ComponentUseRawUriTest.java       |   0
 .../issues/ConsumerTemplateSedaQueueIssueTest.java |   0
 ...tScopedOnExceptionErrorHandlerRefIssueTest.java |   0
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |   0
 ...nExceptionMultipleRouteBuildersReverseTest.java |   0
 ...ScopedOnExceptionMultipleRouteBuildersTest.java |   0
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |   0
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |   0
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |   0
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   0
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |   0
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   0
 .../camel/issues/CustomFailveOverProcessor.java    |   0
 .../org/apache/camel/issues/DavidSiefertTest.java  |   0
 .../issues/DoCatchCaughExceptionIssueTest.java     |   0
 .../issues/DynamicRouterWithInterceptorTest.java   |   0
 .../issues/EndpointWithRawUriParameterTest.java    |   0
 .../camel/issues/ErrorHandlerAdviceIssueTest.java  |   0
 .../camel/issues/ExceptionCamel4022Test.java       |   0
 .../camel/issues/ExceptionPolicyIssueTest.java     |   0
 .../org/apache/camel/issues/ExceptionTest.java     |   0
 ...tionThrownFromOnExceptionNoEndlessLoopTest.java |   0
 .../issues/ExceptionThrownFromOnExceptionTest.java |   0
 .../camel/issues/FilePollingConsumerIssueTest.java |   0
 .../issues/FileSplitStreamingWithChoiceTest.java   |   0
 .../issues/FilterCustomPredicateAsFilterTest.java  |   0
 .../org/apache/camel/issues/GertJBIIssueTest.java  |   0
 .../InterceptCustomPredicateAsFilterTest.java      |   0
 .../apache/camel/issues/InterceptFromLogTest.java  |   0
 .../InterceptFromPredicateProceedAndStopTest.java  |   0
 .../java/org/apache/camel/issues/Issue170Test.java |   0
 .../java/org/apache/camel/issues/Issue3Test.java   |   0
 .../MessageWithAttachmentRedeliveryIssueTest.java  |   0
 .../camel/issues/MethodClassByTypeIssueTest.java   |   0
 .../camel/issues/MockExepctedHeadersIssueTest.java |   0
 .../camel/issues/MockValueBuilderIssueTest.java    |   0
 ...icastAggregationStrategyThrowExceptionTest.java |   0
 ...lelStopOnExceptionWithOnExceptionIssueTest.java |   0
 ...thAggregationStrategyThrowingExceptionTest.java |   0
 .../MulticastParallelWithOnExceptionIssueTest.java |   0
 .../MulticastPipelineAggregateIssueTest.java       |   0
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |   0
 .../issues/MulticastSingleAggregateIssueTest.java  |   0
 ...astStopOnExceptionWithOnExceptionIssueTest.java |   0
 .../issues/MulticastWithOnExceptionIssueTest.java  |   0
 .../MultipleErrorHandlerOnExceptionIssueTest.java  |   0
 .../org/apache/camel/issues/MultipleFromTest.java  |   0
 .../java/org/apache/camel/issues/MyCamelBean.java  |   0
 .../org/apache/camel/issues/MyTransformBean.java   |   0
 .../org/apache/camel/issues/NeilSplitterTest.java  |   0
 ...derExactlyDoneSplitterWhereSentToIssueTest.java |   0
 ...tifyBuilderOnFailureShutdownCamelIssueTest.java |   0
 .../apache/camel/issues/OnCompletionIssueTest.java |   0
 .../OnExceptionBeforeErrorHandlerIssueTest.java    |   0
 .../issues/OnExceptionContinuedIssueTest.java      |   0
 ...OnExceptionContinuedNoFailureProcessorTest.java |   0
 .../OnExceptionErrorHandlerRefIssueTest.java       |   0
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |   0
 .../OnExceptionHandledNoFailureProcessorTest.java  |   0
 ...xceptionNotHandledErrorHandlerRefIssueTest.java |   0
 ...otHandledErrorHandlerRefIssueTwoRoutesTest.java |   0
 ...nExceptionNotHandledNoFailureProcessorTest.java |   0
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |   0
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   0
 .../camel/issues/OnExceptionProcessIssueTest.java  |   0
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |   0
 ...uteScopedErrorHandlerRefIssueTwoRoutesTest.java |   0
 .../camel/issues/OnExceptionWithTwoBeansTest.java  |   0
 .../issues/PropertiesAvailableEverywhereTest.java  |   0
 .../camel/issues/ProxyReturnNullIssueTest.java     |   0
 .../RecipientListDirectNoConsumerIssueTest.java    |   0
 .../RecipientListErrorHandlingIssueTest.java       |   0
 ...thAggregationStrategyThrowingExceptionTest.java |   0
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |   0
 ...eOriginalMessageEndpointExceptionIssueTest.java |   0
 .../RecipientListUseOriginalMessageIssueTest.java  |   0
 .../issues/RecipientListWithInterceptorTest.java   |   0
 ...andlerAsyncDelayedTwoCamelContextIssueTest.java |   0
 ...olicyOnExceptionWhileRedeliveringIssueTest.java |   0
 .../camel/issues/RegExPredicateIssueTest.java      |   0
 ...ryContextScopedUntilRecipientListIssueTest.java |   0
 ...tScopedUntilRecipientListParallelIssueTest.java |   0
 ...etryRouteScopedUntilRecipientListIssueTest.java |   0
 ...eScopedUntilRecipientListParallelIssueTest.java |   0
 .../RetryWhilePredicateExpressionIssueTest.java    |   0
 .../RetryWhileSimpleExpressionIssueTest.java       |   0
 .../apache/camel/issues/RomeksExceptionTest.java   |   0
 .../camel/issues/RouteIdAutoAssignClashIssue.java  |   0
 .../RouteScopedErrorHandlerAndOnExceptionTest.java |   0
 ...ScopedOnExceptionMultipleRouteBuildersTest.java |   0
 ...eptionWithInterceptSendToEndpointIssueTest.java |   0
 ...erceptSendToEndpointIssueWithPredicateTest.java |   0
 .../apache/camel/issues/RouteWithCustomIdTest.java |   0
 .../camel/issues/RoutingSlipMemoryLeakTest.java    |   0
 .../issues/RoutingSlipNotStopErrorHandlerTest.java |   0
 .../issues/RoutingSlipWithInterceptorTest.java     |   0
 ...RouteAndContextScopedErrorHandlerIssueTest.java |   0
 .../camel/issues/SedaFileIdempotentIssueTest.java  |   0
 .../SedaFileIdempotentNoTimeoutIssueTest.java      |   0
 .../issues/SedaFileIdempotentTimeoutIssueTest.java |   0
 .../issues/SentExchangeEventNotifierIssueTest.java |   0
 .../SentExchangeEventNotifierTwoIssueTest.java     |   0
 .../camel/issues/SetBodyTryCatchIssueTest.java     |   0
 .../camel/issues/SetHeaderInDoCatchIssueTest.java  |   0
 .../apache/camel/issues/SetHeaderIssueTest.java    |   0
 .../camel/issues/SplitContinuedLogIssueTest.java   |   0
 .../camel/issues/SplitListListIssueTest.java       |   0
 .../camel/issues/SplitPropertiesFileIssueTest.java |   0
 ...UnitOfWorkOnExceptionHandledFalseIssueTest.java |   0
 .../issues/SplitStopOnExceptionIssueTest.java      |   0
 .../SplitWithCustomAggregationStrategyTest.java    |   0
 .../camel/issues/SplitWithInterceptorTest.java     |   0
 .../issues/SplitterCorrelationIdIssueTest.java     |   0
 .../camel/issues/SplitterParallelIssueTest.java    |   0
 ...terParallelRuntimeExceptionInHasNextOrNext.java |   0
 ...thAggregationStrategyThrowingExceptionTest.java |   0
 ...rParallelWithIteratorThrowingExceptionTest.java |   0
 .../SplitterThrowExceptionInExpressionTest.java    |   0
 .../SplitterThrowExceptionInExpressionTwoTest.java |   0
 ...terUsingBeanReturningCloseableIteratorTest.java |   0
 .../SplitterUsingBeanReturningMessageTest.java     |   0
 .../camel/issues/StopCamelFromRouteTest.java       |   0
 .../camel/issues/StopRouteFromRouteTest.java       |   0
 .../issues/StopRouteImpactsErrorHandlerTest.java   |   0
 ...dNotStopContextScopedErrorHandlerIssueTest.java |   0
 ...uldNotStopRouteScopedErrorHandlerIssueTest.java |   0
 ...ryCatchInterceptSendToAllEndpointIssueTest.java |   0
 ...ThreadsRejectedExecutionWithDeadLetterTest.java |   0
 .../issues/TimerAndErrorHandlerIssueTest.java      |   0
 .../TransactedPropertyPlaceholderIssueTest.java    |   0
 .../TryCatchFinallyOnExceptionIssueTest.java       |   0
 .../camel/issues/TryCatchSetHeaderIssueTest.java   |   0
 .../camel/issues/TryCatchWithSplitIssueTest.java   |   0
 ...erceptSendToEndpointIssueWithPredicateTest.java |   0
 .../apache/camel/issues/TwoTimerWithJMXIssue.java  |   0
 .../issues/TypeConverterConcurrencyIssueTest.java  |   0
 .../apache/camel/issues/XPathSplitStreamTest.java  |   0
 .../language/BeanAnnotationParameterTest.java      |   0
 .../language/BeanAnnotationParameterTwoTest.java   |   0
 .../language/BeanLanguageInvalidOGNLTest.java      |   0
 .../BeanLanguageMethodMissingParenthesisTest.java  |   0
 .../camel/language/BeanLanguageOGNLTest.java       |   0
 ...LWithDotInParameterPropertyPlaceholderTest.java |   0
 .../BeanLanguageOGNLWithDotInParameterTest.java    |   0
 .../java/org/apache/camel/language/BeanTest.java   |   0
 .../ConstantLanguageBinaryResourceTest.java        |   0
 .../org/apache/camel/language/ConstantTest.java    |   0
 .../camel/language/FileLanguageExtSingleTest.java  |   0
 .../apache/camel/language/FileLanguageTest.java    |   0
 .../java/org/apache/camel/language/HeaderTest.java |   0
 .../apache/camel/language/LanguageServiceTest.java |   0
 .../apache/camel/language/NoSuchLanguageTest.java  |   0
 .../PropertyInjectAnnotationParameterTest.java     |   0
 .../org/apache/camel/language/PropertyTest.java    |   0
 .../apache/camel/language/RefPredicateTest.java    |   0
 .../java/org/apache/camel/language/RefTest.java    |   0
 .../camel/language/SimpleLanguageRouteTest.java    |   0
 .../SimpleLanguageTransformRandomTest.java         |   0
 .../camel/language/SimpleOgnlMapIssueTest.java     |   0
 ...okenPairIteratorSplitChoicePerformanceTest.java |   0
 .../camel/language/TokenPairPredicateTest.java     |   0
 .../TokenXMLPairMultiNamespaceSplitTest.java       |   0
 .../TokenXMLPairNamespaceMultilineSplitTest.java   |   0
 .../language/TokenXMLPairNamespaceSplitTest.java   |   0
 .../org/apache/camel/language/TokenizerTest.java   |   0
 .../apache/camel/language/XMLTokenSplitTest.java   |   0
 .../language/XPathAnotherRouteConcurrentTest.java  |   0
 .../camel/language/XPathFromFileExceptionTest.java |   0
 .../apache/camel/language/XPathFunctionTest.java   |   0
 .../language/XPathLanguageSingleNodeListTest.java  |   0
 .../camel/language/XPathOutFunctionTest.java       |   0
 .../apache/camel/language/XPathResourceTest.java   |   0
 .../language/XPathRouteConcurrentBigTest.java      |   0
 .../camel/language/XPathRouteConcurrentTest.java   |   0
 .../language/XPathSplitChoicePerformanceTest.java  |   0
 .../java/org/apache/camel/language/XPathTest.java  |   0
 .../apache/camel/language/simple/Constants.java    |   0
 .../simple/SimpleBackwardsCompatibleTest.java      |   0
 .../simple/SimpleChangeFunctionTokensTest.java     |   0
 .../camel/language/simple/SimpleDecHeaderTest.java |   0
 .../camel/language/simple/SimpleIncHeaderTest.java |   0
 .../SimpleMessageHistoryNotDetailedTest.java       |   0
 .../language/simple/SimpleMessageHistoryTest.java  |   0
 .../camel/language/simple/SimpleOperatorTest.java  |   0
 .../language/simple/SimpleOverrideMethodTest.java  |   0
 .../simple/SimpleParserExpressionInvalidTest.java  |   0
 .../simple/SimpleParserExpressionTest.java         |   0
 .../simple/SimpleParserPredicateInvalidTest.java   |   0
 .../language/simple/SimpleParserPredicateTest.java |   0
 .../simple/SimpleParserRegexpPredicateTest.java    |   0
 .../simple/SimplePropertiesNestedTest.java         |   0
 .../language/simple/SimpleResourceDynamicTest.java |   0
 .../camel/language/simple/SimpleResourceTest.java  |   0
 .../SimpleRouteExpressionAsPredicateTest.java      |   0
 .../simple/SimpleSetHeaderPredicateTest.java       |   0
 .../apache/camel/language/simple/SimpleTest.java   |   0
 .../language/simple/SimpleWhiteSpaceTest.java      |   0
 .../language/simple/SimpleWithPropertiesTest.java  |   0
 .../language/tokenizer/TokenizeLanguageTest.java   |   0
 .../tokenizer/TokenizeWrapLanguageTest.java        |   0
 .../tokenizer/XMLTokenizeLanguageGroupingTest.java |   0
 .../XMLTokenizeLanguageStreamingFileTest.java      |   0
 .../XMLTokenizeLanguageStreamingTest.java          |   0
 .../tokenizer/XMLTokenizeLanguageTest.java         |   0
 .../XMLTokenizeWrapLanguageGroupingTest.java       |   0
 .../tokenizer/XMLTokenizeWrapLanguageTest.java     |   0
 .../java/org/apache/camel/main/MainExample.java    |   0
 .../test/java/org/apache/camel/main/MainTest.java  |   0
 .../java/org/apache/camel/main/MainVetoTest.java   |   0
 .../apache/camel/model/ChoiceDefinitionTest.java   |   0
 .../model/GatherAllStaticEndpointUrisTest.java     |   0
 .../model/GenerateXmFromCamelContextTest.java      |   0
 .../org/apache/camel/model/GenerateXmlTest.java    |   0
 .../camel/model/GlobalOptionsDefinitionTest.java   |   0
 .../apache/camel/model/LoadRestFromXmlTest.java    |   0
 .../apache/camel/model/LoadRouteFromXmlTest.java   |   0
 .../model/LoadRouteFromXmlWithInterceptTest.java   |   0
 .../model/LoadRouteFromXmlWithNamespaceTest.java   |   0
 .../model/LoadRouteFromXmlWithOnExceptionTest.java |   0
 .../model/LoadRouteFromXmlWithPolicyTest.java      |   0
 .../apache/camel/model/ModelSanityCheckerTest.java |   0
 .../camel/model/ProcessDefinitionSetBodyTest.java  |   0
 .../camel/model/ProcessorDefinitionHelperTest.java |   0
 .../model/ProcessorTypeConfigurationTest.java      |   0
 .../org/apache/camel/model/RouteGroupTest.java     |   0
 .../apache/camel/model/RoutePropertiesTest.java    |   0
 .../model/StartingRoutesErrorReportedTest.java     |   0
 .../java/org/apache/camel/model/XmlParseTest.java  |   0
 .../org/apache/camel/model/XmlRestParseTest.java   |   0
 .../apache/camel/model/XmlRestParseToDTest.java    |   0
 .../org/apache/camel/model/XmlRouteGroupTest.java  |   0
 .../apache/camel/model/XmlRoutePropertiesTest.java |   0
 .../org/apache/camel/model/XmlTestSupport.java     |   0
 .../java/org/apache/camel/processor/Animal.java    |   0
 .../camel/processor/AnimalDeepClonePrepare.java    |   0
 .../apache/camel/processor/AppendingProcessor.java |   0
 .../apache/camel/processor/AsyncLoopCopyTest.java  |   0
 .../org/apache/camel/processor/AsyncLoopTest.java  |   0
 .../BatchResequencerAllowDuplicatesTest.java       |   0
 .../processor/BatchResequencerJMSPriorityTest.java |   0
 .../BatchResequencerWithDuplicateTest.java         |   0
 .../processor/BeanCachedProcessorGlobalTest.java   |   0
 .../camel/processor/BeanCachedProcessorTest.java   |   0
 .../org/apache/camel/processor/BeanCachedTest.java |   0
 .../BeanInvocationThrowsExceptionTest.java         |   0
 .../BeanOgnMethodWithXPathInjectionTest.java       |   0
 .../BeanProcessorSpecializedMessageTest.java       |   0
 .../BeanRecipientListInterfaceAnnotationTest.java  |   0
 .../BeanRecipientListNoMethodNameTest.java         |   0
 .../camel/processor/BeanRecipientListTest.java     |   0
 .../processor/BeanRecipientListTimeoutTest.java    |   0
 .../org/apache/camel/processor/BeanRouteTest.java  |   0
 .../camel/processor/BeanWithExceptionTest.java     |   0
 .../processor/BeanWithXPathInjectionTest.java      |   0
 .../camel/processor/BodyInAggregatingStrategy.java |   0
 .../BodyInPreCompleteAggregatingStrategy.java      |   0
 .../processor/BodyOutAggregatingStrategy.java      |   0
 .../camel/processor/BreadcrumbDisabledTest.java    |   0
 .../org/apache/camel/processor/BreadcrumbTest.java |   0
 .../camel/processor/CBRHeaderPredicateTest.java    |   0
 .../CBRPredicateBeanThrowExceptionTest.java        |   0
 .../processor/CBRSimplePredicateEmptyBodyTest.java |   0
 .../apache/camel/processor/CBRSimpleTypeTest.java  |   0
 .../processor/CBRWhenUnmarshalEndChoiceTest.java   |   0
 .../camel/processor/CBRWithLoadBalancerTest.java   |   0
 .../camel/processor/CBRWithMulticastTest.java      |   0
 .../camel/processor/CBRWithRecipientListTest.java  |   0
 .../apache/camel/processor/CBRWithWireTapTest.java |   0
 .../processor/Camel715ThreadProcessorTest.java     |   0
 .../CamelContextLogExhaustedMessageBodyTest.java   |   0
 .../org/apache/camel/processor/ChannelTest.java    |   0
 .../apache/camel/processor/ChoiceAsyncTest.java    |   0
 .../processor/ChoiceCompoundPredicateTest.java     |   0
 .../apache/camel/processor/ChoiceNoActionTest.java |   0
 .../camel/processor/ChoiceNoErrorHandlerTest.java  |   0
 .../org/apache/camel/processor/ChoiceTest.java     |   0
 .../processor/ChoiceWhenBeanExpressionTest.java    |   0
 .../ChoiceWhenBeanExpressionWithExceptionTest.java |   0
 .../processor/ChoiceWhenNotPredicateTest.java      |   0
 .../apache/camel/processor/ChoiceWithEndTest.java  |   0
 .../processor/ChoiceWithSimpleExpressionTest.java  |   0
 .../camel/processor/ChoiceWithTranfromTest.java    |   0
 .../ClaimCheckEipGetAndRemoveSetTest.java          |   0
 .../camel/processor/ClaimCheckEipGetSetTest.java   |   0
 .../processor/ClaimCheckEipPushPopBodyTest.java    |   0
 .../ClaimCheckEipPushPopExcludeBodyTest.java       |   0
 .../ClaimCheckEipPushPopHeadersPatternTest.java    |   0
 .../processor/ClaimCheckEipPushPopHeadersTest.java |   0
 .../ClaimCheckEipPushPopRemoveHeaderTest.java      |   0
 .../camel/processor/ClaimCheckEipPushPopTest.java  |   0
 .../org/apache/camel/processor/ClaimCheckTest.java |   0
 .../processor/ComposedMessageProcessorTest.java    |   0
 .../apache/camel/processor/ConvertBodyTest.java    |   0
 .../apache/camel/processor/CorrectRouteIdTest.java |   0
 .../CreateRouteWithNonExistingEndpointTest.java    |   0
 .../CustomConsumerExceptionHandlerTest.java        |   0
 .../camel/processor/CustomLoadBalanceTest.java     |   0
 .../processor/CustomProcessorFactoryTest.java      |   0
 .../camel/processor/CustomRefLoadBalanceTest.java  |   0
 .../camel/processor/CustomRoutePolicyTest.java     |   0
 .../processor/CustomScheduledRoutePolicyTest.java  |   0
 .../java/org/apache/camel/processor/Customer.java  |   0
 .../camel/processor/DataFormatFactoryTest.java     |   0
 .../processor/DataFormatServiceCustomRefTest.java  |   0
 .../camel/processor/DataFormatServiceTest.java     |   0
 .../camel/processor/DataFormatStreamingTest.java   |   0
 .../org/apache/camel/processor/DataFormatTest.java |   0
 .../DeadLetterChannelAlwaysHandledTest.java        |   0
 ...ChannelBuilderWithInvalidDeadLetterUriTest.java |   0
 .../DeadLetterChannelCatchThrowableTest.java       |   0
 ...dLetterChannelExceptionCausePropagatedTest.java |   0
 ...CausePropagatedWithDefaultErrorHandlerTest.java |   0
 .../DeadLetterChannelFailureRouteIdTest.java       |   0
 .../DeadLetterChannelHandleNewExceptionTest.java   |   0
 .../DeadLetterChannelHandledExampleTest.java       |   0
 ...lHandledExampleWithDefaultErrorHandlerTest.java |   0
 ...etterChannelLogExhaustedMessageHistoryTest.java |   0
 ...nnelLogExhaustedMessageHistoryWithBodyTest.java |   0
 .../DeadLetterChannelNewExceptionTest.java         |   0
 .../DeadLetterChannelNoRedeliveryTest.java         |   0
 ...DeadLetterChannelNotHandleNewExceptionTest.java |   0
 ...adLetterChannelOnExceptionOnRedeliveryTest.java |   0
 .../processor/DeadLetterChannelOnPrepareTest.java  |   0
 .../DeadLetterChannelOnRedeliveryTest.java         |   0
 ...dLetterChannelPropagateCausedExceptionTest.java |   0
 ...etterChannelRedeliverWithDelayBlockingTest.java |   0
 ...LetterChannelRedeliveringWhileShutdownTest.java |   0
 ...eadLetterChannelRedeliveryDelayPatternTest.java |   0
 .../processor/DeadLetterChannelRedeliveryTest.java |   0
 .../DeadLetterChannelRestartFromBeginningTest.java |   0
 .../processor/DeadLetterChannelSetHeaderTest.java  |   0
 .../camel/processor/DeadLetterChannelTest.java     |   0
 .../DeadLetterChannelUnmarshalSetHeaderTest.java   |   0
 .../DeadLetterChannelUseOriginalInBodyTest.java    |   0
 ...LetterChannelUseOriginalInBodyWithFileTest.java |   0
 ...tConsumerBridgeErrorHandlerOnExceptionTest.java |   0
 ...ltConsumerBridgeErrorHandlerRedeliveryTest.java |   0
 .../DefaultConsumerBridgeErrorHandlerTest.java     |   0
 .../DefaultErrorHandlerCatchThrowableTest.java     |   0
 .../DefaultErrorHandlerExplicitConfiguredTest.java |   0
 .../DefaultErrorHandlerFailureRouteIdTest.java     |   0
 ...ErrorHandlerLogExhaustedMessageHistoryTest.java |   0
 .../DefaultErrorHandlerOnExceptionTest.java        |   0
 .../DefaultErrorHandlerOnPrepareTest.java          |   0
 .../DefaultErrorHandlerRedeliveryTest.java         |   0
 .../camel/processor/DefaultErrorHandlerTest.java   |   0
 ...cheduledPollConsumerBridgeErrorHandlerTest.java |   0
 .../DefinitionPolicyPerProcessorTest.java          |   0
 .../camel/processor/DelayInterceptorTest.java      |   0
 .../camel/processor/DelayerAsyncDelayedTest.java   |   0
 .../camel/processor/DelayerPerRouteTest.java       |   0
 .../org/apache/camel/processor/DelayerTest.java    |   0
 .../camel/processor/DelayerWhileShutdownTest.java  |   0
 .../org/apache/camel/processor/DetourTest.java     |   0
 .../processor/DoTryCatchWithSplitterTest.java      |   0
 .../DoubleLoadBalancerMisconfigurationTest.java    |   0
 .../apache/camel/processor/DualPipelineTest.java   |   0
 .../apache/camel/processor/DynamicRouter2Test.java |   0
 .../apache/camel/processor/DynamicRouter3Test.java |   0
 .../apache/camel/processor/DynamicRouter4Test.java |   0
 .../processor/DynamicRouterAnnotationTest.java     |   0
 .../DynamicRouterExchangeHeaders2Test.java         |   0
 .../DynamicRouterExchangeHeadersTest.java          |   0
 .../DynamicRouterExchangePropertiesTest.java       |   0
 .../processor/DynamicRouterOnExceptionTest.java    |   0
 .../apache/camel/processor/DynamicRouterTest.java  |   0
 ...amicRouterThrowExceptionFromExpressionTest.java |   0
 ...point2MustBeStartedBeforeSendProcessorTest.java |   0
 ...dpointMustBeStartedBeforeSendProcessorTest.java |   0
 .../camel/processor/EnrichSubUnitOfWorkTest.java   |   0
 ...HandlerOnExceptionRedeliveryAndHandledTest.java |   0
 .../camel/processor/ErrorHandlerSupportTest.java   |   0
 .../apache/camel/processor/ErrorHandlerTest.java   |   0
 .../processor/ErrorHandlerWrappedEachNodeTest.java |   0
 .../processor/EvaluateExpressionProcessorTest.java |   0
 .../EventNotifierExchangeSentExampleTest.java      |   0
 .../processor/EventNotifierExchangeSentTest.java   |   0
 .../processor/ExceptionHandlerStreamCacheTest.java |   0
 .../processor/ExchangeAwareDelayCalcBean.java      |   0
 .../processor/ExchangeCreatedTimestampTest.java    |   0
 .../processor/ExchangeIdempotentConsumerTest.java  |   0
 .../processor/FailOverAllFailedExceptionTest.java  |   0
 .../FailOverLoadBalanceAutoStartupFalseTest.java   |   0
 .../FailOverLoadBalanceMultipleExceptionTest.java  |   0
 ...verLoadBalanceNotInheritedErrorHandlerTest.java |   0
 .../camel/processor/FailOverLoadBalanceTest.java   |   0
 .../FailOverLoadBalanceWithRedeliveryTest.java     |   0
 ...lOverLoadBalanceWrappedExceptionNoLuckTest.java |   0
 .../FailOverLoadBalanceWrappedExceptionTest.java   |   0
 .../FailOverLoadBalancerSetFaultTest.java          |   0
 .../processor/FailOverNotCatchedExceptionTest.java |   0
 ...overLoadBalancerBreakoutDuringShutdownTest.java |   0
 .../FailoverMaximumFailoverAttemptsTest.java       |   0
 .../processor/FailoverRoundRobinGoodBadTest.java   |   0
 .../processor/FailoverRoundRobinStickyTest.java    |   0
 .../camel/processor/FailoverRoundRobinTest.java    |   0
 .../apache/camel/processor/FailoverStickyTest.java |   0
 .../FaultRetryRouteNewConfigurationTest.java       |   0
 .../camel/processor/FaultRetryRouteTest.java       |   0
 .../org/apache/camel/processor/FaultRouteTest.java |   0
 .../camel/processor/FileIdempotentClearTest.java   |   0
 .../FileIdempotentConsumerCreateRepoTest.java      |   0
 .../FileIdempotentConsumerLoadStoreTest.java       |   0
 .../processor/FileIdempotentConsumerTest.java      |   0
 .../camel/processor/FileIdempotentRemoveTest.java  |   0
 .../processor/FileIdempotentTrunkStoreTest.java    |   0
 .../processor/FileRollbackOnCompletionTest.java    |   0
 .../camel/processor/FilterBeforeSplitTest.java     |   0
 .../camel/processor/FilterNotMatchedTest.java      |   0
 .../org/apache/camel/processor/FilterNotTest.java  |   0
 .../apache/camel/processor/FilterSimpleTest.java   |   0
 .../org/apache/camel/processor/FilterTest.java     |   0
 .../apache/camel/processor/FlipRoutePolicy.java    |   0
 .../camel/processor/FlipRoutePolicyTest.java       |   0
 .../apache/camel/processor/FromToInOutTest.java    |   0
 .../camel/processor/GenericXmlTokenizeTest.java    |   0
 .../camel/processor/HandleFaultPerRouteTest.java   |   0
 .../processor/IdempotentConsumerAsyncTest.java     |   0
 .../IdempotentConsumerCompletionEagerTest.java     |   0
 .../IdempotentConsumerConcurrentTest.java          |   0
 .../camel/processor/IdempotentConsumerDslTest.java |   0
 .../processor/IdempotentConsumerEagerTest.java     |   0
 .../IdempotentConsumerNoMessageIdTest.java         |   0
 .../IdempotentConsumerRemoveOnFailureTest.java     |   0
 .../IdempotentConsumerRepoExceptionTest.java       |   0
 .../camel/processor/IdempotentConsumerTest.java    |   0
 ...dempotentConsumerUsingCustomRepositoryTest.java |   0
 .../processor/InheritErrorHandlerDefaultTest.java  |   0
 .../processor/InheritErrorHandlerFalseTest.java    |   0
 .../processor/InheritErrorHandlerTrueTest.java     |   0
 .../camel/processor/InlinedProcessorIdTest.java    |   0
 .../org/apache/camel/processor/JoinRoutesTest.java |   0
 .../camel/processor/LanguageBuilderTest.java       |   0
 .../apache/camel/processor/LogEipListenerTest.java |   0
 .../org/apache/camel/processor/LogEipMaskTest.java |   0
 .../processor/LogEipPropagateExceptionTest.java    |   0
 .../camel/processor/LogGlobalLogNameTest.java      |   0
 .../apache/camel/processor/LogProcessorTest.java   |   0
 .../LogProcessorWithProvidedLoggerTest.java        |   0
 .../apache/camel/processor/LogPropertiesTest.java  |   0
 .../apache/camel/processor/LoopAsyncCopyTest.java  |   0
 .../camel/processor/LoopAsyncNoCopyTest.java       |   0
 .../apache/camel/processor/LoopCopyErrorTest.java  |   0
 .../org/apache/camel/processor/LoopCopyTest.java   |   0
 .../apache/camel/processor/LoopDoWhileTest.java    |   0
 .../apache/camel/processor/LoopExceptionTest.java  |   0
 .../org/apache/camel/processor/LoopNoCopyTest.java |   0
 .../java/org/apache/camel/processor/LoopTest.java  |   0
 .../apache/camel/processor/LoopTestProcessor.java  |   0
 .../camel/processor/LoopWithAggregatorTest.java    |   0
 .../org/apache/camel/processor/MDCAsyncTest.java   |   0
 .../processor/MDCOnCompletionOnCompletionTest.java |   0
 .../camel/processor/MDCOnCompletionTest.java       |   0
 .../org/apache/camel/processor/MDCResetTest.java   |   0
 .../java/org/apache/camel/processor/MDCTest.java   |   0
 .../org/apache/camel/processor/MDCWireTapTest.java |   0
 .../camel/processor/MDCWithBreadcrumbTest.java     |   0
 .../camel/processor/MarkRollbackOnlyTest.java      |   0
 .../processor/MessageHistoryCopyExchangeTest.java  |   0
 .../processor/MessageHistoryDumpRoutingTest.java   |   0
 .../apache/camel/processor/MethodFilterTest.java   |   0
 .../MultiCastParallelAndStreamCachingTest.java     |   0
 .../MultiCastStreamCachingInSubRouteTest.java      |   0
 .../MultiErrorHandlerInRouteNotHandledTest.java    |   0
 .../processor/MultiErrorHandlerInRouteTest.java    |   0
 .../processor/MulticastCompletedPropertyTest.java  |   0
 .../MulticastCopyOfSplitSubUnitOfWorkTest.java     |   0
 .../apache/camel/processor/MulticastDslTest.java   |   0
 .../MulticastFineGrainedErrorHandlingTest.java     |   0
 .../MulticastGroupedExchangeExceptionTest.java     |   0
 .../MulticastKeepOriginalMessageUnchangedTest.java |   0
 .../camel/processor/MulticastNoOnPrepareTest.java  |   0
 .../processor/MulticastNoStopOnExceptionTest.java  |   0
 .../camel/processor/MulticastOnPrepareTest.java    |   0
 .../MulticastParallelAllTimeoutAwareTest.java      |   0
 .../MulticastParallelFailureEndpointTest.java      |   0
 ...ticastParallelFineGrainedErrorHandlingTest.java |   0
 .../MulticastParallelLastTimeoutTest.java          |   0
 .../MulticastParallelMiddleTimeoutTest.java        |   0
 .../MulticastParallelNoStopOnExceptionTest.java    |   0
 .../MulticastParallelStopOnExceptionTest.java      |   0
 .../processor/MulticastParallelStreamingTest.java  |   0
 .../MulticastParallelStreamingTimeoutTest.java     |   0
 .../MulticastParallelStreamingTwoTimeoutTest.java  |   0
 .../processor/MulticastParallelStressTest.java     |   0
 .../camel/processor/MulticastParallelTest.java     |   0
 .../processor/MulticastParallelTimeout2Test.java   |   0
 .../processor/MulticastParallelTimeout3Test.java   |   0
 .../MulticastParallelTimeoutAwareTest.java         |   0
 .../processor/MulticastParallelTimeoutTest.java    |   0
 .../MulticastParallelTwoTimeoutMiddleTest.java     |   0
 .../processor/MulticastParallelTwoTimeoutTest.java |   0
 .../camel/processor/MulticastPipelineTest.java     |   0
 .../camel/processor/MulticastRedeliverTest.java    |   0
 ...castStopOnExceptionLastWithOnExceptionTest.java |   0
 .../processor/MulticastStopOnExceptionTest.java    |   0
 ...ulticastStopOnExceptionWithOnExceptionTest.java |   0
 .../processor/MulticastStreamCachingTest.java      |   0
 .../processor/MulticastSubUnitOfWorkTest.java      |   0
 .../org/apache/camel/processor/MulticastTest.java  |   0
 .../processor/MulticastThreadPoolProfileTest.java  |   0
 .../camel/processor/MulticastUnitOfWorkTest.java   |   0
 .../MulticastWithOnExceptionFirstTest.java         |   0
 .../MulticastWithOnExceptionLastTest.java          |   0
 .../processor/MulticastWithOnExceptionTest.java    |   0
 .../camel/processor/MyAggregationStrategy.java     |   0
 .../apache/camel/processor/MyDelayCalcBean.java    |   0
 .../camel/processor/MyLoggingSentEventNotifer.java |   0
 .../org/apache/camel/processor/MyNormalizer.java   |   0
 .../camel/processor/MySentEventNotifier.java       |   0
 .../org/apache/camel/processor/MyValidator.java    |   0
 .../apache/camel/processor/NavigateRouteTest.java  |   0
 .../camel/processor/NestedChoiceIssueTest.java     |   0
 .../processor/NewProcessorAndServiceTest.java      |   0
 .../org/apache/camel/processor/NormalizerTest.java |   0
 ...deliveryWhileStoppingDeadLetterChannelTest.java |   0
 .../NotAllowRedeliveryWhileStoppingTest.java       |   0
 ...letionAndInterceptAndOnExceptionGlobalTest.java |   0
 ...nCompletionAndInterceptGlobalSSEnabledTest.java |   0
 .../OnCompletionAndInterceptGlobalTest.java        |   0
 .../processor/OnCompletionAndInterceptTest.java    |   0
 .../camel/processor/OnCompletionAsyncTest.java     |   0
 .../camel/processor/OnCompletionContainsTest.java  |   0
 .../OnCompletionGlobalCustomPoolTest.java          |   0
 .../camel/processor/OnCompletionGlobalTest.java    |   0
 .../OnCompletionInvalidConfiguredTest.java         |   0
 .../camel/processor/OnCompletionModeTest.java      |   0
 .../OnCompletionMoreGlobalRouteCompletionTest.java |   0
 .../processor/OnCompletionMoreGlobalTest.java      |   0
 .../processor/OnCompletionOnCompleteOnlyTest.java  |   0
 .../processor/OnCompletionOnFailureOnlyTest.java   |   0
 .../OnCompletionParallelProcessingTest.java        |   0
 ...ompletionRouteScopeOverrideGlobalScopeTest.java |   0
 .../processor/OnCompletionShouldBeLastTest.java    |   0
 .../OnCompletionShutdownProcessorTest.java         |   0
 .../apache/camel/processor/OnCompletionTest.java   |   0
 .../processor/OnCompletionUseOriginalBodyTest.java |   0
 .../camel/processor/OnCompletionWhenTest.java      |   0
 .../processor/OnExceptionContinueToRouteTest.java  |   0
 .../processor/OnExceptionFailureRouteIdTest.java   |   0
 .../camel/processor/PipelineConcurrentTest.java    |   0
 .../apache/camel/processor/PipelineMEPTest.java    |   0
 .../camel/processor/PipelineStepWithEventTest.java |   0
 .../org/apache/camel/processor/PipelineTest.java   |   0
 .../camel/processor/PolicyPerProcessorTest.java    |   0
 .../apache/camel/processor/PolicyPerRouteTest.java |   0
 .../ProcessorMutateExchangeRedeliverTest.java      |   0
 .../ProducerTemplateDisableEventNotifierTest.java  |   0
 .../RandomLoadBalanceJavaDSLBuilderTest.java       |   0
 .../camel/processor/RandomLoadBalanceTest.java     |   0
 .../RecipientListAggregationStrategyTest.java      |   0
 .../processor/RecipientListBeanOnPrepareTest.java  |   0
 .../RecipientListBeanSubUnitOfWorkTest.java        |   0
 .../camel/processor/RecipientListBeanTest.java     |   0
 ...pientListContextScopedOnExceptionIssueTest.java |   0
 .../RecipientListDoNotStopOnExceptionTest.java     |   0
 .../RecipientListExchangePatternOptionTest.java    |   0
 ...istExchangePropertyAggregationStrategyTest.java |   0
 .../RecipientListExchangePropertyTest.java         |   0
 .../RecipientListFineGrainedErrorHandlingTest.java |   0
 .../processor/RecipientListFunctionalTest.java     |   0
 .../RecipientListIgnoreInvalidEndpointsTest.java   |   0
 ...cipientListInvalidEndpointErrorHandlerTest.java |   0
 ...tInvalidEndpointIgnoreInvalidEndpointsTest.java |   0
 .../camel/processor/RecipientListLeakTest.java     |   0
 .../camel/processor/RecipientListMEPTest.java      |   0
 .../processor/RecipientListMEPWithRawTest.java     |   0
 .../camel/processor/RecipientListNoCacheTest.java  |   0
 .../processor/RecipientListNoErrorHandlerTest.java |   0
 .../processor/RecipientListOnPrepareTest.java      |   0
 ...ntListParallelAggregateThreadPoolIssueTest.java |   0
 ...ntListParallelFineGrainedErrorHandlingTest.java |   0
 ...ParallelStopOnExceptionWithOnExceptionTest.java |   0
 .../RecipientListParallelStreamingTest.java        |   0
 .../camel/processor/RecipientListParallelTest.java |   0
 .../RecipientListParallelTimeoutTest.java          |   0
 .../processor/RecipientListRedeliverTest.java      |   0
 .../processor/RecipientListReturnValueTest.java    |   0
 .../RecipientListStopOnExceptionTest.java          |   0
 ...ientListStopOnExceptionWithOnExceptionTest.java |   0
 .../processor/RecipientListSubUnitOfWorkTest.java  |   0
 .../apache/camel/processor/RecipientListTest.java  |   0
 ...ipientListThrowExceptionFromExpressionTest.java |   0
 .../RecipientListThrowExceptionSubRouteTest.java   |   0
 .../RecipientListWithArrayHeaderTest.java          |   0
 .../processor/RecipientListWithDelimiterTest.java  |   0
 .../RecipientListWithSimpleExpressionTest.java     |   0
 ...RecipientListWithStringDelimitedHeaderTest.java |   0
 ...cipientListWithStringDelimitedPropertyTest.java |   0
 .../camel/processor/RedeliverToSubRouteTest.java   |   0
 .../RedeliverWithExceptionAndFaultTest.java        |   0
 ...tterErrorHandlerNoRedeliveryOnShutdownTest.java |   0
 .../RedeliveryErrorHandlerBlockedDelayTest.java    |   0
 ...veryErrorHandlerBreakoutDuringShutdownTest.java |   0
 .../RedeliveryErrorHandlerLogHandledTest.java      |   0
 ...veryErrorHandlerNoRedeliveryOnShutdownTest.java |   0
 .../RedeliveryErrorHandlerNonBlockedDelayTest.java |   0
 ...ErrorHandlerNonBlockedRedeliveryHeaderTest.java |   0
 .../RedeliveryOnExceptionBlockedDelayTest.java     |   0
 .../RedeliveryPolicyDelayPatternTest.java          |   0
 .../RedeliveryPolicyPerExceptionTest.java          |   0
 ...deliveryWithExceptionAndFaultDelayInHeader.java |   0
 .../org/apache/camel/processor/RegExRouteTest.java |   0
 .../apache/camel/processor/RemoveHeaderTest.java   |   0
 .../camel/processor/RemoveHeadersExcludeTest.java  |   0
 .../apache/camel/processor/RemoveHeadersTest.java  |   0
 .../RemovePropertiesWithExclusionTest.java         |   0
 .../RemovePropertiesWithoutExclusionTest.java      |   0
 .../apache/camel/processor/RemovePropertyTest.java |   0
 .../ResequenceBatchIgnoreInvalidExchangesTest.java |   0
 ...sequenceBatchNotIgnoreInvalidExchangesTest.java |   0
 ...ResequenceStreamIgnoreInvalidExchangesTest.java |   0
 ...equenceStreamNotIgnoreInvalidExchangesTest.java |   0
 .../ResequenceStreamRejectOldExchangesTest.java    |   0
 .../apache/camel/processor/ResequencerTest.java    |   0
 .../camel/processor/RollbackCustomMessageTest.java |   0
 .../processor/RollbackDefaultErrorHandlerTest.java |   0
 .../processor/RollbackDefaultMessageTest.java      |   0
 .../org/apache/camel/processor/RollbackTest.java   |   0
 .../camel/processor/RoundRobinLoadBalanceTest.java |   0
 .../camel/processor/RouteAutoStartupTest.java      |   0
 .../camel/processor/RouteAwareRouteTest.java       |   0
 .../processor/RouteAwareSynchronizationTest.java   |   0
 .../camel/processor/RouteContextProcessorTest.java |   0
 .../camel/processor/RouteFormattedUriTest.java     |   0
 .../org/apache/camel/processor/RouteIdTest.java    |   0
 .../camel/processor/RouteMEPOptionalOutTest.java   |   0
 .../camel/processor/RouteNoAutoStartupTest.java    |   0
 .../camel/processor/RoutePerformanceCountTest.java |   0
 .../camel/processor/RoutePerformanceTest.java      |   0
 .../camel/processor/RoutePoliciesRefTest.java      |   0
 .../apache/camel/processor/RoutePoliciesTest.java  |   0
 .../processor/RouteServicesStartupOrderTest.java   |   0
 .../RouteShutdownNotReverseOrderTest.java          |   0
 .../processor/RouteShutdownReverseOrderTest.java   |   0
 .../processor/RouteStartupOrderClashTest.java      |   0
 .../RouteStartupOrderDirectReverseTest.java        |   0
 .../processor/RouteStartupOrderDirectTest.java     |   0
 .../camel/processor/RouteStartupOrderLastTest.java |   0
 .../processor/RouteStartupOrderSimpleTest.java     |   0
 ...StartupOrderSuspendResumeNoAutoStartupTest.java |   0
 .../RouteStartupOrderSuspendResumeTest.java        |   0
 .../camel/processor/RouteStartupOrderTest.java     |   0
 .../RouteStartupOrderWithDefaultTest.java          |   0
 .../org/apache/camel/processor/RouteStopTest.java  |   0
 .../processor/RouteTopLevelMisconfiguredTest.java  |   0
 ...RouteWithConstantFieldFromExchangeFailTest.java |   0
 .../RouteWithConstantFieldFromExchangeTest.java    |   0
 ...utingSlipContextScopedOnExceptionIssueTest.java |   0
 .../apache/camel/processor/RoutingSlipDslTest.java |   0
 .../processor/RoutingSlipInOutAndInOnlyTest.java   |   0
 .../camel/processor/RoutingSlipNoCacheTest.java    |   0
 .../processor/RoutingSlipNoErrorHandlerTest.java   |   0
 .../RoutingSlipNoSuchEndpointExceptionTest.java    |   0
 .../processor/RoutingSlipOnExceptionTest.java      |   0
 .../camel/processor/RoutingSlipRedeliverTest.java  |   0
 ...outingSlipThrowExceptionFromExpressionTest.java |   0
 .../apache/camel/processor/SagaFailuresTest.java   |   0
 .../apache/camel/processor/SagaOptionsTest.java    |   0
 .../camel/processor/SagaPropagationTest.java       |   0
 .../java/org/apache/camel/processor/SagaTest.java  |   0
 .../apache/camel/processor/SagaTimeoutTest.java    |   0
 .../camel/processor/SamplingThrottlerTest.java     |   0
 .../apache/camel/processor/ScriptExternalTest.java |   0
 .../org/apache/camel/processor/ScriptTest.java     |   0
 .../processor/SendExchangePatternOptionTest.java   |   0
 .../camel/processor/SendToNoErrorHandlerTest.java  |   0
 .../processor/SendToNonExistingEndpointTest.java   |   0
 .../camel/processor/SetBodyProcessorTest.java      |   0
 .../camel/processor/SetExchangePatternTest.java    |   0
 .../org/apache/camel/processor/SetHeaderTest.java  |   0
 .../SetHeaderUsingDslExpressionsTest.java          |   0
 .../apache/camel/processor/SetPropertyTest.java    |   0
 .../processor/ShutdownCompleteAllTasksTest.java    |   0
 .../ShutdownCompleteCurrentTaskOnlyTest.java       |   0
 .../apache/camel/processor/ShutdownDeferTest.java  |   0
 .../camel/processor/ShutdownNotDeferTest.java      |   0
 .../ShutdownSedaAndDirectEndpointTest.java         |   0
 .../apache/camel/processor/SimpleDirectTest.java   |   0
 .../camel/processor/SimpleMockSampleTest.java      |   0
 .../org/apache/camel/processor/SimpleMockTest.java |   0
 .../processor/SimpleProcessorIdAwareTest.java      |   0
 .../camel/processor/SimpleProcessorTest.java       |   0
 .../processor/SimpleProcessorTraceableTest.java    |   0
 .../camel/processor/SimpleResultTypeRouteTest.java |   0
 .../camel/processor/SimpleTryCatchFinallyTest.java |   0
 .../camel/processor/SimpleTryFinallyTest.java      |   0
 .../SimpleTryThrowExceptionFinallyTest.java        |   0
 .../org/apache/camel/processor/SimulatorTest.java  |   0
 .../org/apache/camel/processor/SortBodyTest.java   |   0
 .../apache/camel/processor/SortExpressionTest.java |   0
 .../camel/processor/SplitAggregateInOutTest.java   |   0
 .../camel/processor/SplitCustomExpressionTest.java |   0
 .../camel/processor/SplitGroupMultiLinesTest.java  |   0
 .../camel/processor/SplitGroupMultiXmlTest.java    |   0
 .../processor/SplitGroupMultiXmlTokenTest.java     |   0
 .../camel/processor/SplitGroupSkipFirstTest.java   |   0
 .../SplitGroupWrappedMultiXmlTokenTest.java        |   0
 .../camel/processor/SplitIteratorNullTest.java     |   0
 .../camel/processor/SplitParallelTimeoutTest.java  |   0
 .../processor/SplitRefCustomExpressionTest.java    |   0
 ...ubUnitOfWorkStopOnExceptionAndParallelTest.java |   0
 ...SplitSubUnitOfWorkStopOnExceptionIssueTest.java |   0
 .../SplitSubUnitOfWorkStopOnExceptionTest.java     |   0
 .../camel/processor/SplitSubUnitOfWorkTest.java    |   0
 .../SplitSubUnitOfWorkWithMDCLoggingTest.java      |   0
 .../processor/SplitTokenizerGroupDynamicTest.java  |   0
 .../camel/processor/SplitTokenizerGroupTest.java   |   0
 .../processor/SplitTokenizerNamespaceTest.java     |   0
 .../apache/camel/processor/SplitTokenizerTest.java |   0
 .../processor/SplitTokenizerXmlMultilineTest.java  |   0
 .../camel/processor/SplitTwoSubUnitOfWorkTest.java |   0
 .../apache/camel/processor/SplitWithEndTest.java   |   0
 .../camel/processor/SplitterCollateTest.java       |   0
 .../processor/SplitterCompletedPropertyTest.java   |   0
 .../camel/processor/SplitterMethodCallTest.java    |   0
 .../SplitterNoAggregationStrategyTest.java         |   0
 .../processor/SplitterNoStopOnExceptionTest.java   |   0
 .../processor/SplitterNullBodyParallelTest.java    |   0
 .../camel/processor/SplitterNullBodyTest.java      |   0
 .../camel/processor/SplitterOnCompletionTest.java  |   0
 .../SplitterOnPrepareExceptionStreamingTest.java   |   0
 .../processor/SplitterOnPrepareExceptionTest.java  |   0
 .../camel/processor/SplitterOnPrepareTest.java     |   0
 .../processor/SplitterParallelAggregateTest.java   |   0
 .../processor/SplitterParallelBigFileTest.java     |   0
 .../SplitterParallelNoStopOnExceptionTest.java     |   0
 .../SplitterParallelStopOnExceptionTest.java       |   0
 ...ParallelStopOnExceptionWithOnExceptionTest.java |   0
 .../apache/camel/processor/SplitterPojoTest.java   |   0
 .../processor/SplitterPropertyContinuedTest.java   |   0
 ...SplitterShareUnitOfWorkCompletionAwareTest.java |   0
 .../apache/camel/processor/SplitterSkipTest.java   |   0
 .../processor/SplitterStopOnExceptionTest.java     |   0
 ...SplitterStopOnExceptionWithOnExceptionTest.java |   0
 .../camel/processor/SplitterStreamCacheTest.java   |   0
 .../SplitterStreamCachingInSubRouteTest.java       |   0
 .../SplitterStreamingErrorHandlingTest.java        |   0
 ...rStreamingStopOnExceptionErrorHandlingTest.java |   0
 .../processor/SplitterStreamingUoWIssueTest.java   |   0
 .../SplitterStreamingWithErrorHandlerTest.java     |   0
 .../org/apache/camel/processor/SplitterTest.java   |   0
 .../SplitterThrowExceptionFromExpressionTest.java  |   0
 .../camel/processor/SplitterUoWIssueTest.java      |   0
 .../processor/SplitterUseOriginalLoopTest.java     |   0
 ...litterUseOriginalNotPropagateExceptionTest.java |   0
 .../processor/SplitterWireTapStreamCacheTest.java  |   0
 .../SplitterWithCustomThreadPoolExecutorTest.java  |   0
 .../processor/SplitterWithDualMulticastTest.java   |   0
 .../camel/processor/SplitterWithMulticastTest.java |   0
 .../SplitterWithScannerIoExceptionTest.java        |   0
 .../camel/processor/SplitterWithXqureyTest.java    |   0
 .../camel/processor/StaticRecipientListTest.java   |   0
 .../camel/processor/StickyLoadBalanceTest.java     |   0
 .../StreamCachingCustomShouldSpoolRuleTest.java    |   0
 .../camel/processor/StreamCachingInOutTest.java    |   0
 .../processor/StreamCachingOnlyRouteTest.java      |   0
 .../camel/processor/StreamCachingPerRouteTest.java |   0
 .../processor/StreamCachingRecipientListTest.java  |   0
 .../processor/StreamCachingRoutingSlipTest.java    |   0
 .../processor/StreamCachingXPathRouteTest.java     |   0
 .../camel/processor/StreamResequencerTest.java     |   0
 ...SourceContentBasedRouterNoErrorHandlerTest.java |   0
 ...tentBasedRouterSSEnabledOnCamelContextTest.java |   0
 .../StreamSourceContentBasedRouterTest.java        |   0
 .../ThreadsCoreAndMaxPoolInvalidTest.java          |   0
 .../ThreadsCoreAndMaxPoolKeepAliveTimeTest.java    |   0
 .../camel/processor/ThreadsCoreAndMaxPoolTest.java |   0
 .../camel/processor/ThreadsCorePoolTest.java       |   0
 .../apache/camel/processor/ThreadsDefaultTest.java |   0
 .../camel/processor/ThreadsInvalidConfigTest.java  |   0
 .../camel/processor/ThreadsMaxQueueSizeTest.java   |   0
 .../processor/ThreadsRejectedExecutionTest.java    |   0
 .../camel/processor/ThreadsRejectedPolicyTest.java |   0
 .../camel/processor/ThreadsRequestReplyTest.java   |   0
 .../processor/ThreadsZeroInCoreAndMaxPoolTest.java |   0
 .../ThrottlerAsyncDelayedCallerRunsTest.java       |   0
 .../camel/processor/ThrottlerAsyncDelayedTest.java |   0
 .../apache/camel/processor/ThrottlerDslTest.java   |   0
 .../processor/ThrottlerInvalidConfiguredTest.java  |   0
 .../camel/processor/ThrottlerMethodCallTest.java   |   0
 .../camel/processor/ThrottlerNullEvalTest.java     |   0
 .../org/apache/camel/processor/ThrottlerTest.java  |   0
 .../processor/ThrottlerThreadPoolProfileTest.java  |   0
 .../camel/processor/ThrottlingException.java       |   0
 ...xceptionRoutePolicyHalfOpenHandlerSedaTest.java |   0
 ...ingExceptionRoutePolicyHalfOpenHandlerTest.java |   0
 ...ThrottlingExceptionRoutePolicyHalfOpenTest.java |   0
 ...lingExceptionRoutePolicyKeepOpenOnInitTest.java |   0
 ...tlingExceptionRoutePolicyOpenViaConfigTest.java |   0
 .../ThrottlingExceptionRoutePolicyTest.java        |   0
 .../camel/processor/ThrottlingGroupingTest.java    |   0
 .../ThrottlingInflightRoutePolicyTest.java         |   0
 .../camel/processor/ThrowExceptionMessageTest.java |   0
 .../processor/ThrowExceptionNullMessageTest.java   |   0
 .../apache/camel/processor/ThrowExceptionTest.java |   0
 .../apache/camel/processor/ToDynamicEmptyTest.java |   0
 .../camel/processor/ToDynamicIgnoreTest.java       |   0
 ...DynamicLanguageSimpleAndXPathAndHeaderTest.java |   0
 .../ToDynamicLanguageSimpleAndXPathTest.java       |   0
 .../processor/ToDynamicLanguageXPathTest.java      |   0
 .../camel/processor/ToDynamicRawAndXPathTest.java  |   0
 .../apache/camel/processor/ToDynamicRawTest.java   |   0
 .../processor/ToDynamicSendDynamicAwareTest.java   |   0
 .../org/apache/camel/processor/ToDynamicTest.java  |   0
 .../camel/processor/ToEndpointPropertyTest.java    |   0
 .../camel/processor/TopicLoadBalanceTest.java      |   0
 .../apache/camel/processor/TraceDelayerTest.java   |   0
 .../camel/processor/TraceInterceptorTest.java      |   0
 .../camel/processor/TracePerRouteManualTest.java   |   0
 .../camel/processor/TracerConfigurationTest.java   |   0
 .../processor/TransformBeanExceptionTest.java      |   0
 .../processor/TransformExternalScriptTest.java     |   0
 .../camel/processor/TransformProcessorTest.java    |   0
 .../TransformProcessorWithHeaderTest.java          |   0
 .../org/apache/camel/processor/TransformTest.java  |   0
 .../camel/processor/TransformViaDSLTest.java       |   0
 .../apache/camel/processor/TransformXpathTest.java |   0
 .../processor/TripleNestedChoiceIssueTest.java     |   0
 .../TryCatchCaughtExceptionFinallyTest.java        |   0
 .../processor/TryCatchCaughtExceptionTest.java     |   0
 .../TryCatchCaughtExceptionTwoTimesTest.java       |   0
 .../processor/TryCatchContinueToRouteTest.java     |   0
 .../TryCatchMustHaveExceptionConfiguredTest.java   |   0
 .../camel/processor/TryCatchNestedChoiceTest.java  |   0
 .../camel/processor/TryCatchRecipientListTest.java |   0
 .../processor/TryFinallyCaughtExceptionTest.java   |   0
 .../TryProcessorHandleWrappedExceptionTest.java    |   0
 .../TryProcessorMultipleExceptionTest.java         |   0
 .../camel/processor/TryProcessorOnWhenTest.java    |   0
 .../apache/camel/processor/TryProcessorTest.java   |   0
 .../camel/processor/TrySetFaultFinallyTest.java    |   0
 .../apache/camel/processor/TrySetFaultTest.java    |   0
 .../TypeConverterRegistryStatsPerformanceTest.java |   0
 .../camel/processor/UnitOfWorkProducerTest.java    |   0
 .../UnitOfWorkSynchronizationAdapterTest.java      |   0
 .../org/apache/camel/processor/UnitOfWorkTest.java |   0
 .../processor/UnitOfWorkWithAsyncFlowTest.java     |   0
 .../camel/processor/UnmarshalProcessorTest.java    |   0
 .../org/apache/camel/processor/ValidateIdTest.java |   0
 .../apache/camel/processor/ValidateRegExpTest.java |   0
 .../camel/processor/ValidateSimpleRegExpTest.java  |   0
 .../apache/camel/processor/ValidateSimpleTest.java |   0
 .../processor/ValidatingDomProcessorTest.java      |   0
 .../ValidatingProcessorFromSourceTest.java         |   0
 .../processor/ValidatingProcessorFromUrlTest.java  |   0
 .../ValidatingProcessorNotUseSharedSchemaTest.java |   0
 .../camel/processor/ValidatingProcessorTest.java   |   0
 .../ValidationFinallyBlockNoCatchTest.java         |   0
 .../processor/ValidationFinallyBlockTest.java      |   0
 .../org/apache/camel/processor/ValidationTest.java |   0
 ...dationWithErrorInHandleAndFinallyBlockTest.java |   0
 .../processor/ValidationWithExceptionTest.java     |   0
 .../ValidationWithFinallyBlockPipelineTest.java    |   0
 ...lidationWithHandlePipelineAndExceptionTest.java |   0
 .../ValidationWithHandlePipelineTest.java          |   0
 .../ValidationWithInFlowExceptionTest.java         |   0
 .../ValidationWithMultipleHandlesTest.java         |   0
 ...lidationWithNestedFinallyBlockPipelineTest.java |   0
 .../processor/ValidationWithTryCatchTest.java      |   0
 .../camel/processor/VerySimpleDirectTest.java      |   0
 .../processor/WeightedRandomLoadBalanceTest.java   |   0
 .../WeightedRoundRobinLoadBalanceTest.java         |   0
 .../processor/WireTapBeanAsProcessorTest.java      |   0
 .../apache/camel/processor/WireTapBeanTest.java    |   0
 .../camel/processor/WireTapCustomPool2Test.java    |   0
 .../camel/processor/WireTapCustomPoolTest.java     |   0
 .../camel/processor/WireTapExpressionTest.java     |   0
 .../camel/processor/WireTapLogEndpointTest.java    |   0
 .../org/apache/camel/processor/WireTapLogTest.java |   0
 .../camel/processor/WireTapNewExchangeTest.java    |   0
 .../camel/processor/WireTapOnExceptionTest.java    |   0
 .../camel/processor/WireTapOnPrepareRefTest.java   |   0
 .../camel/processor/WireTapOnPrepareTest.java      |   0
 .../camel/processor/WireTapShutdownBeanTest.java   |   0
 .../camel/processor/WireTapShutdownRouteTest.java  |   0
 .../camel/processor/WireTapStreamCachingTest.java  |   0
 .../org/apache/camel/processor/WireTapTest.java    |   0
 ...WireTapUsingFireAndForgetCopyAsDefaultTest.java |   0
 .../WireTapUsingFireAndForgetCopyTest.java         |   0
 .../processor/WireTapUsingFireAndForgetTest.java   |   0
 .../camel/processor/WireTapUsingMulticastTest.java |   0
 .../camel/processor/WireTapVoidBeanTest.java       |   0
 .../apache/camel/processor/XPathChoiceTest.java    |   0
 .../apache/camel/processor/XPathFilterTest.java    |   0
 ...ithNamespaceBuilderFilterAndResultTypeTest.java |   0
 .../XPathWithNamespaceBuilderFilterTest.java       |   0
 .../processor/XPathWithNamespacesFilterTest.java   |   0
 .../aggregator/AbstractDistributedTest.java        |   0
 ...ggregateAggregationStrategyIsPredicateTest.java |   0
 .../AggregateClosedCorrelationKeyTest.java         |   0
 .../aggregator/AggregateCompleteAllOnStopTest.java |   0
 ...yBatchConsumerSendEmptyMessageWhenIdleTest.java |   0
 ...gateCompletionAwareAggregationStrategyTest.java |   0
 .../AggregateCompletionIntervalTest.java           |   0
 ...gregateCompletionOnNewCorrelationGroupTest.java |   0
 .../aggregator/AggregateCompletionOnlyOneTest.java |   0
 .../aggregator/AggregateCompletionOnlyTwoTest.java |   0
 .../AggregateCompletionPredicateTest.java          |   0
 ...ggregateCompletionSizeAndBatchConsumerTest.java |   0
 ...gateCompletionSizeExpressionAndTimeoutTest.java |   0
 .../AggregateConcurrentPerCorrelationKeyTest.java  |   0
 .../aggregator/AggregateControllerTest.java        |   0
 .../aggregator/AggregateDiscardOnTimeoutTest.java  |   0
 .../processor/aggregator/AggregateDslTest.java     |   0
 .../AggregateEagerCheckCompletionTest.java         |   0
 .../AggregateExpressionSizeFallbackTest.java       |   0
 .../AggregateExpressionSizeOverrideFixedTest.java  |   0
 ...gateExpressionSizeOverrideFixedTimeoutTest.java |   0
 .../aggregator/AggregateExpressionSizeTest.java    |   0
 .../aggregator/AggregateExpressionTest.java        |   0
 .../AggregateExpressionTimeoutFallbackTest.java    |   0
 .../AggregateExpressionTimeoutPerGroupTest.java    |   0
 .../aggregator/AggregateExpressionTimeoutTest.java |   0
 ...eCompletionHeaderInAggregationStrategyTest.java |   0
 .../AggregateForceCompletionHeaderTest.java        |   0
 ...AggregateForceCompletionOnStopParallelTest.java |   0
 .../AggregateForceCompletionOnStopTest.java        |   0
 .../aggregator/AggregateFromWireTapTest.java       |   0
 .../aggregator/AggregateGroupMessageTest.java      |   0
 .../AggregateGroupedExchangeBackwardsCompTest.java |   0
 .../AggregateGroupedExchangeBatchSizeTest.java     |   0
 ...roupedExchangeCompletionExpressionSizeTest.java |   0
 ...AggregateGroupedExchangeCompletionSizeTest.java |   0
 ...gateGroupedExchangeMultipleCorrelationTest.java |   0
 .../AggregateGroupedExchangeSizePredicateTest.java |   0
 .../AggregateGroupedExchangeSizeTest.java          |   0
 .../aggregator/AggregateGroupedExchangeTest.java   |   0
 .../AggregateIgnoreInvalidCorrelationKeysTest.java |   0
 .../aggregator/AggregateLostGroupIssueTest.java    |   0
 .../aggregator/AggregateMultipleSourceTest.java    |   0
 .../AggregateNewExchangeAndConfirmTest.java        |   0
 .../AggregateParallelProcessingTest.java           |   0
 .../AggregatePreCompleteAwareStrategyTest.java     |   0
 ...gregatePreCompleteAwareStrategyTimeoutTest.java |   0
 .../aggregator/AggregateProcessorTest.java         |   0
 ...egateProcessorTimeoutCompletionRestartTest.java |   0
 .../AggregateRepositoryReturnNullTest.java         |   0
 .../AggregateShouldSkipFilteredExchangesTest.java  |   0
 .../AggregateShutdownThreadPoolTest.java           |   0
 .../AggregateSimpleExpressionIssueTest.java        |   0
 .../AggregateSimplePredicateEagerTest.java         |   0
 .../aggregator/AggregateSimplePredicateTest.java   |   0
 .../aggregator/AggregateSimpleSizeTest.java        |   0
 .../aggregator/AggregateSimpleTimeoutTest.java     |   0
 .../aggregator/AggregateStrategyServiceTest.java   |   0
 .../aggregator/AggregateThreadPoolProfileTest.java |   0
 .../aggregator/AggregateTimeoutManualTest.java     |   0
 .../aggregator/AggregateTimeoutOnlyTest.java       |   0
 .../processor/aggregator/AggregateTimeoutTest.java |   0
 .../AggregateTimeoutWithExecutorServiceTest.java   |   0
 .../AggregateTimeoutWithNoExecutorServiceTest.java |   0
 .../AggregateUnknownExecutorServiceRefTest.java    |   0
 .../AggregationStrategyAsPredicateTest.java        |   0
 ...trategyBeanAdapterAllowNullOldExchangeTest.java |   0
 ...ggregationStrategyBeanAdapterAllowNullTest.java |   0
 ...tionStrategyBeanAdapterNonStaticMethodTest.java |   0
 ...ggregationStrategyBeanAdapterOneMethodTest.java |   0
 ...nAdapterPollEnrichAllowNullNewExchangeTest.java |   0
 ...gregationStrategyBeanAdapterPollEnrichTest.java |   0
 ...gationStrategyBeanAdapterRefMethodNameTest.java |   0
 .../AggregationStrategyBeanAdapterRefTest.java     |   0
 ...egationStrategyBeanAdapterStaticMethodTest.java |   0
 .../AggregationStrategyBeanAdapterTest.java        |   0
 ...egyBeanAdapterWithHeadersAndPropertiesTest.java |   0
 ...regationStrategyBeanAdapterWithHeadersTest.java |   0
 .../AggregationStrategyCompleteByPropertyTest.java |   0
 .../AggregationStrategyLifecycleTest.java          |   0
 .../aggregator/AggregatorAndOnExceptionTest.java   |   0
 .../aggregator/AggregatorConcurrencyTest.java      |   0
 .../aggregator/AggregatorExceptionHandleTest.java  |   0
 .../AggregatorExceptionInPredicateTest.java        |   0
 .../aggregator/AggregatorExceptionTest.java        |   0
 .../aggregator/AggregatorLockingTest.java          |   0
 .../camel/processor/aggregator/AggregatorTest.java |   0
 .../aggregator/AlbertoAggregatorTest.java          |   0
 .../aggregator/BeanBeforeAggregateIssueTest.java   |   0
 .../CustomAggregationStrategyServiceTest.java      |   0
 .../aggregator/CustomAggregationStrategyTest.java  |   0
 ...ionStrategyCompletionFromBatchConsumerTest.java |   0
 ...ustomListAggregationStrategyEmptySplitTest.java |   0
 .../CustomListAggregationStrategySplitTest.java    |   0
 .../CustomListAggregationStrategyTest.java         |   0
 .../DefaultAggregatorCollectionTest.java           |   0
 .../DistributedCompletionIntervalTest.java         |   0
 ...DistributedConcurrentPerCorrelationKeyTest.java |   0
 .../DistributedOptimisticLockFailingTest.java      |   0
 .../aggregator/DistributedTimeoutTest.java         |   0
 .../EnricherRouteNumberOfProcessorTest.java        |   0
 .../aggregator/MyAggregationStrategyService.java   |   0
 .../aggregator/MyCompletionProcessor.java          |   0
 .../aggregator/OptimisticLockRetryPolicyTest.java  |   0
 .../PredicateAggregatorCollectionTest.java         |   0
 .../SplitRouteNumberOfProcessorTest.java           |   0
 ...yncDeadLetterChannelExecutorServiceRefTest.java |   0
 .../async/AsyncDeadLetterChannelTest.java          |   0
 .../async/AsyncDefaultErrorHandlerTest.java        |   0
 .../processor/async/AsyncEndpointCBRTest.java      |   0
 .../AsyncEndpointCustomAsyncInterceptorTest.java   |   0
 .../async/AsyncEndpointCustomInterceptorTest.java  |   0
 .../async/AsyncEndpointCustomRoutePolicyTest.java  |   0
 .../processor/async/AsyncEndpointDelayUoWTest.java |   0
 .../async/AsyncEndpointDoWhileLoopTest.java        |   0
 .../async/AsyncEndpointDualMulticastTest.java      |   0
 .../AsyncEndpointDualTopicLoadBalanceTest.java     |   0
 .../async/AsyncEndpointDynamicRouterTest.java      |   0
 .../processor/async/AsyncEndpointEnricherTest.java |   0
 .../AsyncEndpointEventNotifierSendingTest.java     |   0
 .../async/AsyncEndpointEventNotifierTest.java      |   0
 ...AsyncEndpointFailOverLoadBalanceMixed2Test.java |   0
 ...AsyncEndpointFailOverLoadBalanceMixed3Test.java |   0
 .../AsyncEndpointFailOverLoadBalanceMixedTest.java |   0
 ...ncEndpointFailOverLoadBalanceOnlyAsyncTest.java |   0
 ...ncEndpointFailedAfterDeadLetterChannelTest.java |   0
 ...EndpointFailedAfterOnExceptionContinueTest.java |   0
 ...cEndpointFailedAfterOnExceptionHandledTest.java |   0
 .../async/AsyncEndpointFailedAfterTest.java        |   0
 .../AsyncEndpointFailureProcessorContinueTest.java |   0
 .../async/AsyncEndpointFailureProcessorTest.java   |   0
 .../processor/async/AsyncEndpointFilterTest.java   |   0
 .../async/AsyncEndpointIdempotentConsumerTest.java |   0
 .../processor/async/AsyncEndpointLoopTest.java     |   0
 ...pointMulticastFineGrainedErrorHandlingTest.java |   0
 .../async/AsyncEndpointMulticastTest.java          |   0
 .../processor/async/AsyncEndpointPipelineTest.java |   0
 .../processor/async/AsyncEndpointPolicyTest.java   |   0
 .../async/AsyncEndpointRecipientList2Test.java     |   0
 .../async/AsyncEndpointRecipientList3Test.java     |   0
 .../async/AsyncEndpointRecipientList4Test.java     |   0
 .../async/AsyncEndpointRecipientListBean3Test.java |   0
 .../async/AsyncEndpointRecipientListBean4Test.java |   0
 .../async/AsyncEndpointRecipientListBeanTest.java  |   0
 ...tRecipientListFineGrainedErrorHandlingTest.java |   0
 .../AsyncEndpointRecipientListParallel2Test.java   |   0
 .../AsyncEndpointRecipientListParallel3Test.java   |   0
 .../AsyncEndpointRecipientListParallel4Test.java   |   0
 .../AsyncEndpointRecipientListParallel5Test.java   |   0
 .../AsyncEndpointRecipientListParallelTest.java    |   0
 .../async/AsyncEndpointRecipientListTest.java      |   0
 ...RedeliveryErrorHandlerNonBlockedDelay2Test.java |   0
 ...RedeliveryErrorHandlerNonBlockedDelay3Test.java |   0
 ...tRedeliveryErrorHandlerNonBlockedDelayTest.java |   0
 .../AsyncEndpointRoundRobinLoadBalanceTest.java    |   0
 .../async/AsyncEndpointRoutingSlip2Test.java       |   0
 .../async/AsyncEndpointRoutingSlip3Test.java       |   0
 .../async/AsyncEndpointRoutingSlipBean2Test.java   |   0
 .../async/AsyncEndpointRoutingSlipBean3Test.java   |   0
 ...syncEndpointRoutingSlipBeanNonBlockingTest.java |   0
 .../async/AsyncEndpointRoutingSlipBeanTest.java    |   0
 .../async/AsyncEndpointRoutingSlipTest.java        |   0
 .../processor/async/AsyncEndpointSamplingTest.java |   0
 .../async/AsyncEndpointSedaInOnlyTest.java         |   0
 .../processor/async/AsyncEndpointSedaTest.java     |   0
 .../AsyncEndpointSingleTopicLoadBalanceTest.java   |   0
 ...cEndpointSplitFineGrainedErrorHandlingTest.java |   0
 .../processor/async/AsyncEndpointSplitTest.java    |   0
 ...pointSplitUseLatestAggregationStrategyTest.java |   0
 .../processor/async/AsyncEndpointStopTest.java     |   0
 .../async/AsyncEndpointSynchronousFalseTest.java   |   0
 .../async/AsyncEndpointSynchronousTest.java        |   0
 .../camel/processor/async/AsyncEndpointTest.java   |   0
 .../async/AsyncEndpointTransformTest.java          |   0
 .../async/AsyncEndpointTryCatchFinally2Test.java   |   0
 .../async/AsyncEndpointTryCatchFinally3Test.java   |   0
 .../async/AsyncEndpointTryCatchFinally4Test.java   |   0
 .../async/AsyncEndpointTryCatchFinally5Test.java   |   0
 .../async/AsyncEndpointTryCatchFinallyTest.java    |   0
 .../async/AsyncEndpointUoWFailedTest.java          |   0
 .../processor/async/AsyncEndpointUoWTest.java      |   0
 .../async/AsyncEndpointWithDelayerTest.java        |   0
 .../async/AsyncEndpointWithHandleFaultTest.java    |   0
 .../async/AsyncEndpointWithStreamCachingTest.java  |   0
 .../async/AsyncEndpointWithTracingTest.java        |   0
 ...FailureProcessorWithRedeliveryAndDelayTest.java |   0
 .../AsyncFailureProcessorWithRedeliveryTest.java   |   0
 .../processor/async/AsyncInOnlyEndpointTest.java   |   0
 .../apache/camel/processor/async/AsyncMDCTest.java |   0
 .../async/AsyncNestedTripleChoiceIssueTest.java    |   0
 ...xceptionFailureProcessorWithRedeliveryTest.java |   0
 .../AsyncProcessorAwaitManagerInterruptTest.java   |   0
 ...sorAwaitManagerInterruptWithRedeliveryTest.java |   0
 .../async/AsyncProcessorAwaitManagerTest.java      |   0
 .../camel/processor/async/AsyncProducerTest.java   |   0
 .../processor/async/AsyncRouteWithErrorTest.java   |   0
 .../async/AsyncSedaInOnlyEndpointTest.java         |   0
 .../processor/async/AsyncTwoEndpointTest.java      |   0
 .../camel/processor/async/MyAsyncComponent.java    |   0
 .../camel/processor/async/MyAsyncEndpoint.java     |   0
 .../camel/processor/async/MyAsyncProducer.java     |   0
 .../DynamicRouterConcurrentPOJOTest.java           |   0
 .../EnrichExpressionIgnoreInvalidEndpointTest.java |   0
 .../enricher/EnrichExpressionNoCacheTest.java      |   0
 .../processor/enricher/EnrichExpressionTest.java   |   0
 .../enricher/EnricherAggregateOnExceptionTest.java |   0
 .../EnricherAsyncUnhandledExceptionTest.java       |   0
 .../EnricherDefaultAggregationStrategyTest.java    |   0
 .../camel/processor/enricher/EnricherDslTest.java  |   0
 .../processor/enricher/EnricherNoResourceTest.java |   0
 .../camel/processor/enricher/EnricherRefTest.java  |   0
 .../processor/enricher/EnricherSendEventTest.java  |   0
 .../camel/processor/enricher/EnricherTest.java     |   0
 .../camel/processor/enricher/FailureProcessor.java |   0
 .../enricher/PollEnrichBridgeErrorHandlerTest.java |   0
 ...lEnrichExpressionIgnoreInvalidEndpointTest.java |   0
 .../enricher/PollEnrichExpressionNoCacheTest.java  |   0
 .../enricher/PollEnrichExpressionTest.java         |   0
 ...ollEnrichFileCustomAggregationStrategyTest.java |   0
 ...llEnrichFileDefaultAggregationStrategyTest.java |   0
 .../processor/enricher/PollEnrichNullBodyTest.java |   0
 .../PollEnricherAggregateOnExceptionTest.java      |   0
 .../enricher/PollEnricherNoResourceTest.java       |   0
 .../processor/enricher/PollEnricherRefTest.java    |   0
 .../camel/processor/enricher/PollEnricherTest.java |   0
 .../camel/processor/enricher/SampleAggregator.java |   0
 .../CustomExceptionPolicyStrategyTest.java         |   0
 .../DefaultExceptionPolicyStrategyTest.java        |   0
 ...ltExceptionPolicyStrategyUsingOnlyWhenTest.java |   0
 ...efaultExceptionPolicyStrategyUsingWhenTest.java |   0
 .../intercept/DualInterceptSimpleRouteTest.java    |   0
 .../intercept/FromFileInterceptSendToIssue.java    |   0
 .../intercept/IntercepFromWithPredicateTest.java   |   0
 .../InterceptFromEndpointInstanceTest.java         |   0
 .../InterceptFromEndpointRefFixedTest.java         |   0
 .../intercept/InterceptFromEndpointRefTest.java    |   0
 .../InterceptFromEndpointRefUriFixedTest.java      |   0
 .../intercept/InterceptFromEndpointRefUriTest.java |   0
 .../InterceptFromPropertyPlaceholderTest.java      |   0
 .../intercept/InterceptFromRouteTest.java          |   0
 .../intercept/InterceptFromRouteTestSupport.java   |   0
 .../intercept/InterceptFromSimpleLogTest.java      |   0
 .../InterceptFromSimplePredicateTest.java          |   0
 .../InterceptFromSimplePredicateWithStopTest.java  |   0
 .../intercept/InterceptFromSimpleRouteTest.java    |   0
 .../intercept/InterceptFromUriRegexTest.java       |   0
 .../intercept/InterceptFromUriSimpleLogTest.java   |   0
 .../InterceptFromUriWildcardHeaderUriTest.java     |   0
 .../intercept/InterceptFromUriWildcardTest.java    |   0
 .../intercept/InterceptFromWhenNoStopTest.java     |   0
 .../processor/intercept/InterceptFromWhenTest.java |   0
 .../intercept/InterceptFromWhenWithChoiceTest.java |   0
 ...erceptFromWithPredicateAndProceedRouteTest.java |   0
 ...InterceptFromWithPredicateAndStopRouteTest.java |   0
 .../InterceptFromWithPredicateRouteTest.java       |   0
 .../intercept/InterceptFromWithStopRouteTest.java  |   0
 .../InterceptFromWithoutProceedRouteTest.java      |   0
 ...nterceptSendToEndpointConditionalSkip2Test.java |   0
 ...nterceptSendToEndpointConditionalSkip3Test.java |   0
 ...InterceptSendToEndpointConditionalSkipTest.java |   0
 .../InterceptSendToEndpointDynamicTest.java        |   0
 .../InterceptSendToEndpointInOnException.java      |   0
 .../InterceptSendToEndpointMultipleRoutesTest.java |   0
 ...nterceptSendToEndpointNormalizePatternTest.java |   0
 .../intercept/InterceptSendToEndpointTest.java     |   0
 .../InterceptSendToEndpointWithParametersTest.java |   0
 .../InterceptSendToEndpointWithStopTest.java       |   0
 .../intercept/InterceptSendToExceptionTest.java    |   0
 .../intercept/InterceptSendToFaultTest.java        |   0
 .../processor/intercept/InterceptSendToIssue.java  |   0
 .../intercept/InterceptSimpleRouteStopTest.java    |   0
 .../intercept/InterceptSimpleRouteTest.java        |   0
 .../InterceptSimpleRouteWhenStopTest.java          |   0
 .../intercept/InterceptSimpleRouteWhenTest.java    |   0
 .../ParentChildInterceptStrategyTest.java          |   0
 ...ipientListInterceptSendToEndpointException.java |   0
 .../interceptor/AdviceWithAutoStartupTest.java     |   0
 ...AdviceWithMockEndpointsHavingParameterTest.java |   0
 .../interceptor/AdviceWithMockEndpointsTest.java   |   0
 .../AdviceWithMockEndpointsWithSkipTest.java       |   0
 ...dviceWithMockMultipleEndpointsWithSkipTest.java |   0
 .../AdviceWithRecipientListMockEndpointsTest.java  |   0
 .../interceptor/AdviceWithReplaceFromTest.java     |   0
 .../interceptor/AdviceWithRouteIdTest.java         |   0
 .../interceptor/AdviceWithTasksMatchTest.java      |   0
 .../AdviceWithTasksOnExceptionTest.java            |   0
 .../interceptor/AdviceWithTasksSelectTest.java     |   0
 .../processor/interceptor/AdviceWithTasksTest.java |   0
 .../AdviceWithTasksToStringPatternTest.java        |   0
 .../processor/interceptor/AdviceWithTest.java      |   0
 .../interceptor/AdviceWithTryCatchTest.java        |   0
 ...eWithTwoRoutesContextScopedOnExceptionTest.java |   0
 .../AdviceWithTwoRoutesOnExceptionTest.java        |   0
 .../interceptor/AdviceWithTwoRoutesTest.java       |   0
 .../processor/interceptor/AdviceWithTypeTest.java  |   0
 .../AdviceWithWeaveAfterLastSplitTest.java         |   0
 .../AdviceWithWeaveByStringOnChoiceTest.java       |   0
 .../AdviceWithWeaveByTypeOnExceptionTest.java      |   0
 .../interceptor/AdviceWithWeaveFirstLastTest.java  |   0
 .../interceptor/AdviceWithWeaveLastCBRTest.java    |   0
 .../AdviceWithWeaveToUriAndAddLastTest.java        |   0
 .../AuditInterceptorAsyncDelegateIssueTest.java    |   0
 .../AuditInterceptorDelegateIssueTest.java         |   0
 .../processor/interceptor/ConditionSupport.java    |   0
 .../CustomInterceptorRouteWithChildOutputTest.java |   0
 .../interceptor/DebugExceptionBreakpointTest.java  |   0
 .../DebugExceptionEventBreakpointTest.java         |   0
 .../interceptor/DebugSingleStepConditionTest.java  |   0
 .../processor/interceptor/DebugSingleStepTest.java |   0
 .../camel/processor/interceptor/DebugTest.java     |   0
 .../InterceptorStrategyNotOrderedTest.java         |   0
 .../InterceptorStrategyOrderedTest.java            |   0
 .../processor/interceptor/NoStreamCachingTest.java |   0
 ...xtScopedOnExceptionCorrectRouteContextTest.java |   0
 ...ScopedOnExceptionLoadBalancerStopRouteTest.java |   0
 .../ContextScopedOnExceptionLogRouteTest.java      |   0
 ...efaultErrorHandlerExchangeFormatterRefTest.java |   0
 .../DefaultErrorHandlerRetryWhileTest.java         |   0
 .../onexception/DoCatchDirectDynamicRouteTest.java |   0
 .../DoCatchDirectRecipientListStreamingTest.java   |   0
 .../DoCatchDirectRecipientListTest.java            |   0
 .../onexception/DoCatchDirectRouteTest.java        |   0
 .../ErrorOccurredInOnExceptionRoute.java           |   0
 .../onexception/MyFunctionalException.java         |   0
 .../processor/onexception/MyOwnHandlerBean.java    |   0
 .../camel/processor/onexception/MyServiceBean.java |   0
 .../onexception/MyTechnicalException.java          |   0
 .../processor/onexception/OnCatchHandledTest.java  |   0
 .../onexception/OnExceptionAfterRouteTest.java     |   0
 ...xceptionAndDLCErrorHandlerIssueReverseTest.java |   0
 .../OnExceptionAndDLCErrorHandlerIssueTest.java    |   0
 .../OnExceptionCallSubRouteNoErrorHandlerTest.java |   0
 .../onexception/OnExceptionComplexRouteTest.java   |   0
 ...tionComplexWithNestedErrorHandlerRouteTest.java |   0
 ...rorHandlerRouteWithDefaultErrorHandlerTest.java |   0
 .../OnExceptionContinuePredicateTest.java          |   0
 .../OnExceptionContinueSubRouteTest.java           |   0
 .../OnExceptionContinueSubSubRouteTest.java        |   0
 .../onexception/OnExceptionContinueTest.java       |   0
 .../OnExceptionContinueTwoPredicateTest.java       |   0
 .../onexception/OnExceptionContinueTwoTest.java    |   0
 .../onexception/OnExceptionFromChoiceTest.java     |   0
 .../OnExceptionFromChoiceUseOriginalBodyTest.java  |   0
 ...ptionFromChoiceWithDefaultErrorHandlerTest.java |   0
 ...onGlobalAndDLCErrorHandlerIssueReverseTest.java |   0
 ...ExceptionGlobalAndDLCErrorHandlerIssueTest.java |   0
 .../OnExceptionGlobalScopedRecursionTest.java      |   0
 .../OnExceptionHandleAndThrowNewExceptionTest.java |   0
 .../OnExceptionHandleAndTransformTest.java         |   0
 ...dleAndTransformWithDefaultErrorHandlerTest.java |   0
 .../OnExceptionHandledAndContinueTest.java         |   0
 .../onexception/OnExceptionHandledTest.java        |   0
 .../OnExceptionLoadBalancerDoubleIssueTest.java    |   0
 .../onexception/OnExceptionMisconfiguredTest.java  |   0
 ...nExceptionOccurredProcessorOnExceptionTest.java |   0
 .../OnExceptionOccurredProcessorTest.java          |   0
 ...ceptionProcessorInspectCausedExceptionTest.java |   0
 ...CausedExceptionWithDefaultErrorHandlerTest.java |   0
 .../onexception/OnExceptionRecursionTest.java      |   0
 .../onexception/OnExceptionRetryUntilTest.java     |   0
 ...ptionRetryUntilWithDefaultErrorHandlerTest.java |   0
 .../onexception/OnExceptionRouteIdTest.java        |   0
 .../OnExceptionRouteScopedRecursionTest.java       |   0
 .../onexception/OnExceptionRouteTest.java          |   0
 ...nExceptionRouteWithDefaultErrorHandlerTest.java |   0
 .../onexception/OnExceptionSubRouteTest.java       |   0
 ...ceptionSubRouteWithDefaultErrorHandlerTest.java |   0
 .../OnExceptionUseOriginalBodyTest.java            |   0
 .../OnExceptionUseOriginalMessageTest.java         |   0
 .../onexception/OnExceptionWhenSimpleOgnlTest.java |   0
 .../OnExceptionWireTapNewExchangeBodyTest.java     |   0
 .../OnExceptionWithRouteAndContinueTest.java       |   0
 .../OnExceptionWrappedExceptionTest.java           |   0
 .../onexception/OnExceptionsPerRouteTest.java      |   0
 .../onexception/RedeliverEntireRouteTest.java      |   0
 ...ScopedOnExceptionLoadBalancerStopRouteTest.java |   0
 .../RouteScopedOnExceptionSameTypeTest.java        |   0
 .../processor/resequencer/IntegerComparator.java   |   0
 .../resequencer/MyFileNameExpression.java          |   0
 .../resequencer/ResequencerBatchOrderTest.java     |   0
 .../resequencer/ResequencerEngineSync.java         |   0
 .../resequencer/ResequencerEngineTest.java         |   0
 .../resequencer/ResequencerFileNameTest.java       |   0
 .../processor/resequencer/ResequencerRunner.java   |   0
 .../processor/resequencer/SequenceBuffer.java      |   0
 .../camel/processor/resequencer/SequenceTest.java  |   0
 .../processor/resequencer/TestComparator.java      |   0
 .../processor/resequencer/TestComparatorTest.java  |   0
 .../camel/processor/resequencer/TestObject.java    |   0
 .../DynamicRouterEventNotifierTest.java            |   0
 .../RecipientListEventNotifierTest.java            |   0
 .../RoutingSlipCreateProducerFailedTest.java       |   0
 .../RoutingSlipDataModificationTest.java           |   0
 .../routingslip/RoutingSlipEventNotifierTest.java  |   0
 .../RoutingSlipIgnoreInvalidEndpointsTest.java     |   0
 .../processor/routingslip/RoutingSlipPOJOTest.java |   0
 .../processor/routingslip/RoutingSlipTest.java     |   0
 .../RoutingSlipWithErrorHandlerTest.java           |   0
 .../routingslip/RoutingSlipWithExceptionTest.java  |   0
 .../validation/CatalogLSResourceResolver.java      |   0
 .../DefaultValidationErrorHandlerTest.java         |   0
 .../impl/AbstractCamelCatalogTest.java             |   0
 .../runtimecatalog/impl/JSonSchemaHelperTest.java  |   0
 .../impl/RuntimeCamelCatalogTest.java              |   0
 .../DefaultCamelContextEndpointCacheLimitTest.java |   0
 .../DefaultCamelContextEndpointCacheTest.java      |   0
 .../apache/camel/support/DefaultEndpointTest.java  |   0
 .../apache/camel/support/DefaultMessageTest.java   |   0
 .../camel/support/DefaultTimeoutMapTest.java       |   0
 .../camel/support/GroupTokenIteratorTest.java      |   0
 .../camel/support/IntrospectionSupportTest.java    |   0
 .../apache/camel/support/ServiceSupportTest.java   |   0
 .../camel/support/TimerListenerManagerTest.java    |   0
 .../support/component/ApiMethodHelperTest.java     |   0
 .../component/ApiMethodPropertiesHelperTest.java   |   0
 .../component/ArgumentSubstitutionParserTest.java  |   0
 .../apache/camel/support/component/TestProxy.java  |   0
 .../org/apache/camel/support/jndi/ExampleBean.java |   0
 ...ndiCamelSingletonInitialContextFactoryTest.java |   0
 .../org/apache/camel/support/jndi/JndiTest.java    |   0
 .../support/jsse/AbstractJsseParametersTest.java   |   0
 .../camel/support/jsse/FilterParametersTest.java   |   0
 .../support/jsse/KeyManagersParametersTest.java    |   0
 .../camel/support/jsse/KeyStoreParametersTest.java |   0
 .../support/jsse/SSLContextParametersTest.java     |   0
 .../support/jsse/SecureRandomParametersTest.java   |   0
 .../support/jsse/TrustManagersParametersTest.java  |   0
 .../processor/DefaultExchangeFormatterTest.java    |   0
 .../processor/DefaultMaskingFormatterTest.java     |   0
 .../support/processor/ThroughPutLoggerTest.java    |   0
 .../FileIdempotentStoreOrderingTest.java           |   0
 .../apache/camel/urlhandler/custom/Handler.java    |   0
 .../org/apache/camel/urlhandler/pd/Handler.java    |   0
 .../org/apache/camel/util/AnotherExampleBean.java  |   0
 .../apache/camel/util/CamelContextHelperTest.java  |   0
 .../apache/camel/util/CaseInsensitiveMapTest.java  |   0
 .../apache/camel/util/CreateModelFromXmlTest.java  |   0
 .../util/DumpModelAsXmlAggregateRouteTest.java     |   0
 .../util/DumpModelAsXmlChoiceFilterRouteTest.java  |   0
 .../util/DumpModelAsXmlDanishCharactersTest.java   |   0
 .../camel/util/DumpModelAsXmlNamespaceTest.java    |   0
 .../camel/util/DumpModelAsXmlPlaceholdersTest.java |   0
 .../util/DumpModelAsXmlRouteExpressionTest.java    |   0
 .../util/DumpModelAsXmlRoutePredicateTest.java     |   0
 .../util/DumpModelAsXmlSplitBodyRouteTest.java     |   0
 ...elAsXmlSplitNestedChoiceEndChoiceRouteTest.java |   0
 ...umpModelAsXmlSplitNestedChoiceEndRouteTest.java |   0
 .../DumpModelAsXmlTransformRouteConstantTest.java  |   0
 .../DumpModelAsXmlTransformRouteLanguageTest.java  |   0
 .../util/DumpModelAsXmlTransformRouteTest.java     |   0
 .../org/apache/camel/util/EndpointHelperTest.java  |   0
 .../org/apache/camel/util/EventHelperTest.java     |   0
 .../org/apache/camel/util/ExchangeHelperTest.java  |   0
 .../camel/util/ExpressionListComparatorTest.java   |   0
 .../apache/camel/util/FilePathResolverTest.java    |   0
 .../java/org/apache/camel/util/FileUtilTest.java   |   0
 .../java/org/apache/camel/util/GZIPHelperTest.java |   0
 .../java/org/apache/camel/util/IOHelperTest.java   |   0
 .../org/apache/camel/util/InetAddressUtilTest.java |   0
 .../org/apache/camel/util/KeyValueHolderTest.java  |   0
 .../java/org/apache/camel/util/LRUCacheTest.java   |   0
 .../org/apache/camel/util/LRUSoftCacheTest.java    |   0
 .../org/apache/camel/util/MessageHelperTest.java   |   0
 .../java/org/apache/camel/util/MyDummyObject.java  |   0
 .../NoClassDefFoundErrorWrapExceptionTest.java     |   0
 .../org/apache/camel/util/ObjectHelperTest.java    |   0
 .../java/org/apache/camel/util/OgnlHelperTest.java |   0
 .../apache/camel/util/OrderedComparatorTest.java   |   0
 .../org/apache/camel/util/OtherExampleBean.java    |   0
 .../org/apache/camel/util/PackageHelperTest.java   |   0
 .../org/apache/camel/util/PlatformHelperTest.java  |   0
 .../camel/util/PredicateAssertHelperTest.java      |   0
 .../java/org/apache/camel/util/ProcessorA.java     |   0
 .../java/org/apache/camel/util/ProcessorB.java     |   0
 .../java/org/apache/camel/util/ProcessorFail.java  |   0
 .../org/apache/camel/util/ReferenceCountTest.java  |   0
 .../org/apache/camel/util/ReflectionInjector.java  |   0
 .../org/apache/camel/util/ResourceHelperTest.java  |   0
 .../apache/camel/util/StingQuoteHelperTest.java    |   0
 .../org/apache/camel/util/StringHelperTest.java    |   0
 .../camel/util/UnsafeCharactersEncoderTest.java    |   0
 .../apache/camel/util/XmlLineNumberParserTest.java |   0
 .../toolbox/FlexibleAggregationStrategiesTest.java |   0
 .../src/test}/resources/META-INF/LICENSE.txt       |   0
 .../src/test/resources/META-INF/NOTICE.txt         |   0
 .../services/java.nio.file.spi.FileTypeDetector    |   0
 .../services/org/apache/camel/TypeConverter        |   0
 .../services/org/apache/camel/send-dynamic/bar     |   0
 .../src/test/resources/example.properties          |   0
 .../src/test/resources/jndi-example.properties     |   0
 .../src/test/resources/log4j2.properties           |   0
 .../camel-core}/src/test/resources/mysimple.txt    |   0
 .../camel-core}/src/test/resources/myxpath.txt     |   0
 .../camel/builder/xml/example-with-errors.xsl      |   0
 .../org/apache/camel/builder/xml}/example.xsl      |   0
 .../org/apache/camel/builder/xml/myprop.properties |   0
 .../org/apache/camel/component/language/hello.txt  |   0
 .../camel/component/language/mysimplescript.txt    |   0
 .../camel/component/properties/adapter.properties  |   0
 .../camel/component/properties/bar.properties      |   0
 .../camel/component/properties/cheese.properties   |   0
 .../component/properties/concatenation.properties  |   0
 .../component/properties/myproperties.properties   |   0
 .../camel/component/properties/myutf8.properties   |   0
 .../camel/component/staff_other_template.xsl       |   0
 .../camel/component/validator/BroadcastMonitor.xsd |   0
 .../component/validator/BroadcastMonitorFixed.xsd  |   0
 .../apache/camel/component/validator/catalog.cat   |   0
 .../apache/camel/component/validator/health.xsd    |   0
 .../apache/camel/component/validator/person.xsd    |   0
 .../camel/component/validator}/report-base.xsd     |   0
 .../apache/camel/component/validator/report.xsd    |   0
 .../apache/camel/component/validator/schema.xsd    |   0
 .../apache/camel/component/validator/sentence.xsd  |   0
 .../org/apache/camel/component/validator/text.xsd  |   0
 .../camel/component/validator/unsecuredSchema.xsd  |   0
 .../validator/xsds/health/common/common.xsd        |   0
 .../component/validator/xsds/health/health.xsd     |   0
 .../component/validator/xsds/health/type1.xsd      |   0
 .../camel/component/validator/xsds/person.xsd      |   0
 .../camel/component/validator/xsds/type2.xsd       |   0
 .../org/apache/camel/component/xslt}/example.xsl   |   0
 .../xslt/include_not_existing_resource.xsl         |   0
 .../included/staff_included_nested_level_1.xsl     |   0
 .../org/apache/camel/component/xslt/invalid.xsl    |   0
 .../apache/camel/component/xslt/staff_include.xsl  |   0
 .../component/xslt/staff_include_classpath.xsl     |   0
 .../component/xslt/staff_include_classpath2.xsl    |   0
 .../component/xslt/staff_include_relative.xsl      |   0
 .../xslt/staff_include_relative_nested.xsl         |   0
 .../xslt/staff_include_relative_other.xsl          |   0
 .../xslt/staff_included_nested_level_2.xsl         |   0
 .../camel/component/xslt}/staff_template.xsl       |   0
 .../org/apache/camel/component/xslt/terminate.xsl  |   0
 .../camel/component/xslt/transform-with-error.xsl  |   0
 .../org/apache/camel/component/xslt/transform.xsl  |   0
 .../camel/component/xslt/transformCallEcho.xsl     |   0
 .../apache/camel/component/xslt/transform_dtd.xsl  |   0
 .../apache/camel/component/xslt/transform_text.xsl |   0
 .../component/xslt/transform_text_imported.xsl     |   0
 .../camel/component/xslt/transform_to_foo.xsl      |   0
 .../resources/org/apache/camel/converter/dummy.txt |   0
 .../apache/camel/converter/german.iso-8859-1.txt   |   0
 .../org/apache/camel/converter/german.utf-8.txt    |   0
 .../org/apache/camel/converter/stream/test.xml     |   0
 .../test/resources/org/apache/camel/impl/TestImplA |   0
 .../test/resources/org/apache/camel/impl/TestImplB |   0
 .../org/apache/camel/impl/TestImplNoProperty       |   0
 .../test/resources/org/apache/camel/impl/rest1.xml |   0
 .../resources/org/apache/camel/impl/route1.xml     |   0
 .../resources/org/apache/camel/impl/route2.xml     |   0
 .../resources/org/apache/camel/impl/route3.xml     |   0
 .../org/apache/camel/impl/route4_error.xml         |   0
 .../resources/org/apache/camel/impl/route4_ok.xml  |   0
 .../resources/org/apache/camel/impl/validate.xsd   |   0
 .../src/test/resources/org/apache/camel/logo.jpeg  | Bin
 .../org/apache/camel/management/rest.properties    |   0
 .../org/apache/camel/model/barInterceptorRoute.xml |   0
 .../org/apache/camel/model/barOnExceptionRoute.xml |   0
 .../org/apache/camel/model/barPolicyRoute.xml      |   0
 .../resources/org/apache/camel/model/barRest.xml   |   0
 .../resources/org/apache/camel/model/barRoute.xml  |   0
 .../org/apache/camel/model/barUpdatedRoute.xml     |   0
 .../org/apache/camel/model/convertBody.xml         |   0
 .../apache/camel/model/dynamicRecipientList.xml    |   0
 .../test/resources/org/apache/camel/model/loop.xml |   0
 .../resources/org/apache/camel/model/processor.xml |   0
 .../org/apache/camel/model/processorWithFilter.xml |   0
 .../camel/model/processorWithGroovyFilter.xml      |   0
 .../camel/model/processorWithHeaderFilter.xml      |   0
 .../camel/model/processorWithSimpleFilter.xml      |   0
 .../org/apache/camel/model/resequencerBatch.xml    |   0
 .../org/apache/camel/model/resequencerStream.xml   |   0
 .../org/apache/camel/model/routeGroup.xml          |   0
 .../org/apache/camel/model/routeProperties.xml     |   0
 .../camel/model/routeWithBindyDataFormat.xml       |   0
 .../org/apache/camel/model/routeWithChoice.xml     |   0
 .../model/routeWithCircuitBreakerLoadBalance.xml   |   0
 .../apache/camel/model/routeWithCvsDataFormat.xml  |   0
 .../camel/model/routeWithFailoverLoadBalance.xml   |   0
 .../camel/model/routeWithFlatpackDataFormat.xml    |   0
 .../apache/camel/model/routeWithHL7DataFormat.xml  |   0
 .../apache/camel/model/routeWithInterceptor.xml    |   0
 .../apache/camel/model/routeWithJSonDataFormat.xml |   0
 .../apache/camel/model/routeWithJaxbDataFormat.xml |   0
 .../apache/camel/model/routeWithJibxDataFormat.xml |   0
 .../apache/camel/model/routeWithLoadBalance.xml    |   0
 .../org/apache/camel/model/routeWithNamespace.xml  |   0
 .../apache/camel/model/routeWithRSSDataFormat.xml  |   0
 .../camel/model/routeWithRandomLoadBalance.xml     |   0
 .../camel/model/routeWithStickyLoadBalance.xml     |   0
 .../camel/model/routeWithTidyMarkupDataFormat.xml  |   0
 .../camel/model/routeWithTopicLoadBalance.xml      |   0
 .../camel/model/routeWithXMLSecurityDataFormat.xml |   0
 .../camel/model/routeWithXStreamDataFormat.xml     |   0
 .../camel/model/routeWithZipFileDataFormat.xml     |   0
 .../org/apache/camel/model/routingSlip.xml         |   0
 .../model/routingSlipHeaderAndDelimiterSet.xml     |   0
 .../apache/camel/model/routingSlipHeaderSet.xml    |   0
 .../test/resources/org/apache/camel/model/saga.xml |   0
 .../resources/org/apache/camel/model/script.xml    |   0
 .../resources/org/apache/camel/model/setBody.xml   |   0
 .../resources/org/apache/camel/model/setHeader.xml |   0
 .../org/apache/camel/model/setHeaderToConstant.xml |   0
 .../org/apache/camel/model/simpleRest.xml          |   0
 .../org/apache/camel/model/simpleRestToD.xml       |   0
 .../org/apache/camel/model/simpleRoute.xml         |   0
 .../resources/org/apache/camel/model/splitter.xml  |   0
 .../org/apache/camel/model/staticRecipientList.xml |   0
 .../resources/org/apache/camel/model/transform.xml |   0
 .../resources/org/apache/camel/model/wireTap.xml   |   0
 .../apache/camel/processor/ValidatingProcessor.xsd |   0
 .../org/apache/camel/processor/foo.properties      |   0
 .../processor/intercept/myproperties.properties    |   0
 .../org/apache/camel/processor/mysimplescript.txt  |   0
 .../org/apache/camel/processor/oneCharacter.txt    |   0
 .../processor/routeAutoStartupTest.properties      |   0
 .../org/apache/camel/processor/simple.txt          |   0
 .../org/apache/camel/processor/students.xml        |   0
 .../org/apache/camel/processor/twoCharacters.txt   |   0
 .../org/apache/camel/support/jsse/localhost.ks     | Bin
 .../org/apache/camel/support/jsse/test.properties  |   0
 .../util/ObjectHelperResourceTestFile.properties   |   0
 .../org/apache/camel/util/camel-context.xml        |   0
 .../org/apache/camel/util/simpleRoute.xml          |   0
 .../camel/util/simpleRouteWithNamespaces.xml       |   0
 .../camel-core/src/test/resources}/report-base.xsd |   0
 .../camel-core}/src/test/resources/report.xsd      |   0
 .../src/test/resources/xslt/common/copy.xsl        |   0
 .../test/resources/xslt/common}/staff_template.xsl |   0
 .../src/test/resources/xslt/staff/staff.xml        |   0
 .../src/test/resources/xslt/staff/staff.xsl        |   0
 .../camel-management-api}/pom.xml                  |   4 +-
 .../JmxNotificationBroadcasterAware.java           |   0
 .../camel/api/management/ManagedAttribute.java     |   0
 .../camel/api/management/ManagedCamelContext.java  |   0
 .../camel/api/management/ManagedInstance.java      |   0
 .../camel/api/management/ManagedNotification.java  |   0
 .../camel/api/management/ManagedNotifications.java |   0
 .../camel/api/management/ManagedOperation.java     |   0
 .../camel/api/management/ManagedResource.java      |   0
 .../camel/api/management/NotificationSender.java   |   0
 .../api/management/NotificationSenderAware.java    |   0
 .../mbean/BacklogTracerEventMessage.java           |   0
 .../api/management/mbean/CamelOpenMBeanTypes.java  |   0
 .../mbean/ComponentVerifierExtension.java          |   0
 .../mbean/ManagedAggregateProcessorMBean.java      |   0
 .../ManagedAsyncProcessorAwaitManagerMBean.java    |   0
 .../mbean/ManagedBacklogDebuggerMBean.java         |   0
 .../mbean/ManagedBacklogTracerMBean.java           |   0
 .../api/management/mbean/ManagedBeanMBean.java     |   0
 .../mbean/ManagedBrowsableEndpointMBean.java       |   0
 .../management/mbean/ManagedCamelContextMBean.java |   0
 .../management/mbean/ManagedCamelHealthMBean.java  |   0
 .../api/management/mbean/ManagedChoiceMBean.java   |   0
 .../management/mbean/ManagedClaimCheckMBean.java   |   0
 .../mbean/ManagedClusterServiceMBean.java          |   0
 .../management/mbean/ManagedComponentMBean.java    |   0
 .../mbean/ManagedConsumerCacheMBean.java           |   0
 .../api/management/mbean/ManagedConsumerMBean.java |   0
 .../management/mbean/ManagedConvertBodyMBean.java  |   0
 .../api/management/mbean/ManagedCounterMBean.java  |   0
 .../mbean/ManagedCustomLoadBalancerMBean.java      |   0
 .../management/mbean/ManagedDataFormatMBean.java   |   0
 .../api/management/mbean/ManagedDelayerMBean.java  |   0
 .../mbean/ManagedDynamicRouterMBean.java           |   0
 .../api/management/mbean/ManagedEndpointMBean.java |   0
 .../mbean/ManagedEndpointRegistryMBean.java        |   0
 .../api/management/mbean/ManagedEnricherMBean.java |   0
 .../management/mbean/ManagedErrorHandlerMBean.java |   0
 .../mbean/ManagedExtendedInformation.java          |   0
 .../mbean/ManagedFailoverLoadBalancerMBean.java    |   0
 .../api/management/mbean/ManagedFilterMBean.java   |   0
 .../mbean/ManagedIdempotentConsumerMBean.java      |   0
 .../mbean/ManagedInflightRepositoryMBean.java      |   0
 .../api/management/mbean/ManagedLogMBean.java      |   0
 .../api/management/mbean/ManagedLoopMBean.java     |   0
 .../api/management/mbean/ManagedMarshalMBean.java  |   0
 .../management/mbean/ManagedMulticastMBean.java    |   0
 .../mbean/ManagedPerformanceCounterMBean.java      |   0
 .../management/mbean/ManagedPollEnricherMBean.java |   0
 .../api/management/mbean/ManagedProcessMBean.java  |   0
 .../management/mbean/ManagedProcessorMBean.java    |   0
 .../mbean/ManagedProducerCacheMBean.java           |   0
 .../api/management/mbean/ManagedProducerMBean.java |   0
 .../mbean/ManagedRandomLoadBalancerMBean.java      |   0
 .../mbean/ManagedRecipientListMBean.java           |   0
 .../management/mbean/ManagedRemoveHeaderMBean.java |   0
 .../mbean/ManagedRemoveHeadersMBean.java           |   0
 .../mbean/ManagedRemovePropertiesMBean.java        |   0
 .../mbean/ManagedRemovePropertyMBean.java          |   0
 .../management/mbean/ManagedResequencerMBean.java  |   0
 .../mbean/ManagedResourceEndpointMBean.java        |   0
 .../management/mbean/ManagedRestRegistryMBean.java |   0
 .../api/management/mbean/ManagedRollbackMBean.java |   0
 .../mbean/ManagedRoundRobinLoadBalancerMBean.java  |   0
 .../mbean/ManagedRouteControllerMBean.java         |   0
 .../api/management/mbean/ManagedRouteMBean.java    |   0
 .../management/mbean/ManagedRoutingSlipMBean.java  |   0
 .../mbean/ManagedRuntimeCamelCatalogMBean.java     |   0
 .../mbean/ManagedRuntimeEndpointRegistryMBean.java |   0
 .../mbean/ManagedSamplingThrottlerMBean.java       |   0
 .../mbean/ManagedSchedulePollConsumerMBean.java    |   0
 .../api/management/mbean/ManagedScriptMBean.java   |   0
 .../mbean/ManagedSendDynamicProcessorMBean.java    |   0
 .../mbean/ManagedSendProcessorMBean.java           |   0
 .../api/management/mbean/ManagedServiceMBean.java  |   0
 .../api/management/mbean/ManagedSetBodyMBean.java  |   0
 .../mbean/ManagedSetExchangePatternMBean.java      |   0
 .../management/mbean/ManagedSetHeaderMBean.java    |   0
 .../management/mbean/ManagedSetPropertyMBean.java  |   0
 .../api/management/mbean/ManagedSplitterMBean.java |   0
 .../mbean/ManagedStickyLoadBalancerMBean.java      |   0
 .../api/management/mbean/ManagedStopMBean.java     |   0
 .../mbean/ManagedStreamCachingStrategyMBean.java   |   0
 .../mbean/ManagedSuspendableRouteMBean.java        |   0
 .../management/mbean/ManagedThreadPoolMBean.java   |   0
 .../api/management/mbean/ManagedThreadsMBean.java  |   0
 .../management/mbean/ManagedThrottlerMBean.java    |   0
 ...ManagedThrottlingExceptionRoutePolicyMBean.java |   0
 .../ManagedThrottlingInflightRoutePolicyMBean.java |   0
 .../mbean/ManagedThroughputLoggerMBean.java        |   0
 .../mbean/ManagedThrowExceptionMBean.java          |   0
 .../mbean/ManagedTopicLoadBalancerMBean.java       |   0
 .../management/mbean/ManagedTransformMBean.java    |   0
 .../mbean/ManagedTransformerRegistryMBean.java     |   0
 .../mbean/ManagedTypeConverterRegistryMBean.java   |   0
 .../management/mbean/ManagedUnmarshalMBean.java    |   0
 .../api/management/mbean/ManagedValidateMBean.java |   0
 .../mbean/ManagedValidatorRegistryMBean.java       |   0
 .../mbean/ManagedWeightedBalancerMBean.java        |   0
 .../api/management/mbean/ManagedWireTapMBean.java  |   0
 .../camel/api/management/mbean/RouteError.java     |   0
 .../apache/camel/api/management/mbean/package.html |   0
 .../org/apache/camel/api/management/package.html   |   0
 .../camel-management-impl}/pom.xml                 |   4 +-
 .../management/CompositePerformanceCounter.java    |   0
 .../DefaultInstrumentationProcessor.java           |   0
 .../camel/management/DefaultManagementAgent.java   |   0
 .../DefaultManagementLifecycleStrategy.java        |   0
 .../DefaultManagementMBeanAssembler.java           |   0
 .../DefaultManagementObjectNameStrategy.java       |   0
 .../DefaultManagementObjectStrategy.java           |   0
 .../DefaultManagementStrategyFactory.java          |   0
 .../management/DelegatePerformanceCounter.java     |   0
 .../InstrumentationInterceptStrategy.java          |   0
 .../management/JmxNotificationEventNotifier.java   |   0
 .../camel/management/JmxSystemPropertyKeys.java    |   0
 .../camel/management/LoggingEventNotifier.java     |   0
 .../camel/management/MBeanInfoAssembler.java       |   0
 .../camel/management/ManagedCamelContextImpl.java  |   0
 .../apache/camel/management/ManagedLoadTimer.java  |   0
 .../management/ManagedManagementStrategy.java      |   0
 .../management/ManagementStrategyFactory.java      |   0
 .../camel/management/MixinRequiredModelMBean.java  |   0
 .../management/NotificationSenderAdapter.java      |   0
 .../camel/management/PerformanceCounter.java       |   0
 .../camel/management/PublishEventNotifier.java     |   0
 .../apache/camel/management/mbean/LoadTriplet.java |   0
 .../mbean/ManagedAggregateProcessor.java           |   0
 .../mbean/ManagedAsyncProcessorAwaitManager.java   |   0
 .../management/mbean/ManagedBacklogDebugger.java   |   0
 .../management/mbean/ManagedBacklogTracer.java     |   0
 .../management/mbean/ManagedBeanProcessor.java     |   0
 .../management/mbean/ManagedBrowsableEndpoint.java |   0
 .../management/mbean/ManagedCamelContext.java      |   0
 .../camel/management/mbean/ManagedCamelHealth.java |   0
 .../camel/management/mbean/ManagedChoice.java      |   0
 .../camel/management/mbean/ManagedClaimCheck.java  |   0
 .../management/mbean/ManagedClusterService.java    |   0
 .../camel/management/mbean/ManagedComponent.java   |   0
 .../camel/management/mbean/ManagedConsumer.java    |   0
 .../management/mbean/ManagedConsumerCache.java     |   0
 .../camel/management/mbean/ManagedConvertBody.java |   0
 .../camel/management/mbean/ManagedCounter.java     |   0
 .../mbean/ManagedCustomLoadBalancer.java           |   0
 .../camel/management/mbean/ManagedDataFormat.java  |   0
 .../camel/management/mbean/ManagedDelayer.java     |   0
 .../management/mbean/ManagedDynamicRouter.java     |   0
 .../camel/management/mbean/ManagedEndpoint.java    |   0
 .../management/mbean/ManagedEndpointRegistry.java  |   0
 .../camel/management/mbean/ManagedEnricher.java    |   0
 .../management/mbean/ManagedErrorHandler.java      |   0
 .../management/mbean/ManagedEventNotifier.java     |   0
 .../mbean/ManagedEventNotifierMBean.java           |   0
 .../mbean/ManagedFailoverLoadBalancer.java         |   0
 .../camel/management/mbean/ManagedFilter.java      |   0
 .../mbean/ManagedIdempotentConsumer.java           |   0
 .../mbean/ManagedInflightRepository.java           |   0
 .../apache/camel/management/mbean/ManagedLog.java  |   0
 .../apache/camel/management/mbean/ManagedLoop.java |   0
 .../camel/management/mbean/ManagedMarshal.java     |   0
 .../camel/management/mbean/ManagedMulticast.java   |   0
 .../mbean/ManagedPerformanceCounter.java           |   0
 .../management/mbean/ManagedPollEnricher.java      |   0
 .../camel/management/mbean/ManagedProcess.java     |   0
 .../camel/management/mbean/ManagedProcessor.java   |   0
 .../camel/management/mbean/ManagedProducer.java    |   0
 .../management/mbean/ManagedProducerCache.java     |   0
 .../mbean/ManagedRandomLoadBalancer.java           |   0
 .../management/mbean/ManagedRecipientList.java     |   0
 .../management/mbean/ManagedRemoveHeader.java      |   0
 .../management/mbean/ManagedRemoveHeaders.java     |   0
 .../management/mbean/ManagedRemoveProperties.java  |   0
 .../management/mbean/ManagedRemoveProperty.java    |   0
 .../camel/management/mbean/ManagedResequencer.java |   0
 .../management/mbean/ManagedRestRegistry.java      |   0
 .../camel/management/mbean/ManagedRollback.java    |   0
 .../mbean/ManagedRoundRobinLoadBalancer.java       |   0
 .../camel/management/mbean/ManagedRoute.java       |   0
 .../management/mbean/ManagedRouteController.java   |   0
 .../camel/management/mbean/ManagedRoutingSlip.java |   0
 .../mbean/ManagedRuntimeCamelCatalog.java          |   0
 .../mbean/ManagedRuntimeEndpointRegistry.java      |   0
 .../management/mbean/ManagedSamplingThrottler.java |   0
 .../mbean/ManagedScheduledPollConsumer.java        |   0
 .../camel/management/mbean/ManagedScript.java      |   0
 .../mbean/ManagedSendDynamicProcessor.java         |   0
 .../management/mbean/ManagedSendProcessor.java     |   0
 .../camel/management/mbean/ManagedService.java     |   0
 .../camel/management/mbean/ManagedSetBody.java     |   0
 .../mbean/ManagedSetExchangePattern.java           |   0
 .../camel/management/mbean/ManagedSetHeader.java   |   0
 .../camel/management/mbean/ManagedSetProperty.java |   0
 .../camel/management/mbean/ManagedSplitter.java    |   0
 .../mbean/ManagedStickyLoadBalancer.java           |   0
 .../apache/camel/management/mbean/ManagedStop.java |   0
 .../mbean/ManagedStreamCachingStrategy.java        |   0
 .../management/mbean/ManagedSuspendableRoute.java  |   0
 .../camel/management/mbean/ManagedThreadPool.java  |   0
 .../camel/management/mbean/ManagedThreads.java     |   0
 .../camel/management/mbean/ManagedThrottler.java   |   0
 .../ManagedThrottlingExceptionRoutePolicy.java     |   0
 .../ManagedThrottlingInflightRoutePolicy.java      |   0
 .../management/mbean/ManagedThroughputLogger.java  |   0
 .../management/mbean/ManagedThrowException.java    |   0
 .../management/mbean/ManagedTopicLoadBalancer.java |   0
 .../camel/management/mbean/ManagedTransformer.java |   0
 .../mbean/ManagedTransformerRegistry.java          |   0
 .../mbean/ManagedTypeConverterRegistry.java        |   0
 .../camel/management/mbean/ManagedUnmarshal.java   |   0
 .../camel/management/mbean/ManagedValidate.java    |   0
 .../management/mbean/ManagedValidatorRegistry.java |   0
 .../mbean/ManagedWeightedLoadBalancer.java         |   0
 .../management/mbean/ManagedWireTapProcessor.java  |   0
 .../management/mbean/ModelCamelContextHelper.java  |   0
 .../management/mbean/RouteCoverageXmlParser.java   |   0
 .../apache/camel/management/mbean/Statistic.java   |   0
 .../camel/management/mbean/StatisticCounter.java   |   0
 .../camel/management/mbean/StatisticDelta.java     |   0
 .../camel/management/mbean/StatisticMaximum.java   |   0
 .../camel/management/mbean/StatisticMinimum.java   |   0
 .../camel/management/mbean/StatisticValue.java     |   0
 .../org/apache/camel/management/mbean/package.html |   0
 .../java/org/apache/camel/management/package.html  |   0
 .../org.apache.camel.spi.ManagementStrategyFactory |   0
 .../component/controlbus/ControlBusStatsTest.java  |   0
 .../LanguageLoadScriptFromFileCachedTest.java      |   0
 .../component/xslt/ManagedXsltOutputBytesTest.java |   0
 .../camel/component/xslt/XsltContentCacheTest.java |   0
 .../DynamicRouterConvertBodyToIssueTest.java       |   0
 .../camel/management/AddEventNotifierTest.java     |   0
 .../camel/management/BacklogDebuggerTest.java      |   0
 .../camel/management/BacklogTracerFilterTest.java  |   0
 .../management/BacklogTracerIdOnAllNodesTest.java  |   0
 .../management/BacklogTracerPatternRouteTest.java  |   0
 .../camel/management/BacklogTracerPatternTest.java |   0
 .../management/BacklogTracerStreamCachingTest.java |   0
 .../apache/camel/management/BacklogTracerTest.java |   0
 .../org/apache/camel/management/BigRouteTest.java  |   0
 .../management/CamelChoiceWithManagementTest.java  |   0
 .../management/CamelContextDisableJmxTest.java     |   0
 .../apache/camel/management/CustomEndpoint.java    |   0
 .../management/DefaultManagementAgentMockTest.java |   0
 .../DualManagedThreadPoolProfileTest.java          |   0
 .../DualManagedThreadPoolWithIdTest.java           |   0
 .../management/ExceptionWithManagementTest.java    |   0
 .../JmxInstrumentationCustomMBeanTest.java         |   0
 ...mxInstrumentationDisableOnCamelContextTest.java |   0
 .../management/JmxInstrumentationDisableTest.java  |   0
 ...ationOnlyRegisterProcessorWithCustomIdTest.java |   0
 .../JmxInstrumentationUsingDefaultsTest.java       |   0
 .../JmxInstrumentationUsingPlatformMBSTest.java    |   0
 .../JmxInstrumentationUsingPropertiesTest.java     |   0
 .../JmxInstrumentationWithConnectorTest.java       |   0
 .../JmxNotificationEventNotifierTest.java          |   0
 .../camel/management/JmxRecipientListTest.java     |   0
 .../org/apache/camel/management/LoadTimerTest.java |   0
 .../apache/camel/management/LoadTripletTest.java   |   0
 .../camel/management/LoggingEventNotifierTest.java |   0
 .../management/ManagedAggregateControllerTest.java |   0
 .../ManagedBrowsableEndpointAsXmlFileTest.java     |   0
 .../ManagedBrowsableEndpointAsXmlTest.java         |   0
 .../ManagedBrowsableEndpointEmptyTest.java         |   0
 .../management/ManagedBrowsableEndpointTest.java   |   0
 .../apache/camel/management/ManagedCBRTest.java    |   0
 .../ManagedCamelContextAutoStartupTest.java        |   0
 .../ManagedCamelContextDumpRoutesAsXmlTest.java    |   0
 ...ManagedCamelContextDumpRoutesCoverageAsXml.java |   0
 .../ManagedCamelContextDumpStatsAsXmlTest.java     |   0
 .../ManagedCamelContextEmptyRouteTest.java         |   0
 .../ManagedCamelContextNewProxyTest.java           |   0
 .../ManagedCamelContextPropertiesTest.java         |   0
 .../management/ManagedCamelContextRestartTest.java |   0
 .../ManagedCamelContextSuspendResumeTest.java      |   0
 .../ManagedCamelContextSuspendStartTest.java       |   0
 .../camel/management/ManagedCamelContextTest.java  |   0
 ...ManagedCamelContextUpdateRoutesFromXmlTest.java |   0
 ...RoutesWithPropertyPlaceholdersFromXmlPTest.java |   0
 .../ManagedCanekContextExchangeStatisticsTest.java |   0
 .../apache/camel/management/ManagedChoiceTest.java |   0
 .../camel/management/ManagedComponentTest.java     |   0
 .../management/ManagedConsumerCacheHitsTest.java   |   0
 .../camel/management/ManagedConsumerCacheTest.java |   0
 .../camel/management/ManagedConvertBodyTest.java   |   0
 .../camel/management/ManagedCustomBeanTest.java    |   0
 .../management/ManagedCustomComponentNameTest.java |   0
 .../management/ManagedCustomLoadBalancerTest.java  |   0
 .../camel/management/ManagedCustomPolicyTest.java  |   0
 .../management/ManagedCustomProcessorTest.java     |   0
 .../camel/management/ManagedDataFormatTest.java    |   0
 .../camel/management/ManagedDelayerTest.java       |   0
 .../management/ManagedDualCamelContextTest.java    |   0
 .../camel/management/ManagedDuplicateIdTest.java   |   0
 .../camel/management/ManagedDynamicRouterTest.java |   0
 .../management/ManagedEndpointExplainTest.java     |   0
 .../management/ManagedEndpointRegistryTest.java    |   0
 .../camel/management/ManagedEndpointTest.java      |   0
 .../ManagedEndpointUtilizationStatisticsTest.java  |   0
 .../camel/management/ManagedEnricherTest.java      |   0
 .../management/ManagedErrorHandlerOptionsTest.java |   0
 .../ManagedErrorHandlerRedeliveryTest.java         |   0
 .../camel/management/ManagedErrorHandlerTest.java  |   0
 .../ManagedFailoverLoadBalancerTest.java           |   0
 .../management/ManagedFileIdempotentClearTest.java |   0
 .../ManagedFileIdempotentConsumerTest.java         |   0
 .../ManagedFileWatcherReloadStrategyTest.java      |   0
 .../apache/camel/management/ManagedFilterTest.java |   0
 .../ManagedFromRestGetEmbeddedRouteTest.java       |   0
 .../camel/management/ManagedFromRestGetTest.java   |   0
 .../management/ManagedFromRestPlaceholderTest.java |   0
 .../management/ManagedInflightRepositoryTest.java  |   0
 .../management/ManagedInflightStatisticsTest.java  |   0
 .../management/ManagedInlinedProcessorTest.java    |   0
 .../camel/management/ManagedInterceptFromTest.java |   0
 .../camel/management/ManagedInterceptTest.java     |   0
 .../management/ManagedListComponentsTest.java      |   0
 .../camel/management/ManagedLoadBalancerTest.java  |   0
 .../camel/management/ManagedLogEndpointTest.java   |   0
 .../apache/camel/management/ManagedLoopTest.java   |   0
 .../camel/management/ManagedMarshalTest.java       |   0
 .../ManagedMemoryIdempotentClearTest.java          |   0
 .../ManagedMemoryIdempotentConsumerTest.java       |   0
 .../camel/management/ManagedMulticastTest.java     |   0
 .../management/ManagedNamePatternFixedTest.java    |   0
 .../ManagedNamePatternIncludeHostNameTest.java     |   0
 .../ManagedNamePatternJvmSystemPropertyTest.java   |   0
 .../camel/management/ManagedNamePatternTest.java   |   0
 .../management/ManagedNonManagedServiceTest.java   |   0
 .../camel/management/ManagedPollEnricherTest.java  |   0
 .../camel/management/ManagedProcessTest.java       |   0
 ...gedProducerRecipientListRegisterAlwaysTest.java |   0
 .../ManagedProducerRecipientListTest.java          |   0
 ...edProducerRouteAddRemoveRegisterAlwaysTest.java |   0
 .../camel/management/ManagedProducerTest.java      |   0
 .../management/ManagedRandomLoadBalancerTest.java  |   0
 .../camel/management/ManagedRecipientListTest.java |   0
 .../management/ManagedRedeliverRouteOnlyTest.java  |   0
 .../camel/management/ManagedRedeliverTest.java     |   0
 .../camel/management/ManagedRefProducerTest.java   |   0
 .../ManagedRegisterCamelContextTest.java           |   0
 .../management/ManagedRegisterEndpointTest.java    |   0
 .../ManagedRegisterExchangeStatisticsTest.java     |   0
 .../camel/management/ManagedRegisterRouteTest.java |   0
 .../management/ManagedRegisterTwoRoutesTest.java   |   0
 .../ManagedRemoveRouteAggregateThreadPoolTest.java |   0
 .../camel/management/ManagedResequencerTest.java   |   0
 .../ManagedResetIncludeProcessorsTest.java         |   0
 .../management/ManagedResetIncludeRoutesTest.java  |   0
 .../camel/management/ManagedResourceTest.java      |   0
 .../camel/management/ManagedRestRegistryTest.java  |   0
 .../ManagedRoundRobinLoadBalancerTest.java         |   0
 .../management/ManagedRouteAddFromRouteTest.java   |   0
 .../management/ManagedRouteAddRemoveTest.java      |   0
 ...outeAddSecondRouteNotRegisterNewRoutesTest.java |   0
 .../management/ManagedRouteAddSecondRouteTest.java |   0
 .../management/ManagedRouteAutoStartupTest.java    |   0
 .../ManagedRouteDirectWhileIssueLeakTest.java      |   0
 .../ManagedRouteDumpRouteAsXmlPlaceholderTest.java |   0
 .../management/ManagedRouteDumpRouteAsXmlTest.java |   0
 ...DumpStatsAsXmlAndResetWithCustomDomainTest.java |   0
 ...ManagedRouteDumpStatsAsXmlCustomDomainTest.java |   0
 .../management/ManagedRouteDumpStatsAsXmlTest.java |   0
 .../management/ManagedRouteGetPropertiesTest.java  |   0
 .../management/ManagedRouteLoadstatisticsTest.java |   0
 .../management/ManagedRouteNoAutoStartupTest.java  |   0
 .../ManagedRoutePerformanceCounterTest.java        |   0
 ...edRouteRemoveContextScopedErrorHandlerTest.java |   0
 ...emoveRouteAndContextScopedErrorHandlerTest.java |   0
 ...agedRouteRemoveRouteScopedErrorHandlerTest.java |   0
 .../camel/management/ManagedRouteRemoveTest.java   |   0
 ...edRouteRemoveWireTapExplicitThreadPoolTest.java |   0
 .../management/ManagedRouteRemoveWireTapTest.java  |   0
 .../camel/management/ManagedRouteRestartTest.java  |   0
 .../ManagedRouteShutdownAndStartTest.java          |   0
 .../ManagedRouteStopAndStartCleanupTest.java       |   0
 .../management/ManagedRouteStopAndStartTest.java   |   0
 .../camel/management/ManagedRouteStopTest.java     |   0
 .../ManagedRouteStopUsingMBeanAPITest.java         |   0
 .../ManagedRouteStopWithAbortAfterTimeoutTest.java |   0
 .../ManagedRouteSuspendAndResumeTest.java          |   0
 .../ManagedRouteUpdateRouteFromXmlTest.java        |   0
 .../ManagedRouteWithOnExceptionTest.java           |   0
 .../camel/management/ManagedRoutingSlipTest.java   |   0
 .../management/ManagedRuntimeCamelCatalogTest.java |   0
 .../camel/management/ManagedSanitizeTest.java      |   0
 .../ManagedScheduledPollConsumerTest.java          |   0
 .../camel/management/ManagedSedaEndpointTest.java  |   0
 .../management/ManagedSedaRouteRemoveTest.java     |   0
 .../ManagedSendDynamicProcessorTest.java           |   0
 .../camel/management/ManagedSendProcessorTest.java |   0
 .../management/ManagedServiceUrlPathTest.java      |   0
 ...ManagedSetAndRemoveHeaderAndPropertiesTest.java |   0
 .../management/ManagedShutdownStrategyTest.java    |   0
 .../camel/management/ManagedSplitterTest.java      |   0
 .../management/ManagedStatisticsDisabledTest.java  |   0
 .../management/ManagedStatisticsLevelOffTest.java  |   0
 .../ManagedStatisticsLevelRoutesOnlyTest.java      |   0
 .../camel/management/ManagedStatisticsTest.java    |   0
 .../ManagedStatisticsWithSplitterTest.java         |   0
 .../management/ManagedStickyLoadBalancerTest.java  |   0
 .../ManagedStreamCachingStrategyTest.java          |   0
 .../management/ManagedSuspendedServiceTest.java    |   0
 .../management/ManagedThreadPoolProfileTest.java   |   0
 .../camel/management/ManagedThreadPoolTest.java    |   0
 .../management/ManagedThreadPoolWithIdTest.java    |   0
 .../camel/management/ManagedThreadsTest.java       |   0
 .../camel/management/ManagedThrottlerTest.java     |   0
 .../ManagedThrottlingExceptionRoutePolicyTest.java |   0
 .../ManagedThrottlingInflightRoutePolicyTest.java  |   0
 .../apache/camel/management/ManagedTimerTest.java  |   0
 .../management/ManagedTopicLoadBalancerTest.java   |   0
 .../management/ManagedTransformerRegistryTest.java |   0
 .../ManagedTypeConverterRegistryTest.java          |   0
 .../camel/management/ManagedUnmarshalTest.java     |   0
 .../ManagedUnregisterCamelContextTest.java         |   0
 .../management/ManagedUnregisterComponentTest.java |   0
 .../management/ManagedUnregisterConsumerTest.java  |   0
 .../management/ManagedUnregisterEndpointTest.java  |   0
 .../management/ManagedUnregisterProcessorTest.java |   0
 .../management/ManagedUnregisterProducerTest.java  |   0
 .../management/ManagedUnregisterRouteTest.java     |   0
 .../management/ManagedValidatorRegistryTest.java   |   0
 .../ManagedWeightedLoadBalancerTest.java           |   0
 .../camel/management/ManagedWireTapTest.java       |   0
 .../camel/management/ManagementTestSupport.java    |   0
 .../management/MultiInstanceProcessorTest.java     |   0
 .../apache/camel/management/MyDummyProcessor.java  |   0
 .../org/apache/camel/management/MyManagedBean.java |   0
 .../camel/management/PublishEventNotifierTest.java |   0
 .../PublishEventNotifierToRouteTest.java           |   0
 .../camel/management/RemoveEventNotifierTest.java  |   0
 .../management/RemoveRouteDefinitionTest.java      |   0
 ...nagedCamelContextAutoAssignedNameClashTest.java |   0
 .../TwoManagedCamelContextClashTest.java           |   0
 .../management/TwoManagedCamelContextTest.java     |   0
 .../management/TwoManagedNamePatternTest.java      |   0
 .../apache/camel/processor/NoErrorHandlerTest.java |   0
 ...StacksNeededDuringRoutingSendProcessorTest.java |   0
 .../ReduceStacksNeededDuringRoutingTest.java       |   0
 .../processor/async/AsyncEndpointWithJMXTest.java  |   0
 .../src/test/resources/log4j2.properties           |   0
 {camel-support => core/camel-support}/pom.xml      |   4 +-
 .../apache/camel/component/ResourceEndpoint.java   |   0
 .../metadata/AbstractMetaDataExtension.java        |   0
 .../extension/metadata/DefaultMetaData.java        |   0
 .../extension/metadata/MetaDataBuilder.java        |   0
 .../component/extension/metadata/package.html      |   0
 .../verifier/CatalogVerifierCustomizer.java        |   0
 .../verifier/ComponentVerifierException.java       |   0
 .../DefaultComponentVerifierExtension.java         |   0
 .../extension/verifier/DefaultResult.java          |   0
 .../verifier/DefaultResultVerificationError.java   |   0
 .../extension/verifier/IllegalOptionException.java |   0
 .../extension/verifier/NoSuchOptionException.java  |   0
 .../component/extension/verifier/OptionsGroup.java |   0
 .../extension/verifier/ResultBuilder.java          |   0
 .../extension/verifier/ResultErrorBuilder.java     |   0
 .../extension/verifier/ResultErrorHelper.java      |   0
 .../component/extension/verifier/package.html      |   0
 .../stream/ByteArrayInputStreamCache.java          |   0
 .../stream/CachedByteArrayOutputStream.java        |   0
 .../camel/converter/stream/CachedOutputStream.java |   0
 .../apache/camel/converter/stream/CipherPair.java  |   0
 .../converter/stream/FileInputStreamCache.java     |   0
 .../camel/converter/stream/InputStreamCache.java   |   0
 .../converter/stream/OutputStreamBuilder.java      |   0
 .../apache/camel/converter/stream/ReaderCache.java |   0
 .../apache/camel/converter/stream/SourceCache.java |   0
 .../converter/stream/StreamCacheConverter.java     |   0
 .../camel/converter/stream/StreamSourceCache.java  |   0
 .../org/apache/camel/converter/stream/package.html |   0
 .../apache/camel/saga/CamelSagaCoordinator.java    |   0
 .../org/apache/camel/saga/CamelSagaService.java    |   0
 .../java/org/apache/camel/saga/CamelSagaStep.java  |   0
 .../main/java/org/apache/camel/saga/package.html   |   0
 .../AsyncCallbackToCompletableFutureAdapter.java   |   0
 .../support/AsyncProcessorConverterHelper.java     |   0
 .../apache/camel/support/AsyncProcessorHelper.java |   0
 .../camel/support/AsyncProcessorSupport.java       |   0
 .../org/apache/camel/support/AttachmentMap.java    |   0
 .../apache/camel/support/BaseSelectorProducer.java |   0
 .../BridgeExceptionHandlerToErrorHandler.java      |   0
 .../apache/camel/support/CamelContextHelper.java   |   0
 .../camel/support/CamelObjectInputStream.java      |   0
 .../apache/camel/support/ChildServiceSupport.java  |   0
 .../apache/camel/support/DefaultAsyncProducer.java |   0
 .../apache/camel/support/DefaultAttachment.java    |   0
 .../org/apache/camel/support/DefaultComponent.java |   0
 .../org/apache/camel/support/DefaultConsumer.java  |   0
 .../org/apache/camel/support/DefaultEndpoint.java  |   0
 .../org/apache/camel/support/DefaultExchange.java  |   0
 .../camel/support/DefaultExchangeHolder.java       |   0
 .../camel/support/DefaultHeaderFilterStrategy.java |   0
 .../org/apache/camel/support/DefaultMessage.java   |   0
 .../camel/support/DefaultMessageHistory.java       |   0
 .../DefaultPollingConsumerPollStrategy.java        |   0
 .../camel/support/DefaultPollingEndpoint.java      |   0
 .../org/apache/camel/support/DefaultProducer.java  |   0
 .../support/DefaultScheduledPollConsumer.java      |   0
 .../DefaultScheduledPollConsumerScheduler.java     |   0
 .../camel/support/DefaultThreadPoolFactory.java    |   0
 .../apache/camel/support/DefaultTimeoutMap.java    |   0
 .../apache/camel/support/EmptyAsyncCallback.java   |   0
 .../org/apache/camel/support/EndpointHelper.java   |   0
 .../camel/support/EventDrivenPollingConsumer.java  |   0
 .../java/org/apache/camel/support/EventHelper.java |   0
 .../apache/camel/support/EventNotifierSupport.java |   0
 .../org/apache/camel/support/ExchangeHelper.java   |   0
 .../apache/camel/support/ExpressionAdapter.java    |   0
 .../apache/camel/support/ExpressionComparator.java |   0
 .../camel/support/ExpressionListComparator.java    |   0
 .../apache/camel/support/ExpressionSupport.java    |   0
 .../support/ExpressionToPredicateAdapter.java      |   0
 .../java/org/apache/camel/support/GZIPHelper.java  |   0
 .../org/apache/camel/support/GroupIterator.java    |   0
 .../apache/camel/support/GroupTokenIterator.java   |   0
 .../support/HeaderFilterStrategyComponent.java     |   0
 .../camel/support/HeaderSelectorProducer.java      |   0
 .../apache/camel/support/IntrospectionSupport.java |   0
 .../org/apache/camel/support/JSonSchemaHelper.java |   0
 .../java/org/apache/camel/support/LRUCache.java    |   0
 .../org/apache/camel/support/LRUCacheFactory.java  |   0
 .../org/apache/camel/support/LRUSoftCache.java     |   0
 .../org/apache/camel/support/LRUWeakCache.java     |   0
 .../org/apache/camel/support/LanguageSupport.java  |   0
 .../camel/support/LifecycleStrategySupport.java    |   0
 .../camel/support/LoggingExceptionHandler.java     |   0
 .../org/apache/camel/support/MessageHelper.java    |   0
 .../org/apache/camel/support/MessageSupport.java   |   0
 .../main/java/org/apache/camel/support/NoLock.java |   0
 .../org/apache/camel/support/ObjectHelper.java     |   0
 .../apache/camel/support/OrderedComparator.java    |   0
 .../org/apache/camel/support/PatternHelper.java    |   0
 .../org/apache/camel/support/PlatformHelper.java   |   0
 .../camel/support/PollingConsumerSupport.java      |   0
 .../camel/support/PredicateAssertHelper.java       |   0
 .../support/PredicateToExpressionAdapter.java      |   0
 .../apache/camel/support/ProcessorEndpoint.java    |   0
 .../camel/support/ProcessorPollingConsumer.java    |   0
 .../camel/support/PropertyPlaceholdersHelper.java  |   0
 .../org/apache/camel/support/ReactiveHelper.java   |   0
 .../org/apache/camel/support/ResolverHelper.java   |   0
 .../org/apache/camel/support/ResourceHelper.java   |   0
 .../support/RestConsumerContextPathMatcher.java    |   0
 .../camel/support/RestProducerFactoryHelper.java   |   0
 .../apache/camel/support/RoutePolicySupport.java   |   0
 .../support/ScheduledBatchPollingConsumer.java     |   0
 .../camel/support/ScheduledPollConsumer.java       |   0
 .../camel/support/ScheduledPollEndpoint.java       |   0
 .../apache/camel/support/SimpleUuidGenerator.java  |   0
 .../camel/support/SynchronizationAdapter.java      |   0
 .../camel/support/SynchronousDelegateProducer.java |   0
 .../org/apache/camel/support/TimeoutMapEntry.java  |   0
 .../apache/camel/support/TimerListenerManager.java |   0
 .../apache/camel/support/TypeConverterSupport.java |   0
 .../org/apache/camel/support/UnitOfWorkHelper.java |   0
 .../camel/support/builder/xml/StAX2SAXSource.java  |   0
 .../support/builder/xml/XMLConverterHelper.java    |   0
 .../cluster/AbstractCamelClusterService.java       |   0
 .../support/cluster/AbstractCamelClusterView.java  |   0
 .../support/cluster/ClusterServiceHelper.java      |   0
 .../support/cluster/ClusterServiceSelectors.java   |   0
 .../support/component/AbstractApiComponent.java    |   0
 .../support/component/AbstractApiConsumer.java     |   0
 .../support/component/AbstractApiEndpoint.java     |   0
 .../support/component/AbstractApiProducer.java     |   0
 .../camel/support/component/ApiCollection.java     |   0
 .../camel/support/component/ApiConsumerHelper.java |   0
 .../apache/camel/support/component/ApiMethod.java  |   0
 .../camel/support/component/ApiMethodArg.java      |   0
 .../camel/support/component/ApiMethodHelper.java   |   0
 .../camel/support/component/ApiMethodImpl.java     |   0
 .../camel/support/component/ApiMethodParser.java   |   0
 .../component/ApiMethodPropertiesHelper.java       |   0
 .../apache/camel/support/component/ApiName.java    |   0
 .../component/ArgumentSubstitutionParser.java      |   0
 .../support/component/PropertiesInterceptor.java   |   0
 .../component/PropertyNamesInterceptor.java        |   0
 .../camel/support/component/ResultInterceptor.java |   0
 .../apache/camel/support/component/package.html    |   0
 .../support/jndi/CamelInitialContextFactory.java   |   0
 .../jndi/CamelSingletonInitialContextFactory.java  |   0
 .../org/apache/camel/support/jndi/JndiContext.java |   0
 .../org/apache/camel/support/jndi/package.html     |   0
 .../java/org/apache/camel/support/package.html     |   0
 .../camel/support/processor/CamelLogProcessor.java |   0
 .../processor/DefaultExchangeFormatter.java        |   0
 .../support/processor/DefaultMaskingFormatter.java |   0
 .../support/processor/DelegateAsyncProcessor.java  |   0
 .../camel/support/processor/DelegateProcessor.java |   0
 .../support/processor/DelegateSyncProcessor.java   |   0
 .../camel/support/processor/MarshalProcessor.java  |   0
 .../camel/support/processor/ThroughputLogger.java  |   0
 .../support/processor/UnmarshalProcessor.java      |   0
 .../idempotent/FileIdempotentRepository.java       |   0
 .../idempotent/MemoryIdempotentRepository.java     |   0
 .../validation/DefaultValidationErrorHandler.java  |   0
 .../validation/NoXmlBodyValidationException.java   |   0
 .../validation/NoXmlHeaderValidationException.java |   0
 .../validation/PredicateValidatingProcessor.java   |   0
 .../validation/PredicateValidationException.java   |   0
 .../support/processor/validation/SchemaReader.java |   0
 .../validation/SchemaValidationException.java      |   0
 .../processor/validation/ValidatingProcessor.java  |   0
 .../validation/ValidatorErrorHandler.java          |   0
 .../support/processor/validation/package.html      |   0
 {camel-util-json => core/camel-util-json}/pom.xml  |   4 +-
 .../camel/util/json/DeserializationException.java  |   0
 .../java/org/apache/camel/util/json/JsonArray.java |   0
 .../org/apache/camel/util/json/JsonObject.java     |   0
 .../java/org/apache/camel/util/json/Jsonable.java  |   0
 .../java/org/apache/camel/util/json/Jsoner.java    |   0
 .../java/org/apache/camel/util/json/Yylex.java     |   0
 .../java/org/apache/camel/util/json/Yytoken.java   |   0
 .../src/main}/resources/META-INF/LICENSE.txt       |   0
 .../src/main/resources/META-INF/NOTICE.txt         |   0
 .../camel/util/json/JsonSimpleOrderedTest.java     |   0
 .../camel-util-json}/src/test/resources/bean.json  |   0
 {camel-util => core/camel-util}/pom.xml            |   4 +-
 .../java/org/apache/camel/util/AntPathMatcher.java |   0
 .../org/apache/camel/util/CamelVersionHelper.java  |   0
 .../org/apache/camel/util/CaseInsensitiveMap.java  |   0
 .../main/java/org/apache/camel/util/CastUtils.java |   0
 .../org/apache/camel/util/CollectionHelper.java    |   0
 .../apache/camel/util/CollectionStringBuffer.java  |   0
 .../org/apache/camel/util/FilePathResolver.java    |   0
 .../main/java/org/apache/camel/util/FileUtil.java  |   0
 .../java/org/apache/camel/util/FilterIterator.java |   0
 .../main/java/org/apache/camel/util/HostUtils.java |   0
 .../main/java/org/apache/camel/util/IOHelper.java  |   0
 .../org/apache/camel/util/InetAddressUtil.java     |   0
 .../apache/camel/util/IntrospectionSupport.java    |   0
 .../java/org/apache/camel/util/KeyValueHolder.java |   0
 .../java/org/apache/camel/util/ObjectHelper.java   |   0
 .../java/org/apache/camel/util/OgnlHelper.java     |   0
 .../java/org/apache/camel/util/PackageHelper.java  |   0
 .../src/main/java/org/apache/camel/util/Pair.java  |   0
 .../java/org/apache/camel/util/ReferenceCount.java |   0
 .../org/apache/camel/util/ReflectionHelper.java    |   0
 .../main/java/org/apache/camel/util/Scanner.java   |   0
 .../java/org/apache/camel/util/SedaConstants.java  |   0
 .../java/org/apache/camel/util/SkipIterator.java   |   0
 .../main/java/org/apache/camel/util/StopWatch.java |   0
 .../java/org/apache/camel/util/StreamUtils.java    |   0
 .../java/org/apache/camel/util/StringHelper.java   |   0
 .../org/apache/camel/util/StringQuoteHelper.java   |   0
 .../main/java/org/apache/camel/util/TimeUtils.java |   0
 .../java/org/apache/camel/util/URIScanner.java     |   0
 .../java/org/apache/camel/util/URISupport.java     |   0
 .../main/java/org/apache/camel/util/UnitUtils.java |   0
 .../camel/util/UnsafeUriCharactersEncoder.java     |   0
 .../org/apache/camel/util/XmlLineNumberParser.java |   0
 .../org/apache/camel/util/backoff/BackOff.java     |   0
 .../apache/camel/util/backoff/BackOffTimer.java    |   0
 .../camel/util/backoff/BackOffTimerTask.java       |   0
 .../org/apache/camel/util/backoff/package.html     |   0
 .../util/concurrent/AsyncCompletionService.java    |   0
 .../camel/util/concurrent/CamelThreadFactory.java  |   0
 .../apache/camel/util/concurrent/LockHelper.java   |   0
 .../apache/camel/util/concurrent/Rejectable.java   |   0
 .../util/concurrent/RejectableFutureTask.java      |   0
 .../RejectableScheduledThreadPoolExecutor.java     |   0
 .../concurrent/RejectableThreadPoolExecutor.java   |   0
 .../concurrent/SizedScheduledExecutorService.java  |   0
 .../concurrent/SubmitOrderedCompletionService.java |   0
 .../concurrent/SynchronousExecutorService.java     |   0
 .../apache/camel/util/concurrent/ThreadHelper.java |   0
 .../util/concurrent/ThreadPoolRejectedPolicy.java  |   0
 .../apache/camel/util/concurrent/package-info.java |   0
 .../org/apache/camel/util/concurrent/package.html  |   0
 .../org/apache/camel/util/function/Bindings.java   |   0
 .../org/apache/camel/util/function/Predicates.java |   0
 .../org/apache/camel/util/function/Suppliers.java  |   0
 .../camel/util/function/ThrowingBiConsumer.java    |   0
 .../camel/util/function/ThrowingBiFunction.java    |   0
 .../camel/util/function/ThrowingConsumer.java      |   0
 .../camel/util/function/ThrowingFunction.java      |   0
 .../apache/camel/util/function/ThrowingHelper.java |   0
 .../camel/util/function/ThrowingRunnable.java      |   0
 .../camel/util/function/ThrowingSupplier.java      |   0
 .../util/function/ThrowingToLongFunction.java      |   0
 .../camel/util/function/ThrowingTriConsumer.java   |   0
 .../apache/camel/util/function/TriConsumer.java    |   0
 .../org/apache/camel/util/function/package.html    |   0
 .../main/java/org/apache/camel/util/package.html   |   0
 .../org/apache/camel/util/AntPathMatcherTest.java  |   0
 .../apache/camel/util/CamelVersionHelperTest.java  |   0
 .../apache/camel/util/CollectionHelperTest.java    |   0
 .../camel/util/CollectionStringBufferTest.java     |   0
 .../java/org/apache/camel/util/URISupportTest.java |   0
 .../java/org/apache/camel/util/UnitUtilsTest.java  |   0
 .../org/apache/camel/util/backoff/BackOffTest.java |   0
 .../camel/util/backoff/BackOffTimerTest.java       |   0
 .../concurrent/AsyncCompletionServiceTest.java     |   0
 .../SizedScheduledExecutorServiceTest.java         |   0
 .../SubmitOrderedCompletionServiceTest.java        |   0
 .../concurrent/SynchronousExecutorServiceTest.java |   0
 .../apache/camel/util/function/PredicatesTest.java |   0
 {camel-util-json => core}/pom.xml                  |  34 +++++++-------
 platforms/camel-catalog/pom.xml                    |   6 +--
 pom.xml                                            |   9 +---
 .../camel/maven/EipDocumentationEnricherMojo.java  |   2 +-
 .../camel/maven/packaging/PackageHelper.java       |  10 ++---
 4639 files changed, 51 insertions(+), 99 deletions(-)

diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index d834ebb..bd80e9a 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -282,14 +282,14 @@
                         <include name="org/apache/camel/core/xml/*.java"/>
                         <include name="org/apache/camel/core/xml/util/**/*.java"/>
                       </fileset>
-                      <fileset dir="${basedir}/../../camel-core/src/main/java">
+                      <fileset dir="${basedir}/../../core/camel-core/src/main/java">
                         <include name="org/apache/camel/model/**/*.java"/>
                         <include name="org/apache/camel/ExchangePattern.java"/>
                         <include name="org/apache/camel/LoggingLevel.java"/>
                         <include name="org/apache/camel/ManagementStatisticsLevel.java"/>
                         <include name="**/package-info.java"/>
                       </fileset>
-                      <fileset dir="${basedir}/../../camel-util/src/main/java">
+                      <fileset dir="${basedir}/../../core/camel-util/src/main/java">
                         <include name="org/apache/camel/util/concurrent/ThreadPoolRejectedPolicy.java" />
                       </fileset>
                     </copy>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index e0a0097..04c97e4 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -259,7 +259,7 @@
                     <include name="org/apache/camel/core/xml/*.java" />
                     <include name="org/apache/camel/core/xml/util/**/*.java" />
                   </fileset>
-                  <fileset dir="${basedir}/../../camel-core/src/main/java">
+                  <fileset dir="${basedir}/../../core/camel-core/src/main/java">
                     <include name="org/apache/camel/model/**/*.java" />
                     <include name="org/apache/camel/ExchangePattern.java" />
                     <include name="org/apache/camel/LoggingLevel.java" />
@@ -269,7 +269,7 @@
                     <include name="org/apache/camel/WaitForTaskToComplete.java" />
                     <include name="org/apache/camel/package-info.java" />
                   </fileset>
-                  <fileset dir="${basedir}/../../camel-util/src/main/java">
+                  <fileset dir="${basedir}/../../core/camel-util/src/main/java">
                     <include name="org/apache/camel/concurrent/ThreadPoolRejectedPolicy.java" />
                   </fileset>
                 </copy>
diff --git a/components/readme.adoc b/components/readme.adoc
index 5bff7ef..5ebc9d7 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1,7 +1,7 @@
 ==== Components
 
 // components: START
-Number of Components: 288 in 209 JAR artifacts (0 deprecated)
+Number of Components: 283 in 208 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -118,9 +118,6 @@ Number of Components: 288 in 209 JAR artifacts (0 deprecated)
 | link:camel-azure/src/main/docs/azure-queue-component.adoc[Azure Storage Queue Service] (camel-azure) +
 `azure-queue:containerAndQueueUri` | 2.19 | The azure-queue component is used for storing and retrieving messages from Azure Storage Queue Service.
 
-| link:../camel-core/src/main/docs/bean-component.adoc[Bean] (camel-core) +
-`bean:beanName` | 1.0 | The bean component is for invoking Java beans from Camel.
-
 | link:camel-bean-validator/src/main/docs/bean-validator-component.adoc[Bean Validator] (camel-bean-validator) +
 `bean-validator:label` | 2.3 | The Validator component performs bean validation of the message body using the Java Bean Validation API.
 
@@ -151,9 +148,6 @@ Number of Components: 288 in 209 JAR artifacts (0 deprecated)
 | link:camel-chunk/src/main/docs/chunk-component.adoc[Chunk] (camel-chunk) +
 `chunk:resourceUri` | 2.15 | Transforms the message using a Chunk template.
 
-| link:../camel-core/src/main/docs/class-component.adoc[Class] (camel-core) +
-`class:beanName` | 2.4 | The Class Component is for invoking Java Classes (Java beans) from Camel.
-
 | link:camel-cm-sms/src/main/docs/cm-sms-component.adoc[CM SMS Gateway] (camel-cm-sms) +
 `cm-sms:host` | 2.18 | The cm-sms component allows to integrate with CM SMS Gateway.
 
@@ -196,9 +190,6 @@ Number of Components: 288 in 209 JAR artifacts (0 deprecated)
 | link:camel-dataformat/src/main/docs/dataformat-component.adoc[Data Format] (camel-dataformat) +
 `dataformat:name:operation` | 2.12 | The dataformat component is used for working with Data Formats as if it was a regular Component supporting Endpoints and URIs.
 
-| link:../camel-core/src/main/docs/dataset-component.adoc[Dataset] (camel-core) +
-`dataset:name` | 1.3 | The dataset component provides a mechanism to easily perform load & soak testing of your system.
-
 | link:camel-digitalocean/src/main/docs/digitalocean-component.adoc[DigitalOcean] (camel-digitalocean) +
 `digitalocean:operation` | 2.19 | The DigitalOcean component allows you to manage Droplets and resources within the DigitalOcean cloud.
 
@@ -547,9 +538,6 @@ Number of Components: 288 in 209 JAR artifacts (0 deprecated)
 | link:camel-mllp/src/main/docs/mllp-component.adoc[MLLP] (camel-mllp) +
 `mllp:hostname:port` | 2.17 | Provides functionality required by Healthcare providers to communicate with other systems using the MLLP protocol.
 
-| link:../camel-core/src/main/docs/mock-component.adoc[Mock] (camel-core) +
-`mock:name` | 1.0 | The mock component is used for testing routes and mediation rules using mocks.
-
 | link:camel-mongodb3/src/main/docs/mongodb3-component.adoc[MongoDB] (camel-mongodb3) +
 `mongodb3:connectionBean` | 2.19 | Component for working with documents stored in MongoDB database.
 
@@ -793,9 +781,6 @@ Number of Components: 288 in 209 JAR artifacts (0 deprecated)
 | link:camel-telegram/src/main/docs/telegram-component.adoc[Telegram] (camel-telegram) +
 `telegram:type/authorizationToken` | 2.18 | The telegram component provides access to the Telegram Bot API.
 
-| link:../camel-core/src/main/docs/test-component.adoc[Test] (camel-core) +
-`test:name` | 1.3 | The test component extends the mock component by on startup to pull messages from another endpoint to set the expected message bodies.
-
 | link:camel-thrift/src/main/docs/thrift-component.adoc[Thrift] (camel-thrift) +
 `thrift:host:port/service` | 2.20 | The Thrift component allows to call and expose remote procedures (RPC) with Apache Thrift data format and serialization mechanism
 
@@ -878,7 +863,7 @@ Number of Components: 288 in 209 JAR artifacts (0 deprecated)
 ==== Data Formats
 
 // dataformats: START
-Number of Data Formats: 45 in 35 JAR artifacts (0 deprecated)
+Number of Data Formats: 41 in 34 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -912,16 +897,12 @@ Number of Data Formats: 45 in 35 JAR artifacts (0 deprecated)
 
 | link:camel-flatpack/src/main/docs/flatpack-dataformat.adoc[Flatpack] (camel-flatpack) | 2.1 | The Flatpack data format is used for working with flat payloads (such as CSV, delimited, or fixed length formats).
 
-| link:../camel-core/src/main/docs/gzip-dataformat.adoc[GZip] (camel-core) | 2.0 | The GZip data format is a message compression and de-compression format (which works with the popular gzip/gunzip tools).
-
 | link:camel-hl7/src/main/docs/hl7-dataformat.adoc[HL7] (camel-hl7) | 2.0 | The HL7 data format can be used to marshal or unmarshal HL7 (Health Care) model objects.
 
 | link:camel-ical/src/main/docs/ical-dataformat.adoc[iCal] (camel-ical) | 2.12 | The iCal dataformat is used for working with iCalendar messages.
 
 | link:camel-jacksonxml/src/main/docs/jacksonxml-dataformat.adoc[JacksonXML] (camel-jacksonxml) | 2.16 | JacksonXML data format is used for unmarshal a XML payload to POJO or to marshal POJO back to XML payload.
 
-| link:../camel-core/src/main/docs/serialization-dataformat.adoc[Java Object Serialization] (camel-core) | 2.12 | Serialization is a data format which uses the standard Java Serialization mechanism to unmarshal a binary payload into Java objects or to marshal Java objects into a binary blob.
-
 | link:camel-jaxb/src/main/docs/jaxb-dataformat.adoc[JAXB] (camel-jaxb) | 1.0 | JAXB data format uses the JAXB2 XML marshalling standard to unmarshal an XML payload into Java objects or to marshal Java objects into an XML payload.
 
 | link:camel-jibx/src/main/docs/jibx-dataformat.adoc[JiBX] (camel-jibx) | 2.6 | JiBX data format is used for unmarshal a XML payload to POJO or to marshal POJO back to XML payload.
@@ -948,8 +929,6 @@ Number of Data Formats: 45 in 35 JAR artifacts (0 deprecated)
 
 | link:camel-soap/src/main/docs/soapjaxb-dataformat.adoc[SOAP] (camel-soap) | 2.3 | SOAP is a data format which uses JAXB2 and JAX-WS annotations to marshal and unmarshal SOAP payloads.
 
-| link:../camel-core/src/main/docs/string-dataformat.adoc[String Encoding] (camel-core) | 2.12 | String data format is a textual based format that supports character encoding.
-
 | link:camel-syslog/src/main/docs/syslog-dataformat.adoc[Syslog] (camel-syslog) | 2.6 | The Syslog dataformat is used for working with RFC3164 and RFC5424 messages (logging and monitoring).
 
 | link:camel-tarfile/src/main/docs/tarfile-dataformat.adoc[Tar File] (camel-tarfile) | 2.16 | The Tar File data format is a message compression and de-compression format of tar files.
@@ -970,8 +949,6 @@ Number of Data Formats: 45 in 35 JAR artifacts (0 deprecated)
 
 | link:camel-snakeyaml/src/main/docs/yaml-snakeyaml-dataformat.adoc[YAML SnakeYAML] (camel-snakeyaml) | 2.17 | YAML is a data format to marshal and unmarshal Java objects to and from YAML.
 
-| link:../camel-core/src/main/docs/zip-dataformat.adoc[Zip Deflate Compression] (camel-core) | 2.12 | Zip Deflate Compression data format is a message compression and de-compression format (not zip files).
-
 | link:camel-zipfile/src/main/docs/zipfile-dataformat.adoc[Zip File] (camel-zipfile) | 2.11 | The Zip File data format is a message compression and de-compression format of zip files.
 |===
 // dataformats: END
@@ -980,24 +957,14 @@ Number of Data Formats: 45 in 35 JAR artifacts (0 deprecated)
 ==== Expression Languages
 
 // languages: START
-Number of Languages: 18 in 9 JAR artifacts (1 deprecated)
+Number of Languages: 8 in 8 JAR artifacts (1 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
 | Language | Available From | Description
 
-| link:../camel-core/src/main/docs/bean-language.adoc[Bean method] (camel-core) | 1.3 | To use a Java bean (aka method call) in Camel expressions or predicates.
-
-| link:../camel-core/src/main/docs/constant-language.adoc[Constant] (camel-core) | 1.5 | To use a constant value in Camel expressions or predicates.
-
-| link:../camel-core/src/main/docs/exchangeProperty-language.adoc[ExchangeProperty] (camel-core) | 2.0 | To use a Camel Exchange property in expressions or predicates.
-
-| link:../camel-core/src/main/docs/file-language.adoc[File] (camel-core) | 1.1 | For expressions and predicates using the file/simple language
-
 | link:camel-groovy/src/main/docs/groovy-language.adoc[Groovy] (camel-groovy) | 1.3 | To use Groovy scripts in Camel expressions or predicates.
 
-| link:../camel-core/src/main/docs/header-language.adoc[Header] (camel-core) | 1.5 | To use a Camel Message header in expressions or predicates.
-
 | link:camel-hl7/src/main/docs/terser-language.adoc[HL7 Terser] (camel-hl7) | 2.11 | To use HL7 terser scripts in Camel expressions or predicates.
 
 | link:camel-script/src/main/docs/javaScript-language.adoc[JavaScript] (camel-script) | 1.0 | *deprecated* To use JavaScript in Camel expressions or predicates.
@@ -1008,18 +975,8 @@ Number of Languages: 18 in 9 JAR artifacts (1 deprecated)
 
 | link:camel-ognl/src/main/docs/ognl-language.adoc[OGNL] (camel-ognl) | 1.1 | To use OGNL scripts in Camel expressions or predicates.
 
-| link:../camel-core/src/main/docs/ref-language.adoc[Ref] (camel-core) | 2.8 | Reference to an existing Camel expression or predicate, which is looked up from the Camel registry.
-
-| link:../camel-core/src/main/docs/simple-language.adoc[Simple] (camel-core) | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
-
 | link:camel-spring/src/main/docs/spel-language.adoc[SpEL] (camel-spring) | 2.7 | To use Spring Expression Language (SpEL) in Camel expressions or predicates.
 
-| link:../camel-core/src/main/docs/tokenize-language.adoc[Tokenize] (camel-core) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
-
-| link:../camel-core/src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-core) | 2.14 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates.
-
-| link:../camel-core/src/main/docs/xpath-language.adoc[XPath] (camel-core) | 1.1 | To use XPath (XML) in Camel expressions or predicates.
-
 | link:camel-saxon/src/main/docs/xquery-language.adoc[XQuery] (camel-saxon) | 1.0 | To use XQuery (XML) in Camel expressions or predicates.
 |===
 // languages: END
diff --git a/camel-api/pom.xml b/core/camel-api/pom.xml
similarity index 99%
rename from camel-api/pom.xml
rename to core/camel-api/pom.xml
index 629f6bf..189ccc2 100644
--- a/camel-api/pom.xml
+++ b/core/camel-api/pom.xml
@@ -24,9 +24,9 @@
 
   <parent>
     <groupId>org.apache.camel</groupId>
-    <artifactId>camel-parent</artifactId>
+    <artifactId>core</artifactId>
     <version>3.0.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <artifactId>camel-api</artifactId>
diff --git a/camel-api/src/main/java/org/apache/camel/AfterPropertiesConfigured.java b/core/camel-api/src/main/java/org/apache/camel/AfterPropertiesConfigured.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/AfterPropertiesConfigured.java
rename to core/camel-api/src/main/java/org/apache/camel/AfterPropertiesConfigured.java
diff --git a/camel-api/src/main/java/org/apache/camel/AggregationStrategy.java b/core/camel-api/src/main/java/org/apache/camel/AggregationStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/AggregationStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/AggregationStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/AlreadyStoppedException.java b/core/camel-api/src/main/java/org/apache/camel/AlreadyStoppedException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/AlreadyStoppedException.java
rename to core/camel-api/src/main/java/org/apache/camel/AlreadyStoppedException.java
diff --git a/camel-api/src/main/java/org/apache/camel/AsyncCallback.java b/core/camel-api/src/main/java/org/apache/camel/AsyncCallback.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/AsyncCallback.java
rename to core/camel-api/src/main/java/org/apache/camel/AsyncCallback.java
diff --git a/camel-api/src/main/java/org/apache/camel/AsyncEndpoint.java b/core/camel-api/src/main/java/org/apache/camel/AsyncEndpoint.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/AsyncEndpoint.java
rename to core/camel-api/src/main/java/org/apache/camel/AsyncEndpoint.java
diff --git a/camel-api/src/main/java/org/apache/camel/AsyncProcessor.java b/core/camel-api/src/main/java/org/apache/camel/AsyncProcessor.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/AsyncProcessor.java
rename to core/camel-api/src/main/java/org/apache/camel/AsyncProcessor.java
diff --git a/camel-api/src/main/java/org/apache/camel/AsyncProducer.java b/core/camel-api/src/main/java/org/apache/camel/AsyncProducer.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/AsyncProducer.java
rename to core/camel-api/src/main/java/org/apache/camel/AsyncProducer.java
diff --git a/camel-api/src/main/java/org/apache/camel/Attachment.java b/core/camel-api/src/main/java/org/apache/camel/Attachment.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Attachment.java
rename to core/camel-api/src/main/java/org/apache/camel/Attachment.java
diff --git a/camel-api/src/main/java/org/apache/camel/AttachmentObjects.java b/core/camel-api/src/main/java/org/apache/camel/AttachmentObjects.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/AttachmentObjects.java
rename to core/camel-api/src/main/java/org/apache/camel/AttachmentObjects.java
diff --git a/camel-api/src/main/java/org/apache/camel/Attachments.java b/core/camel-api/src/main/java/org/apache/camel/Attachments.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Attachments.java
rename to core/camel-api/src/main/java/org/apache/camel/Attachments.java
diff --git a/camel-api/src/main/java/org/apache/camel/BatchConsumer.java b/core/camel-api/src/main/java/org/apache/camel/BatchConsumer.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/BatchConsumer.java
rename to core/camel-api/src/main/java/org/apache/camel/BatchConsumer.java
diff --git a/camel-api/src/main/java/org/apache/camel/BeanInject.java b/core/camel-api/src/main/java/org/apache/camel/BeanInject.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/BeanInject.java
rename to core/camel-api/src/main/java/org/apache/camel/BeanInject.java
diff --git a/camel-api/src/main/java/org/apache/camel/BinaryPredicate.java b/core/camel-api/src/main/java/org/apache/camel/BinaryPredicate.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/BinaryPredicate.java
rename to core/camel-api/src/main/java/org/apache/camel/BinaryPredicate.java
diff --git a/camel-api/src/main/java/org/apache/camel/Body.java b/core/camel-api/src/main/java/org/apache/camel/Body.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Body.java
rename to core/camel-api/src/main/java/org/apache/camel/Body.java
diff --git a/camel-api/src/main/java/org/apache/camel/Builder.java b/core/camel-api/src/main/java/org/apache/camel/Builder.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Builder.java
rename to core/camel-api/src/main/java/org/apache/camel/Builder.java
diff --git a/camel-api/src/main/java/org/apache/camel/BytesSource.java b/core/camel-api/src/main/java/org/apache/camel/BytesSource.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/BytesSource.java
rename to core/camel-api/src/main/java/org/apache/camel/BytesSource.java
diff --git a/camel-api/src/main/java/org/apache/camel/CamelAuthorizationException.java b/core/camel-api/src/main/java/org/apache/camel/CamelAuthorizationException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/CamelAuthorizationException.java
rename to core/camel-api/src/main/java/org/apache/camel/CamelAuthorizationException.java
diff --git a/camel-api/src/main/java/org/apache/camel/CamelContext.java b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/CamelContext.java
rename to core/camel-api/src/main/java/org/apache/camel/CamelContext.java
diff --git a/camel-api/src/main/java/org/apache/camel/CamelContextAware.java b/core/camel-api/src/main/java/org/apache/camel/CamelContextAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/CamelContextAware.java
rename to core/camel-api/src/main/java/org/apache/camel/CamelContextAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/CamelException.java b/core/camel-api/src/main/java/org/apache/camel/CamelException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/CamelException.java
rename to core/camel-api/src/main/java/org/apache/camel/CamelException.java
diff --git a/camel-api/src/main/java/org/apache/camel/CamelExchangeException.java b/core/camel-api/src/main/java/org/apache/camel/CamelExchangeException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/CamelExchangeException.java
rename to core/camel-api/src/main/java/org/apache/camel/CamelExchangeException.java
diff --git a/camel-api/src/main/java/org/apache/camel/CamelExecutionException.java b/core/camel-api/src/main/java/org/apache/camel/CamelExecutionException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/CamelExecutionException.java
rename to core/camel-api/src/main/java/org/apache/camel/CamelExecutionException.java
diff --git a/camel-api/src/main/java/org/apache/camel/CamelUnitOfWorkException.java b/core/camel-api/src/main/java/org/apache/camel/CamelUnitOfWorkException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/CamelUnitOfWorkException.java
rename to core/camel-api/src/main/java/org/apache/camel/CamelUnitOfWorkException.java
diff --git a/camel-api/src/main/java/org/apache/camel/Channel.java b/core/camel-api/src/main/java/org/apache/camel/Channel.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Channel.java
rename to core/camel-api/src/main/java/org/apache/camel/Channel.java
diff --git a/camel-api/src/main/java/org/apache/camel/Component.java b/core/camel-api/src/main/java/org/apache/camel/Component.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Component.java
rename to core/camel-api/src/main/java/org/apache/camel/Component.java
diff --git a/camel-api/src/main/java/org/apache/camel/ComponentAware.java b/core/camel-api/src/main/java/org/apache/camel/ComponentAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ComponentAware.java
rename to core/camel-api/src/main/java/org/apache/camel/ComponentAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/Consume.java b/core/camel-api/src/main/java/org/apache/camel/Consume.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Consume.java
rename to core/camel-api/src/main/java/org/apache/camel/Consume.java
diff --git a/camel-api/src/main/java/org/apache/camel/Consumer.java b/core/camel-api/src/main/java/org/apache/camel/Consumer.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Consumer.java
rename to core/camel-api/src/main/java/org/apache/camel/Consumer.java
diff --git a/camel-api/src/main/java/org/apache/camel/ConsumerTemplate.java b/core/camel-api/src/main/java/org/apache/camel/ConsumerTemplate.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ConsumerTemplate.java
rename to core/camel-api/src/main/java/org/apache/camel/ConsumerTemplate.java
diff --git a/camel-api/src/main/java/org/apache/camel/Converter.java b/core/camel-api/src/main/java/org/apache/camel/Converter.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Converter.java
rename to core/camel-api/src/main/java/org/apache/camel/Converter.java
diff --git a/camel-api/src/main/java/org/apache/camel/DeferredContextBinding.java b/core/camel-api/src/main/java/org/apache/camel/DeferredContextBinding.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/DeferredContextBinding.java
rename to core/camel-api/src/main/java/org/apache/camel/DeferredContextBinding.java
diff --git a/camel-api/src/main/java/org/apache/camel/DelegateEndpoint.java b/core/camel-api/src/main/java/org/apache/camel/DelegateEndpoint.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/DelegateEndpoint.java
rename to core/camel-api/src/main/java/org/apache/camel/DelegateEndpoint.java
diff --git a/camel-api/src/main/java/org/apache/camel/DelegateProcessor.java b/core/camel-api/src/main/java/org/apache/camel/DelegateProcessor.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/DelegateProcessor.java
rename to core/camel-api/src/main/java/org/apache/camel/DelegateProcessor.java
diff --git a/camel-api/src/main/java/org/apache/camel/DynamicRouter.java b/core/camel-api/src/main/java/org/apache/camel/DynamicRouter.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/DynamicRouter.java
rename to core/camel-api/src/main/java/org/apache/camel/DynamicRouter.java
diff --git a/camel-api/src/main/java/org/apache/camel/Endpoint.java b/core/camel-api/src/main/java/org/apache/camel/Endpoint.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Endpoint.java
rename to core/camel-api/src/main/java/org/apache/camel/Endpoint.java
diff --git a/camel-api/src/main/java/org/apache/camel/EndpointAware.java b/core/camel-api/src/main/java/org/apache/camel/EndpointAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/EndpointAware.java
rename to core/camel-api/src/main/java/org/apache/camel/EndpointAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/EndpointInject.java b/core/camel-api/src/main/java/org/apache/camel/EndpointInject.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/EndpointInject.java
rename to core/camel-api/src/main/java/org/apache/camel/EndpointInject.java
diff --git a/camel-api/src/main/java/org/apache/camel/ErrorHandlerFactory.java b/core/camel-api/src/main/java/org/apache/camel/ErrorHandlerFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ErrorHandlerFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/ErrorHandlerFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/Exchange.java b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Exchange.java
rename to core/camel-api/src/main/java/org/apache/camel/Exchange.java
diff --git a/camel-api/src/main/java/org/apache/camel/ExchangeException.java b/core/camel-api/src/main/java/org/apache/camel/ExchangeException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ExchangeException.java
rename to core/camel-api/src/main/java/org/apache/camel/ExchangeException.java
diff --git a/camel-api/src/main/java/org/apache/camel/ExchangePattern.java b/core/camel-api/src/main/java/org/apache/camel/ExchangePattern.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ExchangePattern.java
rename to core/camel-api/src/main/java/org/apache/camel/ExchangePattern.java
diff --git a/camel-api/src/main/java/org/apache/camel/ExchangeProperties.java b/core/camel-api/src/main/java/org/apache/camel/ExchangeProperties.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ExchangeProperties.java
rename to core/camel-api/src/main/java/org/apache/camel/ExchangeProperties.java
diff --git a/camel-api/src/main/java/org/apache/camel/ExchangeProperty.java b/core/camel-api/src/main/java/org/apache/camel/ExchangeProperty.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ExchangeProperty.java
rename to core/camel-api/src/main/java/org/apache/camel/ExchangeProperty.java
diff --git a/camel-api/src/main/java/org/apache/camel/ExchangeTimedOutException.java b/core/camel-api/src/main/java/org/apache/camel/ExchangeTimedOutException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ExchangeTimedOutException.java
rename to core/camel-api/src/main/java/org/apache/camel/ExchangeTimedOutException.java
diff --git a/camel-api/src/main/java/org/apache/camel/ExecutorServiceAware.java b/core/camel-api/src/main/java/org/apache/camel/ExecutorServiceAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ExecutorServiceAware.java
rename to core/camel-api/src/main/java/org/apache/camel/ExecutorServiceAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/ExpectedBodyTypeException.java b/core/camel-api/src/main/java/org/apache/camel/ExpectedBodyTypeException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ExpectedBodyTypeException.java
rename to core/camel-api/src/main/java/org/apache/camel/ExpectedBodyTypeException.java
diff --git a/camel-api/src/main/java/org/apache/camel/Expression.java b/core/camel-api/src/main/java/org/apache/camel/Expression.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Expression.java
rename to core/camel-api/src/main/java/org/apache/camel/Expression.java
diff --git a/camel-api/src/main/java/org/apache/camel/ExpressionEvaluationException.java b/core/camel-api/src/main/java/org/apache/camel/ExpressionEvaluationException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ExpressionEvaluationException.java
rename to core/camel-api/src/main/java/org/apache/camel/ExpressionEvaluationException.java
diff --git a/camel-api/src/main/java/org/apache/camel/ExpressionIllegalSyntaxException.java b/core/camel-api/src/main/java/org/apache/camel/ExpressionIllegalSyntaxException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ExpressionIllegalSyntaxException.java
rename to core/camel-api/src/main/java/org/apache/camel/ExpressionIllegalSyntaxException.java
diff --git a/camel-api/src/main/java/org/apache/camel/ExtendedStartupListener.java b/core/camel-api/src/main/java/org/apache/camel/ExtendedStartupListener.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ExtendedStartupListener.java
rename to core/camel-api/src/main/java/org/apache/camel/ExtendedStartupListener.java
diff --git a/camel-api/src/main/java/org/apache/camel/FailedToCreateConsumerException.java b/core/camel-api/src/main/java/org/apache/camel/FailedToCreateConsumerException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/FailedToCreateConsumerException.java
rename to core/camel-api/src/main/java/org/apache/camel/FailedToCreateConsumerException.java
diff --git a/camel-api/src/main/java/org/apache/camel/FailedToCreateProducerException.java b/core/camel-api/src/main/java/org/apache/camel/FailedToCreateProducerException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/FailedToCreateProducerException.java
rename to core/camel-api/src/main/java/org/apache/camel/FailedToCreateProducerException.java
diff --git a/camel-api/src/main/java/org/apache/camel/FailedToCreateRouteException.java b/core/camel-api/src/main/java/org/apache/camel/FailedToCreateRouteException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/FailedToCreateRouteException.java
rename to core/camel-api/src/main/java/org/apache/camel/FailedToCreateRouteException.java
diff --git a/camel-api/src/main/java/org/apache/camel/FailedToStartRouteException.java b/core/camel-api/src/main/java/org/apache/camel/FailedToStartRouteException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/FailedToStartRouteException.java
rename to core/camel-api/src/main/java/org/apache/camel/FailedToStartRouteException.java
diff --git a/camel-api/src/main/java/org/apache/camel/FallbackConverter.java b/core/camel-api/src/main/java/org/apache/camel/FallbackConverter.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/FallbackConverter.java
rename to core/camel-api/src/main/java/org/apache/camel/FallbackConverter.java
diff --git a/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java b/core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java
rename to core/camel-api/src/main/java/org/apache/camel/FluentProducerTemplate.java
diff --git a/camel-api/src/main/java/org/apache/camel/Handler.java b/core/camel-api/src/main/java/org/apache/camel/Handler.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Handler.java
rename to core/camel-api/src/main/java/org/apache/camel/Handler.java
diff --git a/camel-api/src/main/java/org/apache/camel/Header.java b/core/camel-api/src/main/java/org/apache/camel/Header.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Header.java
rename to core/camel-api/src/main/java/org/apache/camel/Header.java
diff --git a/camel-api/src/main/java/org/apache/camel/Headers.java b/core/camel-api/src/main/java/org/apache/camel/Headers.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Headers.java
rename to core/camel-api/src/main/java/org/apache/camel/Headers.java
diff --git a/camel-api/src/main/java/org/apache/camel/InOnly.java b/core/camel-api/src/main/java/org/apache/camel/InOnly.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/InOnly.java
rename to core/camel-api/src/main/java/org/apache/camel/InOnly.java
diff --git a/camel-api/src/main/java/org/apache/camel/InOut.java b/core/camel-api/src/main/java/org/apache/camel/InOut.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/InOut.java
rename to core/camel-api/src/main/java/org/apache/camel/InOut.java
diff --git a/camel-api/src/main/java/org/apache/camel/InvalidPayloadException.java b/core/camel-api/src/main/java/org/apache/camel/InvalidPayloadException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/InvalidPayloadException.java
rename to core/camel-api/src/main/java/org/apache/camel/InvalidPayloadException.java
diff --git a/camel-api/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java b/core/camel-api/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java
rename to core/camel-api/src/main/java/org/apache/camel/InvalidPayloadRuntimeException.java
diff --git a/camel-api/src/main/java/org/apache/camel/InvalidPropertyException.java b/core/camel-api/src/main/java/org/apache/camel/InvalidPropertyException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/InvalidPropertyException.java
rename to core/camel-api/src/main/java/org/apache/camel/InvalidPropertyException.java
diff --git a/camel-api/src/main/java/org/apache/camel/InvokeOnHeader.java b/core/camel-api/src/main/java/org/apache/camel/InvokeOnHeader.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/InvokeOnHeader.java
rename to core/camel-api/src/main/java/org/apache/camel/InvokeOnHeader.java
diff --git a/camel-api/src/main/java/org/apache/camel/InvokeOnHeaders.java b/core/camel-api/src/main/java/org/apache/camel/InvokeOnHeaders.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/InvokeOnHeaders.java
rename to core/camel-api/src/main/java/org/apache/camel/InvokeOnHeaders.java
diff --git a/camel-api/src/main/java/org/apache/camel/IsSingleton.java b/core/camel-api/src/main/java/org/apache/camel/IsSingleton.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/IsSingleton.java
rename to core/camel-api/src/main/java/org/apache/camel/IsSingleton.java
diff --git a/camel-api/src/main/java/org/apache/camel/LoadPropertiesException.java b/core/camel-api/src/main/java/org/apache/camel/LoadPropertiesException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/LoadPropertiesException.java
rename to core/camel-api/src/main/java/org/apache/camel/LoadPropertiesException.java
diff --git a/camel-api/src/main/java/org/apache/camel/LoggingLevel.java b/core/camel-api/src/main/java/org/apache/camel/LoggingLevel.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/LoggingLevel.java
rename to core/camel-api/src/main/java/org/apache/camel/LoggingLevel.java
diff --git a/camel-api/src/main/java/org/apache/camel/ManagementStatisticsLevel.java b/core/camel-api/src/main/java/org/apache/camel/ManagementStatisticsLevel.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ManagementStatisticsLevel.java
rename to core/camel-api/src/main/java/org/apache/camel/ManagementStatisticsLevel.java
diff --git a/camel-api/src/main/java/org/apache/camel/Message.java b/core/camel-api/src/main/java/org/apache/camel/Message.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Message.java
rename to core/camel-api/src/main/java/org/apache/camel/Message.java
diff --git a/camel-api/src/main/java/org/apache/camel/MessageHistory.java b/core/camel-api/src/main/java/org/apache/camel/MessageHistory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/MessageHistory.java
rename to core/camel-api/src/main/java/org/apache/camel/MessageHistory.java
diff --git a/camel-api/src/main/java/org/apache/camel/MultipleConsumersSupport.java b/core/camel-api/src/main/java/org/apache/camel/MultipleConsumersSupport.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/MultipleConsumersSupport.java
rename to core/camel-api/src/main/java/org/apache/camel/MultipleConsumersSupport.java
diff --git a/camel-api/src/main/java/org/apache/camel/NamedNode.java b/core/camel-api/src/main/java/org/apache/camel/NamedNode.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/NamedNode.java
rename to core/camel-api/src/main/java/org/apache/camel/NamedNode.java
diff --git a/camel-api/src/main/java/org/apache/camel/Navigate.java b/core/camel-api/src/main/java/org/apache/camel/Navigate.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Navigate.java
rename to core/camel-api/src/main/java/org/apache/camel/Navigate.java
diff --git a/camel-api/src/main/java/org/apache/camel/NoFactoryAvailableException.java b/core/camel-api/src/main/java/org/apache/camel/NoFactoryAvailableException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/NoFactoryAvailableException.java
rename to core/camel-api/src/main/java/org/apache/camel/NoFactoryAvailableException.java
diff --git a/camel-api/src/main/java/org/apache/camel/NoSuchBeanException.java b/core/camel-api/src/main/java/org/apache/camel/NoSuchBeanException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/NoSuchBeanException.java
rename to core/camel-api/src/main/java/org/apache/camel/NoSuchBeanException.java
diff --git a/camel-api/src/main/java/org/apache/camel/NoSuchEndpointException.java b/core/camel-api/src/main/java/org/apache/camel/NoSuchEndpointException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/NoSuchEndpointException.java
rename to core/camel-api/src/main/java/org/apache/camel/NoSuchEndpointException.java
diff --git a/camel-api/src/main/java/org/apache/camel/NoSuchHeaderException.java b/core/camel-api/src/main/java/org/apache/camel/NoSuchHeaderException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/NoSuchHeaderException.java
rename to core/camel-api/src/main/java/org/apache/camel/NoSuchHeaderException.java
diff --git a/camel-api/src/main/java/org/apache/camel/NoSuchLanguageException.java b/core/camel-api/src/main/java/org/apache/camel/NoSuchLanguageException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/NoSuchLanguageException.java
rename to core/camel-api/src/main/java/org/apache/camel/NoSuchLanguageException.java
diff --git a/camel-api/src/main/java/org/apache/camel/NoSuchPropertyException.java b/core/camel-api/src/main/java/org/apache/camel/NoSuchPropertyException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/NoSuchPropertyException.java
rename to core/camel-api/src/main/java/org/apache/camel/NoSuchPropertyException.java
diff --git a/camel-api/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java b/core/camel-api/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
rename to core/camel-api/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
diff --git a/camel-api/src/main/java/org/apache/camel/NonManagedService.java b/core/camel-api/src/main/java/org/apache/camel/NonManagedService.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/NonManagedService.java
rename to core/camel-api/src/main/java/org/apache/camel/NonManagedService.java
diff --git a/camel-api/src/main/java/org/apache/camel/Ordered.java b/core/camel-api/src/main/java/org/apache/camel/Ordered.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Ordered.java
rename to core/camel-api/src/main/java/org/apache/camel/Ordered.java
diff --git a/camel-api/src/main/java/org/apache/camel/OutHeaders.java b/core/camel-api/src/main/java/org/apache/camel/OutHeaders.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/OutHeaders.java
rename to core/camel-api/src/main/java/org/apache/camel/OutHeaders.java
diff --git a/camel-api/src/main/java/org/apache/camel/Pattern.java b/core/camel-api/src/main/java/org/apache/camel/Pattern.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Pattern.java
rename to core/camel-api/src/main/java/org/apache/camel/Pattern.java
diff --git a/camel-api/src/main/java/org/apache/camel/PollingConsumer.java b/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/PollingConsumer.java
rename to core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java
diff --git a/camel-api/src/main/java/org/apache/camel/PollingConsumerPollingStrategy.java b/core/camel-api/src/main/java/org/apache/camel/PollingConsumerPollingStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/PollingConsumerPollingStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/PollingConsumerPollingStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/Predicate.java b/core/camel-api/src/main/java/org/apache/camel/Predicate.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Predicate.java
rename to core/camel-api/src/main/java/org/apache/camel/Predicate.java
diff --git a/camel-api/src/main/java/org/apache/camel/Processor.java b/core/camel-api/src/main/java/org/apache/camel/Processor.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Processor.java
rename to core/camel-api/src/main/java/org/apache/camel/Processor.java
diff --git a/camel-api/src/main/java/org/apache/camel/Produce.java b/core/camel-api/src/main/java/org/apache/camel/Produce.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Produce.java
rename to core/camel-api/src/main/java/org/apache/camel/Produce.java
diff --git a/camel-api/src/main/java/org/apache/camel/Producer.java b/core/camel-api/src/main/java/org/apache/camel/Producer.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Producer.java
rename to core/camel-api/src/main/java/org/apache/camel/Producer.java
diff --git a/camel-api/src/main/java/org/apache/camel/ProducerTemplate.java b/core/camel-api/src/main/java/org/apache/camel/ProducerTemplate.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ProducerTemplate.java
rename to core/camel-api/src/main/java/org/apache/camel/ProducerTemplate.java
diff --git a/camel-api/src/main/java/org/apache/camel/PropertyInject.java b/core/camel-api/src/main/java/org/apache/camel/PropertyInject.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/PropertyInject.java
rename to core/camel-api/src/main/java/org/apache/camel/PropertyInject.java
diff --git a/camel-api/src/main/java/org/apache/camel/ProxyInstantiationException.java b/core/camel-api/src/main/java/org/apache/camel/ProxyInstantiationException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ProxyInstantiationException.java
rename to core/camel-api/src/main/java/org/apache/camel/ProxyInstantiationException.java
diff --git a/camel-api/src/main/java/org/apache/camel/RecipientList.java b/core/camel-api/src/main/java/org/apache/camel/RecipientList.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/RecipientList.java
rename to core/camel-api/src/main/java/org/apache/camel/RecipientList.java
diff --git a/camel-api/src/main/java/org/apache/camel/ResolveEndpointFailedException.java b/core/camel-api/src/main/java/org/apache/camel/ResolveEndpointFailedException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ResolveEndpointFailedException.java
rename to core/camel-api/src/main/java/org/apache/camel/ResolveEndpointFailedException.java
diff --git a/camel-api/src/main/java/org/apache/camel/RollbackExchangeException.java b/core/camel-api/src/main/java/org/apache/camel/RollbackExchangeException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/RollbackExchangeException.java
rename to core/camel-api/src/main/java/org/apache/camel/RollbackExchangeException.java
diff --git a/camel-api/src/main/java/org/apache/camel/Route.java b/core/camel-api/src/main/java/org/apache/camel/Route.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Route.java
rename to core/camel-api/src/main/java/org/apache/camel/Route.java
diff --git a/camel-api/src/main/java/org/apache/camel/RouteAware.java b/core/camel-api/src/main/java/org/apache/camel/RouteAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/RouteAware.java
rename to core/camel-api/src/main/java/org/apache/camel/RouteAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/RoutesBuilder.java b/core/camel-api/src/main/java/org/apache/camel/RoutesBuilder.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/RoutesBuilder.java
rename to core/camel-api/src/main/java/org/apache/camel/RoutesBuilder.java
diff --git a/camel-api/src/main/java/org/apache/camel/RoutingSlip.java b/core/camel-api/src/main/java/org/apache/camel/RoutingSlip.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/RoutingSlip.java
rename to core/camel-api/src/main/java/org/apache/camel/RoutingSlip.java
diff --git a/camel-api/src/main/java/org/apache/camel/RuntimeCamelException.java b/core/camel-api/src/main/java/org/apache/camel/RuntimeCamelException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/RuntimeCamelException.java
rename to core/camel-api/src/main/java/org/apache/camel/RuntimeCamelException.java
diff --git a/camel-api/src/main/java/org/apache/camel/RuntimeConfiguration.java b/core/camel-api/src/main/java/org/apache/camel/RuntimeConfiguration.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/RuntimeConfiguration.java
rename to core/camel-api/src/main/java/org/apache/camel/RuntimeConfiguration.java
diff --git a/camel-api/src/main/java/org/apache/camel/RuntimeExchangeException.java b/core/camel-api/src/main/java/org/apache/camel/RuntimeExchangeException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/RuntimeExchangeException.java
rename to core/camel-api/src/main/java/org/apache/camel/RuntimeExchangeException.java
diff --git a/camel-api/src/main/java/org/apache/camel/RuntimeExpressionException.java b/core/camel-api/src/main/java/org/apache/camel/RuntimeExpressionException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/RuntimeExpressionException.java
rename to core/camel-api/src/main/java/org/apache/camel/RuntimeExpressionException.java
diff --git a/camel-api/src/main/java/org/apache/camel/RuntimeTransformException.java b/core/camel-api/src/main/java/org/apache/camel/RuntimeTransformException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/RuntimeTransformException.java
rename to core/camel-api/src/main/java/org/apache/camel/RuntimeTransformException.java
diff --git a/camel-api/src/main/java/org/apache/camel/SSLContextParametersAware.java b/core/camel-api/src/main/java/org/apache/camel/SSLContextParametersAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/SSLContextParametersAware.java
rename to core/camel-api/src/main/java/org/apache/camel/SSLContextParametersAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/Service.java b/core/camel-api/src/main/java/org/apache/camel/Service.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Service.java
rename to core/camel-api/src/main/java/org/apache/camel/Service.java
diff --git a/camel-api/src/main/java/org/apache/camel/ServiceStatus.java b/core/camel-api/src/main/java/org/apache/camel/ServiceStatus.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ServiceStatus.java
rename to core/camel-api/src/main/java/org/apache/camel/ServiceStatus.java
diff --git a/camel-api/src/main/java/org/apache/camel/ShutdownRoute.java b/core/camel-api/src/main/java/org/apache/camel/ShutdownRoute.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ShutdownRoute.java
rename to core/camel-api/src/main/java/org/apache/camel/ShutdownRoute.java
diff --git a/camel-api/src/main/java/org/apache/camel/ShutdownRunningTask.java b/core/camel-api/src/main/java/org/apache/camel/ShutdownRunningTask.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ShutdownRunningTask.java
rename to core/camel-api/src/main/java/org/apache/camel/ShutdownRunningTask.java
diff --git a/camel-api/src/main/java/org/apache/camel/ShutdownableService.java b/core/camel-api/src/main/java/org/apache/camel/ShutdownableService.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ShutdownableService.java
rename to core/camel-api/src/main/java/org/apache/camel/ShutdownableService.java
diff --git a/camel-api/src/main/java/org/apache/camel/StartupListener.java b/core/camel-api/src/main/java/org/apache/camel/StartupListener.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/StartupListener.java
rename to core/camel-api/src/main/java/org/apache/camel/StartupListener.java
diff --git a/camel-api/src/main/java/org/apache/camel/StatefulService.java b/core/camel-api/src/main/java/org/apache/camel/StatefulService.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/StatefulService.java
rename to core/camel-api/src/main/java/org/apache/camel/StatefulService.java
diff --git a/camel-api/src/main/java/org/apache/camel/StaticService.java b/core/camel-api/src/main/java/org/apache/camel/StaticService.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/StaticService.java
rename to core/camel-api/src/main/java/org/apache/camel/StaticService.java
diff --git a/camel-api/src/main/java/org/apache/camel/StreamCache.java b/core/camel-api/src/main/java/org/apache/camel/StreamCache.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/StreamCache.java
rename to core/camel-api/src/main/java/org/apache/camel/StreamCache.java
diff --git a/camel-api/src/main/java/org/apache/camel/StringSource.java b/core/camel-api/src/main/java/org/apache/camel/StringSource.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/StringSource.java
rename to core/camel-api/src/main/java/org/apache/camel/StringSource.java
diff --git a/camel-api/src/main/java/org/apache/camel/Suspendable.java b/core/camel-api/src/main/java/org/apache/camel/Suspendable.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Suspendable.java
rename to core/camel-api/src/main/java/org/apache/camel/Suspendable.java
diff --git a/camel-api/src/main/java/org/apache/camel/SuspendableService.java b/core/camel-api/src/main/java/org/apache/camel/SuspendableService.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/SuspendableService.java
rename to core/camel-api/src/main/java/org/apache/camel/SuspendableService.java
diff --git a/camel-api/src/main/java/org/apache/camel/TimeoutMap.java b/core/camel-api/src/main/java/org/apache/camel/TimeoutMap.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/TimeoutMap.java
rename to core/camel-api/src/main/java/org/apache/camel/TimeoutMap.java
diff --git a/camel-api/src/main/java/org/apache/camel/TimerListener.java b/core/camel-api/src/main/java/org/apache/camel/TimerListener.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/TimerListener.java
rename to core/camel-api/src/main/java/org/apache/camel/TimerListener.java
diff --git a/camel-api/src/main/java/org/apache/camel/Traceable.java b/core/camel-api/src/main/java/org/apache/camel/Traceable.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/Traceable.java
rename to core/camel-api/src/main/java/org/apache/camel/Traceable.java
diff --git a/camel-api/src/main/java/org/apache/camel/TypeConversionException.java b/core/camel-api/src/main/java/org/apache/camel/TypeConversionException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/TypeConversionException.java
rename to core/camel-api/src/main/java/org/apache/camel/TypeConversionException.java
diff --git a/camel-api/src/main/java/org/apache/camel/TypeConverter.java b/core/camel-api/src/main/java/org/apache/camel/TypeConverter.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/TypeConverter.java
rename to core/camel-api/src/main/java/org/apache/camel/TypeConverter.java
diff --git a/camel-api/src/main/java/org/apache/camel/TypeConverterExists.java b/core/camel-api/src/main/java/org/apache/camel/TypeConverterExists.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/TypeConverterExists.java
rename to core/camel-api/src/main/java/org/apache/camel/TypeConverterExists.java
diff --git a/camel-api/src/main/java/org/apache/camel/TypeConverterExistsException.java b/core/camel-api/src/main/java/org/apache/camel/TypeConverterExistsException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/TypeConverterExistsException.java
rename to core/camel-api/src/main/java/org/apache/camel/TypeConverterExistsException.java
diff --git a/camel-api/src/main/java/org/apache/camel/TypeConverterLoaderException.java b/core/camel-api/src/main/java/org/apache/camel/TypeConverterLoaderException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/TypeConverterLoaderException.java
rename to core/camel-api/src/main/java/org/apache/camel/TypeConverterLoaderException.java
diff --git a/camel-api/src/main/java/org/apache/camel/TypeConverters.java b/core/camel-api/src/main/java/org/apache/camel/TypeConverters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/TypeConverters.java
rename to core/camel-api/src/main/java/org/apache/camel/TypeConverters.java
diff --git a/camel-api/src/main/java/org/apache/camel/ValidationException.java b/core/camel-api/src/main/java/org/apache/camel/ValidationException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ValidationException.java
rename to core/camel-api/src/main/java/org/apache/camel/ValidationException.java
diff --git a/camel-api/src/main/java/org/apache/camel/ValueHolder.java b/core/camel-api/src/main/java/org/apache/camel/ValueHolder.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/ValueHolder.java
rename to core/camel-api/src/main/java/org/apache/camel/ValueHolder.java
diff --git a/camel-api/src/main/java/org/apache/camel/VetoCamelContextStartException.java b/core/camel-api/src/main/java/org/apache/camel/VetoCamelContextStartException.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/VetoCamelContextStartException.java
rename to core/camel-api/src/main/java/org/apache/camel/VetoCamelContextStartException.java
diff --git a/camel-api/src/main/java/org/apache/camel/WaitForTaskToComplete.java b/core/camel-api/src/main/java/org/apache/camel/WaitForTaskToComplete.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/WaitForTaskToComplete.java
rename to core/camel-api/src/main/java/org/apache/camel/WaitForTaskToComplete.java
diff --git a/camel-api/src/main/java/org/apache/camel/WrappedFile.java b/core/camel-api/src/main/java/org/apache/camel/WrappedFile.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/WrappedFile.java
rename to core/camel-api/src/main/java/org/apache/camel/WrappedFile.java
diff --git a/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterEventListener.java b/core/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterEventListener.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/cluster/CamelClusterEventListener.java
rename to core/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterEventListener.java
diff --git a/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterMember.java b/core/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterMember.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/cluster/CamelClusterMember.java
rename to core/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterMember.java
diff --git a/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterService.java b/core/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterService.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/cluster/CamelClusterService.java
rename to core/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterService.java
diff --git a/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterView.java b/core/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterView.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/cluster/CamelClusterView.java
rename to core/camel-api/src/main/java/org/apache/camel/cluster/CamelClusterView.java
diff --git a/camel-api/src/main/java/org/apache/camel/cluster/package.html b/core/camel-api/src/main/java/org/apache/camel/cluster/package.html
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/cluster/package.html
rename to core/camel-api/src/main/java/org/apache/camel/cluster/package.html
diff --git a/camel-api/src/main/java/org/apache/camel/component/extension/ComponentExtension.java b/core/camel-api/src/main/java/org/apache/camel/component/extension/ComponentExtension.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/component/extension/ComponentExtension.java
rename to core/camel-api/src/main/java/org/apache/camel/component/extension/ComponentExtension.java
diff --git a/camel-api/src/main/java/org/apache/camel/component/extension/ComponentVerifierExtension.java b/core/camel-api/src/main/java/org/apache/camel/component/extension/ComponentVerifierExtension.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/component/extension/ComponentVerifierExtension.java
rename to core/camel-api/src/main/java/org/apache/camel/component/extension/ComponentVerifierExtension.java
diff --git a/camel-api/src/main/java/org/apache/camel/component/extension/ComponentVerifierExtensionHelper.java b/core/camel-api/src/main/java/org/apache/camel/component/extension/ComponentVerifierExtensionHelper.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/component/extension/ComponentVerifierExtensionHelper.java
rename to core/camel-api/src/main/java/org/apache/camel/component/extension/ComponentVerifierExtensionHelper.java
diff --git a/camel-api/src/main/java/org/apache/camel/component/extension/MetaDataExtension.java b/core/camel-api/src/main/java/org/apache/camel/component/extension/MetaDataExtension.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/component/extension/MetaDataExtension.java
rename to core/camel-api/src/main/java/org/apache/camel/component/extension/MetaDataExtension.java
diff --git a/camel-api/src/main/java/org/apache/camel/component/extension/package.html b/core/camel-api/src/main/java/org/apache/camel/component/extension/package.html
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/component/extension/package.html
rename to core/camel-api/src/main/java/org/apache/camel/component/extension/package.html
diff --git a/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/health/HealthCheck.java
rename to core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java
diff --git a/camel-api/src/main/java/org/apache/camel/health/HealthCheckConfiguration.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckConfiguration.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/health/HealthCheckConfiguration.java
rename to core/camel-api/src/main/java/org/apache/camel/health/HealthCheckConfiguration.java
diff --git a/camel-api/src/main/java/org/apache/camel/health/HealthCheckFilter.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckFilter.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/health/HealthCheckFilter.java
rename to core/camel-api/src/main/java/org/apache/camel/health/HealthCheckFilter.java
diff --git a/camel-api/src/main/java/org/apache/camel/health/HealthCheckHelper.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckHelper.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/health/HealthCheckHelper.java
rename to core/camel-api/src/main/java/org/apache/camel/health/HealthCheckHelper.java
diff --git a/camel-api/src/main/java/org/apache/camel/health/HealthCheckRegistry.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckRegistry.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/health/HealthCheckRegistry.java
rename to core/camel-api/src/main/java/org/apache/camel/health/HealthCheckRegistry.java
diff --git a/camel-api/src/main/java/org/apache/camel/health/HealthCheckRepository.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckRepository.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/health/HealthCheckRepository.java
rename to core/camel-api/src/main/java/org/apache/camel/health/HealthCheckRepository.java
diff --git a/camel-api/src/main/java/org/apache/camel/health/HealthCheckResultBuilder.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResultBuilder.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/health/HealthCheckResultBuilder.java
rename to core/camel-api/src/main/java/org/apache/camel/health/HealthCheckResultBuilder.java
diff --git a/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java
rename to core/camel-api/src/main/java/org/apache/camel/health/HealthCheckService.java
diff --git a/camel-api/src/main/java/org/apache/camel/health/package.html b/core/camel-api/src/main/java/org/apache/camel/health/package.html
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/health/package.html
rename to core/camel-api/src/main/java/org/apache/camel/health/package.html
diff --git a/camel-api/src/main/java/org/apache/camel/package-info.java b/core/camel-api/src/main/java/org/apache/camel/package-info.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/package-info.java
rename to core/camel-api/src/main/java/org/apache/camel/package-info.java
diff --git a/camel-api/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java b/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java
rename to core/camel-api/src/main/java/org/apache/camel/runtimecatalog/EndpointValidationResult.java
diff --git a/camel-api/src/main/java/org/apache/camel/runtimecatalog/JSonSchemaResolver.java b/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/JSonSchemaResolver.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/runtimecatalog/JSonSchemaResolver.java
rename to core/camel-api/src/main/java/org/apache/camel/runtimecatalog/JSonSchemaResolver.java
diff --git a/camel-api/src/main/java/org/apache/camel/runtimecatalog/LanguageValidationResult.java b/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/LanguageValidationResult.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/runtimecatalog/LanguageValidationResult.java
rename to core/camel-api/src/main/java/org/apache/camel/runtimecatalog/LanguageValidationResult.java
diff --git a/camel-api/src/main/java/org/apache/camel/runtimecatalog/RuntimeCamelCatalog.java b/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/RuntimeCamelCatalog.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/runtimecatalog/RuntimeCamelCatalog.java
rename to core/camel-api/src/main/java/org/apache/camel/runtimecatalog/RuntimeCamelCatalog.java
diff --git a/camel-api/src/main/java/org/apache/camel/runtimecatalog/package.html b/core/camel-api/src/main/java/org/apache/camel/runtimecatalog/package.html
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/runtimecatalog/package.html
rename to core/camel-api/src/main/java/org/apache/camel/runtimecatalog/package.html
diff --git a/camel-api/src/main/java/org/apache/camel/spi/AggregationRepository.java b/core/camel-api/src/main/java/org/apache/camel/spi/AggregationRepository.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/AggregationRepository.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/AggregationRepository.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/AsyncProcessorAwaitManager.java b/core/camel-api/src/main/java/org/apache/camel/spi/AsyncProcessorAwaitManager.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/AsyncProcessorAwaitManager.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/AsyncProcessorAwaitManager.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/AuthorizationPolicy.java b/core/camel-api/src/main/java/org/apache/camel/spi/AuthorizationPolicy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/AuthorizationPolicy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/AuthorizationPolicy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/Breakpoint.java b/core/camel-api/src/main/java/org/apache/camel/spi/Breakpoint.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/Breakpoint.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/Breakpoint.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/BrowsableEndpoint.java b/core/camel-api/src/main/java/org/apache/camel/spi/BrowsableEndpoint.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/BrowsableEndpoint.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/BrowsableEndpoint.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/CamelContextNameStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/CamelContextNameStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/CamelContextNameStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/CamelContextNameStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/CamelContextTracker.java b/core/camel-api/src/main/java/org/apache/camel/spi/CamelContextTracker.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/CamelContextTracker.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/CamelContextTracker.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java b/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/CamelLogger.java b/core/camel-api/src/main/java/org/apache/camel/spi/CamelLogger.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/CamelLogger.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/CamelLogger.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ClaimCheckRepository.java b/core/camel-api/src/main/java/org/apache/camel/spi/ClaimCheckRepository.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ClaimCheckRepository.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ClaimCheckRepository.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ClassResolver.java b/core/camel-api/src/main/java/org/apache/camel/spi/ClassResolver.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ClassResolver.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ClassResolver.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ComponentCustomizer.java b/core/camel-api/src/main/java/org/apache/camel/spi/ComponentCustomizer.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ComponentCustomizer.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ComponentCustomizer.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ComponentResolver.java b/core/camel-api/src/main/java/org/apache/camel/spi/ComponentResolver.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ComponentResolver.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ComponentResolver.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/Condition.java b/core/camel-api/src/main/java/org/apache/camel/spi/Condition.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/Condition.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/Condition.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ConsumerCache.java b/core/camel-api/src/main/java/org/apache/camel/spi/ConsumerCache.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ConsumerCache.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ConsumerCache.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/Contract.java b/core/camel-api/src/main/java/org/apache/camel/spi/Contract.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/Contract.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/Contract.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/DataFormat.java b/core/camel-api/src/main/java/org/apache/camel/spi/DataFormat.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/DataFormat.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/DataFormat.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/DataFormatCustomizer.java b/core/camel-api/src/main/java/org/apache/camel/spi/DataFormatCustomizer.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/DataFormatCustomizer.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/DataFormatCustomizer.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/DataFormatFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/DataFormatFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/DataFormatFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/DataFormatFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/DataFormatName.java b/core/camel-api/src/main/java/org/apache/camel/spi/DataFormatName.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/DataFormatName.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/DataFormatName.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/DataFormatResolver.java b/core/camel-api/src/main/java/org/apache/camel/spi/DataFormatResolver.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/DataFormatResolver.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/DataFormatResolver.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/DataType.java b/core/camel-api/src/main/java/org/apache/camel/spi/DataType.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/DataType.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/DataType.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/DataTypeAware.java b/core/camel-api/src/main/java/org/apache/camel/spi/DataTypeAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/DataTypeAware.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/DataTypeAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/Debugger.java b/core/camel-api/src/main/java/org/apache/camel/spi/Debugger.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/Debugger.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/Debugger.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/EndpointRegistry.java b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointRegistry.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/EndpointRegistry.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/EndpointRegistry.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/EndpointStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/EndpointStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/EndpointStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/EndpointUtilizationStatistics.java b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointUtilizationStatistics.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/EndpointUtilizationStatistics.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/EndpointUtilizationStatistics.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/EventFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/EventNotifier.java b/core/camel-api/src/main/java/org/apache/camel/spi/EventNotifier.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/EventNotifier.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/EventNotifier.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ExceptionHandler.java b/core/camel-api/src/main/java/org/apache/camel/spi/ExceptionHandler.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ExceptionHandler.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ExceptionHandler.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ExchangeFormatter.java b/core/camel-api/src/main/java/org/apache/camel/spi/ExchangeFormatter.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ExchangeFormatter.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ExchangeFormatter.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java b/core/camel-api/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ExecutorServiceManager.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/FactoryFinder.java b/core/camel-api/src/main/java/org/apache/camel/spi/FactoryFinder.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/FactoryFinder.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/FactoryFinder.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/FactoryFinderResolver.java b/core/camel-api/src/main/java/org/apache/camel/spi/FactoryFinderResolver.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/FactoryFinderResolver.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/FactoryFinderResolver.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/GroupAware.java b/core/camel-api/src/main/java/org/apache/camel/spi/GroupAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/GroupAware.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/GroupAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/HasCamelContext.java b/core/camel-api/src/main/java/org/apache/camel/spi/HasCamelContext.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/HasCamelContext.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/HasCamelContext.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/HasGroup.java b/core/camel-api/src/main/java/org/apache/camel/spi/HasGroup.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/HasGroup.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/HasGroup.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/HasId.java b/core/camel-api/src/main/java/org/apache/camel/spi/HasId.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/HasId.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/HasId.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/HeaderFilterStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/HeaderFilterStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/HeaderFilterStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/HeaderFilterStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/HeaderFilterStrategyAware.java b/core/camel-api/src/main/java/org/apache/camel/spi/HeaderFilterStrategyAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/HeaderFilterStrategyAware.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/HeaderFilterStrategyAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/HeadersMapFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/HeadersMapFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/HeadersMapFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/HeadersMapFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/IdAware.java b/core/camel-api/src/main/java/org/apache/camel/spi/IdAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/IdAware.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/IdAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/IdempotentRepository.java b/core/camel-api/src/main/java/org/apache/camel/spi/IdempotentRepository.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/IdempotentRepository.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/IdempotentRepository.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/InflightRepository.java b/core/camel-api/src/main/java/org/apache/camel/spi/InflightRepository.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/InflightRepository.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/InflightRepository.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/Injector.java b/core/camel-api/src/main/java/org/apache/camel/spi/Injector.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/Injector.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/Injector.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/InterceptSendToEndpoint.java b/core/camel-api/src/main/java/org/apache/camel/spi/InterceptSendToEndpoint.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/InterceptSendToEndpoint.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/InterceptSendToEndpoint.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/InterceptStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/InterceptStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/InterceptStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/InterceptStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/Language.java b/core/camel-api/src/main/java/org/apache/camel/spi/Language.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/Language.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/Language.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/LanguageCustomizer.java b/core/camel-api/src/main/java/org/apache/camel/spi/LanguageCustomizer.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/LanguageCustomizer.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/LanguageCustomizer.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/LanguageResolver.java b/core/camel-api/src/main/java/org/apache/camel/spi/LanguageResolver.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/LanguageResolver.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/LanguageResolver.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/LifecycleStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/LogListener.java b/core/camel-api/src/main/java/org/apache/camel/spi/LogListener.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/LogListener.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/LogListener.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ManagementAgent.java b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementAgent.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ManagementAgent.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ManagementAgent.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ManagementInterceptStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementInterceptStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ManagementInterceptStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ManagementInterceptStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ManagementMBeanAssembler.java b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementMBeanAssembler.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ManagementMBeanAssembler.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ManagementMBeanAssembler.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ManagementNameStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementNameStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ManagementNameStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ManagementNameStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ManagementStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategyFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategyFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ManagementStrategyFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategyFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/MaskingFormatter.java b/core/camel-api/src/main/java/org/apache/camel/spi/MaskingFormatter.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/MaskingFormatter.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/MaskingFormatter.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/MessageHistoryFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/MessageHistoryFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/MessageHistoryFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/MessageHistoryFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ModelJAXBContextFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/ModelJAXBContextFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ModelJAXBContextFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ModelJAXBContextFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/NamespaceAware.java b/core/camel-api/src/main/java/org/apache/camel/spi/NamespaceAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/NamespaceAware.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/NamespaceAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/NodeIdFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/NodeIdFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/NodeIdFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/NodeIdFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java b/core/camel-api/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/OptimisticLockingAggregationRepository.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java b/core/camel-api/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/PackageScanClassResolver.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/PackageScanFilter.java b/core/camel-api/src/main/java/org/apache/camel/spi/PackageScanFilter.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/PackageScanFilter.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/PackageScanFilter.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/Policy.java b/core/camel-api/src/main/java/org/apache/camel/spi/Policy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/Policy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/Policy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/PollingConsumerPollStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/PollingConsumerPollStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/PollingConsumerPollStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/PollingConsumerPollStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ProcessorFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/ProcessorFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ProcessorFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ProcessorFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ProducerCache.java b/core/camel-api/src/main/java/org/apache/camel/spi/ProducerCache.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ProducerCache.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ProducerCache.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RecoverableAggregationRepository.java b/core/camel-api/src/main/java/org/apache/camel/spi/RecoverableAggregationRepository.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RecoverableAggregationRepository.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RecoverableAggregationRepository.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/Registry.java b/core/camel-api/src/main/java/org/apache/camel/spi/Registry.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/Registry.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/Registry.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ReloadStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/ReloadStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ReloadStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ReloadStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RestApiConsumerFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/RestApiConsumerFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RestApiConsumerFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RestApiConsumerFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RestApiProcessorFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/RestApiProcessorFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RestApiProcessorFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RestApiProcessorFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java b/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RestConsumerFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/RestConsumerFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RestConsumerFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RestConsumerFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RestProducerFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/RestProducerFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RestProducerFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RestProducerFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RestRegistry.java b/core/camel-api/src/main/java/org/apache/camel/spi/RestRegistry.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RestRegistry.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RestRegistry.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RouteContext.java b/core/camel-api/src/main/java/org/apache/camel/spi/RouteContext.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RouteContext.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RouteContext.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RouteController.java b/core/camel-api/src/main/java/org/apache/camel/spi/RouteController.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RouteController.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RouteController.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RouteError.java b/core/camel-api/src/main/java/org/apache/camel/spi/RouteError.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RouteError.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RouteError.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RoutePolicy.java b/core/camel-api/src/main/java/org/apache/camel/spi/RoutePolicy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RoutePolicy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RoutePolicy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RoutePolicyFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/RoutePolicyFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RoutePolicyFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RoutePolicyFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RouteStartupOrder.java b/core/camel-api/src/main/java/org/apache/camel/spi/RouteStartupOrder.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RouteStartupOrder.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RouteStartupOrder.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/RuntimeEndpointRegistry.java b/core/camel-api/src/main/java/org/apache/camel/spi/RuntimeEndpointRegistry.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/RuntimeEndpointRegistry.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/RuntimeEndpointRegistry.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ScheduledPollConsumerScheduler.java b/core/camel-api/src/main/java/org/apache/camel/spi/ScheduledPollConsumerScheduler.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ScheduledPollConsumerScheduler.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ScheduledPollConsumerScheduler.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/SendDynamicAware.java b/core/camel-api/src/main/java/org/apache/camel/spi/SendDynamicAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/SendDynamicAware.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/SendDynamicAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ShutdownAware.java b/core/camel-api/src/main/java/org/apache/camel/spi/ShutdownAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ShutdownAware.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ShutdownAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ShutdownPrepared.java b/core/camel-api/src/main/java/org/apache/camel/spi/ShutdownPrepared.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ShutdownPrepared.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ShutdownPrepared.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ShutdownStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/ShutdownStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ShutdownStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ShutdownStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/StateRepository.java b/core/camel-api/src/main/java/org/apache/camel/spi/StateRepository.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/StateRepository.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/StateRepository.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/StreamCachingStrategy.java b/core/camel-api/src/main/java/org/apache/camel/spi/StreamCachingStrategy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/StreamCachingStrategy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/StreamCachingStrategy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/SubUnitOfWork.java b/core/camel-api/src/main/java/org/apache/camel/spi/SubUnitOfWork.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/SubUnitOfWork.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/SubUnitOfWork.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/SubUnitOfWorkCallback.java b/core/camel-api/src/main/java/org/apache/camel/spi/SubUnitOfWorkCallback.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/SubUnitOfWorkCallback.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/SubUnitOfWorkCallback.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/Synchronization.java b/core/camel-api/src/main/java/org/apache/camel/spi/Synchronization.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/Synchronization.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/Synchronization.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/SynchronizationRouteAware.java b/core/camel-api/src/main/java/org/apache/camel/spi/SynchronizationRouteAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/SynchronizationRouteAware.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/SynchronizationRouteAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/SynchronizationVetoable.java b/core/camel-api/src/main/java/org/apache/camel/spi/SynchronizationVetoable.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/SynchronizationVetoable.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/SynchronizationVetoable.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ThreadPoolFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java b/core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/TransactedPolicy.java b/core/camel-api/src/main/java/org/apache/camel/spi/TransactedPolicy.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/TransactedPolicy.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/TransactedPolicy.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/Transformer.java b/core/camel-api/src/main/java/org/apache/camel/spi/Transformer.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/Transformer.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/Transformer.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/TransformerRegistry.java b/core/camel-api/src/main/java/org/apache/camel/spi/TransformerRegistry.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/TransformerRegistry.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/TransformerRegistry.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/TypeConverterAware.java b/core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterAware.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/TypeConverterAware.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterAware.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/TypeConverterLoader.java b/core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterLoader.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/TypeConverterLoader.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterLoader.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java b/core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/UnitOfWork.java b/core/camel-api/src/main/java/org/apache/camel/spi/UnitOfWork.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/UnitOfWork.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/UnitOfWork.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/UnitOfWorkFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/UnitOfWorkFactory.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/UnitOfWorkFactory.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/UnitOfWorkFactory.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/UuidGenerator.java b/core/camel-api/src/main/java/org/apache/camel/spi/UuidGenerator.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/UuidGenerator.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/UuidGenerator.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/Validator.java b/core/camel-api/src/main/java/org/apache/camel/spi/Validator.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/Validator.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/Validator.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/ValidatorRegistry.java b/core/camel-api/src/main/java/org/apache/camel/spi/ValidatorRegistry.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/ValidatorRegistry.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/ValidatorRegistry.java
diff --git a/camel-api/src/main/java/org/apache/camel/spi/package.html b/core/camel-api/src/main/java/org/apache/camel/spi/package.html
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/spi/package.html
rename to core/camel-api/src/main/java/org/apache/camel/spi/package.html
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/AliasedX509ExtendedKeyManager.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/AliasedX509ExtendedKeyManager.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/AliasedX509ExtendedKeyManager.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/AliasedX509ExtendedKeyManager.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/BaseSSLContextParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/BaseSSLContextParameters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/BaseSSLContextParameters.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/BaseSSLContextParameters.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/CipherSuitesParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/CipherSuitesParameters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/CipherSuitesParameters.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/CipherSuitesParameters.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/ClientAuthentication.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/ClientAuthentication.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/ClientAuthentication.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/ClientAuthentication.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/FilterParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/FilterParameters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/FilterParameters.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/FilterParameters.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/GlobalSSLContextParametersSupplier.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/GlobalSSLContextParametersSupplier.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/GlobalSSLContextParametersSupplier.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/GlobalSSLContextParametersSupplier.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/JsseParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/JsseParameters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/JsseParameters.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/JsseParameters.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/KeyManagersParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/KeyManagersParameters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/KeyManagersParameters.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/KeyManagersParameters.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextClientParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextClientParameters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextClientParameters.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextClientParameters.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextServerParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextServerParameters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextServerParameters.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextServerParameters.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/SecureRandomParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SecureRandomParameters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/SecureRandomParameters.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/SecureRandomParameters.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/SecureSocketProtocolsParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SecureSocketProtocolsParameters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/SecureSocketProtocolsParameters.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/SecureSocketProtocolsParameters.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/TrustManagersParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/TrustManagersParameters.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/TrustManagersParameters.java
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/TrustManagersParameters.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/jsse/package.html b/core/camel-api/src/main/java/org/apache/camel/support/jsse/package.html
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/jsse/package.html
rename to core/camel-api/src/main/java/org/apache/camel/support/jsse/package.html
diff --git a/camel-api/src/main/java/org/apache/camel/support/service/ServiceHelper.java b/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceHelper.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/service/ServiceHelper.java
rename to core/camel-api/src/main/java/org/apache/camel/support/service/ServiceHelper.java
diff --git a/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java b/core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java
similarity index 100%
rename from camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java
rename to core/camel-api/src/main/java/org/apache/camel/support/service/ServiceSupport.java
diff --git a/camel-base/pom.xml b/core/camel-base/pom.xml
similarity index 99%
rename from camel-base/pom.xml
rename to core/camel-base/pom.xml
index b1f2aa4..f9e2278 100644
--- a/camel-base/pom.xml
+++ b/core/camel-base/pom.xml
@@ -24,9 +24,9 @@
 
   <parent>
     <groupId>org.apache.camel</groupId>
-    <artifactId>camel-parent</artifactId>
+    <artifactId>core</artifactId>
     <version>3.0.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <artifactId>camel-base</artifactId>
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/DiscoverableService.java b/core/camel-base/src/main/java/org/apache/camel/cloud/DiscoverableService.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/DiscoverableService.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/DiscoverableService.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceCallConstants.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceCallConstants.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceCallConstants.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceCallConstants.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceCallExpressionSupport.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceCallExpressionSupport.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceCallExpressionSupport.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceCallExpressionSupport.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooser.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooser.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceChooser.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooser.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooserAware.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooserAware.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceChooserAware.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooserAware.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooserFactory.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooserFactory.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceChooserFactory.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceChooserFactory.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceDefinition.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDefinition.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceDefinition.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDefinition.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscovery.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscovery.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscovery.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscovery.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscoveryAware.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscoveryAware.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscoveryAware.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscoveryAware.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscoveryFactory.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscoveryFactory.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscoveryFactory.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceDiscoveryFactory.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceExpressionFactory.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceExpressionFactory.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceExpressionFactory.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceExpressionFactory.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceFactory.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFactory.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceFactory.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFactory.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilter.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceFilter.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilter.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilterAware.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilterAware.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceFilterAware.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilterAware.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilterFactory.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilterFactory.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceFilterFactory.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceFilterFactory.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceHealth.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceHealth.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceHealth.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceHealth.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancer.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancer.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancer.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancer.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFactory.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFactory.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFactory.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFactory.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFunction.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFunction.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFunction.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceLoadBalancerFunction.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/ServiceRegistry.java b/core/camel-base/src/main/java/org/apache/camel/cloud/ServiceRegistry.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/ServiceRegistry.java
rename to core/camel-base/src/main/java/org/apache/camel/cloud/ServiceRegistry.java
diff --git a/camel-base/src/main/java/org/apache/camel/cloud/package.html b/core/camel-base/src/main/java/org/apache/camel/cloud/package.html
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/cloud/package.html
rename to core/camel-base/src/main/java/org/apache/camel/cloud/package.html
diff --git a/camel-base/src/main/java/org/apache/camel/converter/AttachmentConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/AttachmentConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/AttachmentConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/AttachmentConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/CamelConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/CollectionConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/DurationConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/DurationConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/DurationConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/DurationConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/IOConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/IOConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/IOConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/IOConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/NIOConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/ObjectConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/SQLConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/SQLConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/SQLConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/SQLConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/TimePatternConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/TimePatternConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/TimePatternConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/TimePatternConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/jaxp/DomConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/jaxp/StreamSourceConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/jaxp/ThreadSafeNodeList.java b/core/camel-base/src/main/java/org/apache/camel/converter/jaxp/ThreadSafeNodeList.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/jaxp/ThreadSafeNodeList.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/jaxp/ThreadSafeNodeList.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java b/core/camel-base/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/jaxp/XMLReaderPool.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java b/core/camel-base/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java b/core/camel-base/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/core/camel-base/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/jaxp/XmlErrorListener.java b/core/camel-base/src/main/java/org/apache/camel/converter/jaxp/XmlErrorListener.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/jaxp/XmlErrorListener.java
rename to core/camel-base/src/main/java/org/apache/camel/converter/jaxp/XmlErrorListener.java
diff --git a/camel-base/src/main/java/org/apache/camel/converter/jaxp/package.html b/core/camel-base/src/main/java/org/apache/camel/converter/jaxp/package.html
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/jaxp/package.html
rename to core/camel-base/src/main/java/org/apache/camel/converter/jaxp/package.html
diff --git a/camel-base/src/main/java/org/apache/camel/converter/package.html b/core/camel-base/src/main/java/org/apache/camel/converter/package.html
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/converter/package.html
rename to core/camel-base/src/main/java/org/apache/camel/converter/package.html
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/DoubleMap.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/DoubleMap.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/DoubleMap.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/DoubleMap.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/FutureTypeConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodFallbackTypeConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodFallbackTypeConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersLoader.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersLoader.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersLoader.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersLoader.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/TypeConvertersPackageScanClassResolver.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/UriTypeConverter.java b/core/camel-base/src/main/java/org/apache/camel/impl/converter/UriTypeConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/UriTypeConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/UriTypeConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/converter/package.html b/core/camel-base/src/main/java/org/apache/camel/impl/converter/package.html
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/converter/package.html
rename to core/camel-base/src/main/java/org/apache/camel/impl/converter/package.html
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/AbstractContextEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractContextEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/AbstractContextEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractContextEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/AbstractExchangeEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractExchangeEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/AbstractExchangeEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractExchangeEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/AbstractRouteEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractRouteEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/AbstractRouteEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/AbstractRouteEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumeFailureEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumeFailureEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumeFailureEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumeFailureEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumedEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumedEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumedEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumingEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumingEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumingEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextResumingEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartedEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartedEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartedEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartingEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartingEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartingEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartingEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartupFailureEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartupFailureEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartupFailureEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStartupFailureEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStopFailureEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStopFailureEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStopFailureEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStopFailureEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppedEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppedEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppedEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppingEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppingEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppingEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextStoppingEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendedEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendedEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendedEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendingEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendingEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendingEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextSuspendingEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/RouteAddedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteAddedEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/RouteAddedEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/RouteAddedEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/RouteRemovedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteRemovedEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/RouteRemovedEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/RouteRemovedEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/RouteStartedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteStartedEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/RouteStartedEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/RouteStartedEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/RouteStoppedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/RouteStoppedEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/RouteStoppedEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/RouteStoppedEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/ServiceStopFailureEvent.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/event/package.html b/core/camel-base/src/main/java/org/apache/camel/impl/event/package.html
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/event/package.html
rename to core/camel-base/src/main/java/org/apache/camel/impl/event/package.html
diff --git a/camel-base/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java b/core/camel-base/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/health/ContextHealthCheck.java b/core/camel-base/src/main/java/org/apache/camel/impl/health/ContextHealthCheck.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/health/ContextHealthCheck.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/health/ContextHealthCheck.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java b/core/camel-base/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckService.java b/core/camel-base/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckService.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckService.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckService.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/health/PerformanceCounterEvaluator.java b/core/camel-base/src/main/java/org/apache/camel/impl/health/PerformanceCounterEvaluator.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/health/PerformanceCounterEvaluator.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/health/PerformanceCounterEvaluator.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/health/RegistryRepository.java b/core/camel-base/src/main/java/org/apache/camel/impl/health/RegistryRepository.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/health/RegistryRepository.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/health/RegistryRepository.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/health/RouteHealthCheck.java b/core/camel-base/src/main/java/org/apache/camel/impl/health/RouteHealthCheck.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/health/RouteHealthCheck.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/health/RouteHealthCheck.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/health/RoutePerformanceCounterEvaluators.java b/core/camel-base/src/main/java/org/apache/camel/impl/health/RoutePerformanceCounterEvaluators.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/health/RoutePerformanceCounterEvaluators.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/health/RoutePerformanceCounterEvaluators.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/health/RoutesHealthCheckRepository.java b/core/camel-base/src/main/java/org/apache/camel/impl/health/RoutesHealthCheckRepository.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/health/RoutesHealthCheckRepository.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/health/RoutesHealthCheckRepository.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/health/package.html b/core/camel-base/src/main/java/org/apache/camel/impl/health/package.html
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/health/package.html
rename to core/camel-base/src/main/java/org/apache/camel/impl/health/package.html
diff --git a/camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaCoordinator.java b/core/camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaCoordinator.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaCoordinator.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaCoordinator.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaService.java b/core/camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaService.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaService.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/saga/InMemorySagaService.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/saga/package.html b/core/camel-base/src/main/java/org/apache/camel/impl/saga/package.html
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/saga/package.html
rename to core/camel-base/src/main/java/org/apache/camel/impl/saga/package.html
diff --git a/camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithAnyPackageScanFilter.java b/core/camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithAnyPackageScanFilter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithAnyPackageScanFilter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithAnyPackageScanFilter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithPackageScanFilter.java b/core/camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithPackageScanFilter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithPackageScanFilter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/scan/AnnotatedWithPackageScanFilter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java b/core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/scan/AssignableToPackageScanFilter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java b/core/camel-base/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/scan/CompositePackageScanFilter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java b/core/camel-base/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/scan/InvertingPackageScanFilter.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/scan/package.html b/core/camel-base/src/main/java/org/apache/camel/impl/scan/package.html
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/scan/package.html
rename to core/camel-base/src/main/java/org/apache/camel/impl/scan/package.html
diff --git a/camel-base/src/main/java/org/apache/camel/impl/validator/ProcessorValidator.java b/core/camel-base/src/main/java/org/apache/camel/impl/validator/ProcessorValidator.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/validator/ProcessorValidator.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/validator/ProcessorValidator.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/validator/ValidatorKey.java b/core/camel-base/src/main/java/org/apache/camel/impl/validator/ValidatorKey.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/validator/ValidatorKey.java
rename to core/camel-base/src/main/java/org/apache/camel/impl/validator/ValidatorKey.java
diff --git a/camel-base/src/main/java/org/apache/camel/impl/validator/package.html b/core/camel-base/src/main/java/org/apache/camel/impl/validator/package.html
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/impl/validator/package.html
rename to core/camel-base/src/main/java/org/apache/camel/impl/validator/package.html
diff --git a/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java
rename to core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/AbstractCamelCatalog.java
diff --git a/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/CamelContextJSonSchemaResolver.java b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/CamelContextJSonSchemaResolver.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/CamelContextJSonSchemaResolver.java
rename to core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/CamelContextJSonSchemaResolver.java
diff --git a/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/CatalogHelper.java b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/CatalogHelper.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/CatalogHelper.java
rename to core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/CatalogHelper.java
diff --git a/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/DefaultRuntimeCamelCatalog.java b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/DefaultRuntimeCamelCatalog.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/DefaultRuntimeCamelCatalog.java
rename to core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/DefaultRuntimeCamelCatalog.java
diff --git a/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/Pair.java b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/Pair.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/Pair.java
rename to core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/Pair.java
diff --git a/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/SuggestionStrategy.java b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/SuggestionStrategy.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/SuggestionStrategy.java
rename to core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/SuggestionStrategy.java
diff --git a/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/TimePatternConverter.java b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/TimePatternConverter.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/TimePatternConverter.java
rename to core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/TimePatternConverter.java
diff --git a/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/URISupport.java b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/URISupport.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/URISupport.java
rename to core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/URISupport.java
diff --git a/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/UnsafeUriCharactersEncoder.java b/core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/UnsafeUriCharactersEncoder.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/UnsafeUriCharactersEncoder.java
rename to core/camel-base/src/main/java/org/apache/camel/runtimecatalog/impl/UnsafeUriCharactersEncoder.java
diff --git a/camel-base/src/main/java/org/apache/camel/support/dump/CamelContextStatDump.java b/core/camel-base/src/main/java/org/apache/camel/support/dump/CamelContextStatDump.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/support/dump/CamelContextStatDump.java
rename to core/camel-base/src/main/java/org/apache/camel/support/dump/CamelContextStatDump.java
diff --git a/camel-base/src/main/java/org/apache/camel/support/dump/MessageDump.java b/core/camel-base/src/main/java/org/apache/camel/support/dump/MessageDump.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/support/dump/MessageDump.java
rename to core/camel-base/src/main/java/org/apache/camel/support/dump/MessageDump.java
diff --git a/camel-base/src/main/java/org/apache/camel/support/dump/ProcessorStatDump.java b/core/camel-base/src/main/java/org/apache/camel/support/dump/ProcessorStatDump.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/support/dump/ProcessorStatDump.java
rename to core/camel-base/src/main/java/org/apache/camel/support/dump/ProcessorStatDump.java
diff --git a/camel-base/src/main/java/org/apache/camel/support/dump/RouteStatDump.java b/core/camel-base/src/main/java/org/apache/camel/support/dump/RouteStatDump.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/support/dump/RouteStatDump.java
rename to core/camel-base/src/main/java/org/apache/camel/support/dump/RouteStatDump.java
diff --git a/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionHalfOpenHandler.java b/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionHalfOpenHandler.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionHalfOpenHandler.java
rename to core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionHalfOpenHandler.java
diff --git a/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java b/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java
rename to core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingExceptionRoutePolicy.java
diff --git a/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java b/core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java
similarity index 100%
rename from camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java
rename to core/camel-base/src/main/java/org/apache/camel/throttling/ThrottlingInflightRoutePolicy.java
diff --git a/camel-core/pom.xml b/core/camel-core/pom.xml
similarity index 99%
rename from camel-core/pom.xml
rename to core/camel-core/pom.xml
index f8c5416..2ea7015 100644
--- a/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -24,9 +24,9 @@
 
   <parent>
     <groupId>org.apache.camel</groupId>
-    <artifactId>camel-parent</artifactId>
+    <artifactId>core</artifactId>
     <version>3.0.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <artifactId>camel-core</artifactId>
diff --git a/camel-core/readme-eip.adoc b/core/camel-core/readme-eip.adoc
similarity index 100%
rename from camel-core/readme-eip.adoc
rename to core/camel-core/readme-eip.adoc
diff --git a/camel-core/readme.adoc b/core/camel-core/readme.adoc
similarity index 100%
rename from camel-core/readme.adoc
rename to core/camel-core/readme.adoc
diff --git a/camel-core/src/main/docs/ControlBus.gif b/core/camel-core/src/main/docs/ControlBus.gif
similarity index 100%
rename from camel-core/src/main/docs/ControlBus.gif
rename to core/camel-core/src/main/docs/ControlBus.gif
diff --git a/camel-core/src/main/docs/bean-component.adoc b/core/camel-core/src/main/docs/bean-component.adoc
similarity index 100%
rename from camel-core/src/main/docs/bean-component.adoc
rename to core/camel-core/src/main/docs/bean-component.adoc
diff --git a/camel-core/src/main/docs/bean-language.adoc b/core/camel-core/src/main/docs/bean-language.adoc
similarity index 100%
rename from camel-core/src/main/docs/bean-language.adoc
rename to core/camel-core/src/main/docs/bean-language.adoc
diff --git a/camel-core/src/main/docs/class-component.adoc b/core/camel-core/src/main/docs/class-component.adoc
similarity index 100%
rename from camel-core/src/main/docs/class-component.adoc
rename to core/camel-core/src/main/docs/class-component.adoc
diff --git a/camel-core/src/main/docs/clustering.adoc b/core/camel-core/src/main/docs/clustering.adoc
similarity index 100%
rename from camel-core/src/main/docs/clustering.adoc
rename to core/camel-core/src/main/docs/clustering.adoc
diff --git a/camel-core/src/main/docs/constant-language.adoc b/core/camel-core/src/main/docs/constant-language.adoc
similarity index 100%
rename from camel-core/src/main/docs/constant-language.adoc
rename to core/camel-core/src/main/docs/constant-language.adoc
diff --git a/camel-core/src/main/docs/dataset-component.adoc b/core/camel-core/src/main/docs/dataset-component.adoc
similarity index 100%
rename from camel-core/src/main/docs/dataset-component.adoc
rename to core/camel-core/src/main/docs/dataset-component.adoc
diff --git a/camel-core/src/main/docs/dynamic-router.adoc b/core/camel-core/src/main/docs/dynamic-router.adoc
similarity index 100%
rename from camel-core/src/main/docs/dynamic-router.adoc
rename to core/camel-core/src/main/docs/dynamic-router.adoc
diff --git a/camel-core/src/main/docs/eips/aggregate-eip.adoc b/core/camel-core/src/main/docs/eips/aggregate-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/aggregate-eip.adoc
rename to core/camel-core/src/main/docs/eips/aggregate-eip.adoc
diff --git a/camel-core/src/main/docs/eips/batch-config-eip.adoc b/core/camel-core/src/main/docs/eips/batch-config-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/batch-config-eip.adoc
rename to core/camel-core/src/main/docs/eips/batch-config-eip.adoc
diff --git a/camel-core/src/main/docs/eips/bean-eip.adoc b/core/camel-core/src/main/docs/eips/bean-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/bean-eip.adoc
rename to core/camel-core/src/main/docs/eips/bean-eip.adoc
diff --git a/camel-core/src/main/docs/eips/choice-eip.adoc b/core/camel-core/src/main/docs/eips/choice-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/choice-eip.adoc
rename to core/camel-core/src/main/docs/eips/choice-eip.adoc
diff --git a/camel-core/src/main/docs/eips/circuitBreaker-eip.adoc b/core/camel-core/src/main/docs/eips/circuitBreaker-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/circuitBreaker-eip.adoc
rename to core/camel-core/src/main/docs/eips/circuitBreaker-eip.adoc
diff --git a/camel-core/src/main/docs/eips/claimCheck-eip.adoc b/core/camel-core/src/main/docs/eips/claimCheck-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/claimCheck-eip.adoc
rename to core/camel-core/src/main/docs/eips/claimCheck-eip.adoc
diff --git a/camel-core/src/main/docs/eips/content-based-router-eip.adoc b/core/camel-core/src/main/docs/eips/content-based-router-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/content-based-router-eip.adoc
rename to core/camel-core/src/main/docs/eips/content-based-router-eip.adoc
diff --git a/camel-core/src/main/docs/eips/content-filter-eip.adoc b/core/camel-core/src/main/docs/eips/content-filter-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/content-filter-eip.adoc
rename to core/camel-core/src/main/docs/eips/content-filter-eip.adoc
diff --git a/camel-core/src/main/docs/eips/convertBodyTo-eip.adoc b/core/camel-core/src/main/docs/eips/convertBodyTo-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/convertBodyTo-eip.adoc
rename to core/camel-core/src/main/docs/eips/convertBodyTo-eip.adoc
diff --git a/camel-core/src/main/docs/eips/correlation-identifier.adoc b/core/camel-core/src/main/docs/eips/correlation-identifier.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/correlation-identifier.adoc
rename to core/camel-core/src/main/docs/eips/correlation-identifier.adoc
diff --git a/camel-core/src/main/docs/eips/customLoadBalancer-eip.adoc b/core/camel-core/src/main/docs/eips/customLoadBalancer-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/customLoadBalancer-eip.adoc
rename to core/camel-core/src/main/docs/eips/customLoadBalancer-eip.adoc
diff --git a/camel-core/src/main/docs/eips/dead-letter-channel.adoc b/core/camel-core/src/main/docs/eips/dead-letter-channel.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/dead-letter-channel.adoc
rename to core/camel-core/src/main/docs/eips/dead-letter-channel.adoc
diff --git a/camel-core/src/main/docs/eips/delay-eip.adoc b/core/camel-core/src/main/docs/eips/delay-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/delay-eip.adoc
rename to core/camel-core/src/main/docs/eips/delay-eip.adoc
diff --git a/camel-core/src/main/docs/eips/dynamicRouter-eip.adoc b/core/camel-core/src/main/docs/eips/dynamicRouter-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/dynamicRouter-eip.adoc
rename to core/camel-core/src/main/docs/eips/dynamicRouter-eip.adoc
diff --git a/camel-core/src/main/docs/eips/enrich-eip.adoc b/core/camel-core/src/main/docs/eips/enrich-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/enrich-eip.adoc
rename to core/camel-core/src/main/docs/eips/enrich-eip.adoc
diff --git a/camel-core/src/main/docs/eips/event-message.adoc b/core/camel-core/src/main/docs/eips/event-message.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/event-message.adoc
rename to core/camel-core/src/main/docs/eips/event-message.adoc
diff --git a/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc b/core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc
rename to core/camel-core/src/main/docs/eips/eventDrivenConsumer-eip.adoc
diff --git a/camel-core/src/main/docs/eips/failover-eip.adoc b/core/camel-core/src/main/docs/eips/failover-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/failover-eip.adoc
rename to core/camel-core/src/main/docs/eips/failover-eip.adoc
diff --git a/camel-core/src/main/docs/eips/filter-eip.adoc b/core/camel-core/src/main/docs/eips/filter-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/filter-eip.adoc
rename to core/camel-core/src/main/docs/eips/filter-eip.adoc
diff --git a/camel-core/src/main/docs/eips/from-eip.adoc b/core/camel-core/src/main/docs/eips/from-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/from-eip.adoc
rename to core/camel-core/src/main/docs/eips/from-eip.adoc
diff --git a/camel-core/src/main/docs/eips/guaranteed-delivery.adoc b/core/camel-core/src/main/docs/eips/guaranteed-delivery.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/guaranteed-delivery.adoc
rename to core/camel-core/src/main/docs/eips/guaranteed-delivery.adoc
diff --git a/camel-core/src/main/docs/eips/hystrix-eip.adoc b/core/camel-core/src/main/docs/eips/hystrix-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/hystrix-eip.adoc
rename to core/camel-core/src/main/docs/eips/hystrix-eip.adoc
diff --git a/camel-core/src/main/docs/eips/hystrixConfiguration-eip.adoc b/core/camel-core/src/main/docs/eips/hystrixConfiguration-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/hystrixConfiguration-eip.adoc
rename to core/camel-core/src/main/docs/eips/hystrixConfiguration-eip.adoc
diff --git a/camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc b/core/camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc
rename to core/camel-core/src/main/docs/eips/idempotentConsumer-eip.adoc
diff --git a/camel-core/src/main/docs/eips/inOnly-eip.adoc b/core/camel-core/src/main/docs/eips/inOnly-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/inOnly-eip.adoc
rename to core/camel-core/src/main/docs/eips/inOnly-eip.adoc
diff --git a/camel-core/src/main/docs/eips/inOut-eip.adoc b/core/camel-core/src/main/docs/eips/inOut-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/inOut-eip.adoc
rename to core/camel-core/src/main/docs/eips/inOut-eip.adoc
diff --git a/camel-core/src/main/docs/eips/loadBalance-eip.adoc b/core/camel-core/src/main/docs/eips/loadBalance-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/loadBalance-eip.adoc
rename to core/camel-core/src/main/docs/eips/loadBalance-eip.adoc
diff --git a/camel-core/src/main/docs/eips/log-eip.adoc b/core/camel-core/src/main/docs/eips/log-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/log-eip.adoc
rename to core/camel-core/src/main/docs/eips/log-eip.adoc
diff --git a/camel-core/src/main/docs/eips/loop-eip.adoc b/core/camel-core/src/main/docs/eips/loop-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/loop-eip.adoc
rename to core/camel-core/src/main/docs/eips/loop-eip.adoc
diff --git a/camel-core/src/main/docs/eips/marshal-eip.adoc b/core/camel-core/src/main/docs/eips/marshal-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/marshal-eip.adoc
rename to core/camel-core/src/main/docs/eips/marshal-eip.adoc
diff --git a/camel-core/src/main/docs/eips/message-bus.adoc b/core/camel-core/src/main/docs/eips/message-bus.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/message-bus.adoc
rename to core/camel-core/src/main/docs/eips/message-bus.adoc
diff --git a/camel-core/src/main/docs/eips/message-channel.adoc b/core/camel-core/src/main/docs/eips/message-channel.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/message-channel.adoc
rename to core/camel-core/src/main/docs/eips/message-channel.adoc
diff --git a/camel-core/src/main/docs/eips/message-endpoint.adoc b/core/camel-core/src/main/docs/eips/message-endpoint.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/message-endpoint.adoc
rename to core/camel-core/src/main/docs/eips/message-endpoint.adoc
diff --git a/camel-core/src/main/docs/eips/message-router.adoc b/core/camel-core/src/main/docs/eips/message-router.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/message-router.adoc
rename to core/camel-core/src/main/docs/eips/message-router.adoc
diff --git a/camel-core/src/main/docs/eips/message-translator.adoc b/core/camel-core/src/main/docs/eips/message-translator.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/message-translator.adoc
rename to core/camel-core/src/main/docs/eips/message-translator.adoc
diff --git a/camel-core/src/main/docs/eips/message.adoc b/core/camel-core/src/main/docs/eips/message.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/message.adoc
rename to core/camel-core/src/main/docs/eips/message.adoc
diff --git a/camel-core/src/main/docs/eips/multicast-eip.adoc b/core/camel-core/src/main/docs/eips/multicast-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/multicast-eip.adoc
rename to core/camel-core/src/main/docs/eips/multicast-eip.adoc
diff --git a/camel-core/src/main/docs/eips/onFallback-eip.adoc b/core/camel-core/src/main/docs/eips/onFallback-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/onFallback-eip.adoc
rename to core/camel-core/src/main/docs/eips/onFallback-eip.adoc
diff --git a/camel-core/src/main/docs/eips/otherwise-eip.adoc b/core/camel-core/src/main/docs/eips/otherwise-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/otherwise-eip.adoc
rename to core/camel-core/src/main/docs/eips/otherwise-eip.adoc
diff --git a/camel-core/src/main/docs/eips/pipeline-eip.adoc b/core/camel-core/src/main/docs/eips/pipeline-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/pipeline-eip.adoc
rename to core/camel-core/src/main/docs/eips/pipeline-eip.adoc
diff --git a/camel-core/src/main/docs/eips/point-to-point-channel.adoc b/core/camel-core/src/main/docs/eips/point-to-point-channel.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/point-to-point-channel.adoc
rename to core/camel-core/src/main/docs/eips/point-to-point-channel.adoc
diff --git a/camel-core/src/main/docs/eips/pollEnrich-eip.adoc b/core/camel-core/src/main/docs/eips/pollEnrich-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/pollEnrich-eip.adoc
rename to core/camel-core/src/main/docs/eips/pollEnrich-eip.adoc
diff --git a/camel-core/src/main/docs/eips/process-eip.adoc b/core/camel-core/src/main/docs/eips/process-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/process-eip.adoc
rename to core/camel-core/src/main/docs/eips/process-eip.adoc
diff --git a/camel-core/src/main/docs/eips/publish-subscribe-channel.adoc b/core/camel-core/src/main/docs/eips/publish-subscribe-channel.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/publish-subscribe-channel.adoc
rename to core/camel-core/src/main/docs/eips/publish-subscribe-channel.adoc
diff --git a/camel-core/src/main/docs/eips/random-eip.adoc b/core/camel-core/src/main/docs/eips/random-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/random-eip.adoc
rename to core/camel-core/src/main/docs/eips/random-eip.adoc
diff --git a/camel-core/src/main/docs/eips/recipientList-eip.adoc b/core/camel-core/src/main/docs/eips/recipientList-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/recipientList-eip.adoc
rename to core/camel-core/src/main/docs/eips/recipientList-eip.adoc
diff --git a/camel-core/src/main/docs/eips/removeHeader-eip.adoc b/core/camel-core/src/main/docs/eips/removeHeader-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/removeHeader-eip.adoc
rename to core/camel-core/src/main/docs/eips/removeHeader-eip.adoc
diff --git a/camel-core/src/main/docs/eips/removeHeaders-eip.adoc b/core/camel-core/src/main/docs/eips/removeHeaders-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/removeHeaders-eip.adoc
rename to core/camel-core/src/main/docs/eips/removeHeaders-eip.adoc
diff --git a/camel-core/src/main/docs/eips/removeProperties-eip.adoc b/core/camel-core/src/main/docs/eips/removeProperties-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/removeProperties-eip.adoc
rename to core/camel-core/src/main/docs/eips/removeProperties-eip.adoc
diff --git a/camel-core/src/main/docs/eips/removeProperty-eip.adoc b/core/camel-core/src/main/docs/eips/removeProperty-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/removeProperty-eip.adoc
rename to core/camel-core/src/main/docs/eips/removeProperty-eip.adoc
diff --git a/camel-core/src/main/docs/eips/requestReply-eip.adoc b/core/camel-core/src/main/docs/eips/requestReply-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/requestReply-eip.adoc
rename to core/camel-core/src/main/docs/eips/requestReply-eip.adoc
diff --git a/camel-core/src/main/docs/eips/resequence-eip.adoc b/core/camel-core/src/main/docs/eips/resequence-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/resequence-eip.adoc
rename to core/camel-core/src/main/docs/eips/resequence-eip.adoc
diff --git a/camel-core/src/main/docs/eips/rollback-eip.adoc b/core/camel-core/src/main/docs/eips/rollback-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/rollback-eip.adoc
rename to core/camel-core/src/main/docs/eips/rollback-eip.adoc
diff --git a/camel-core/src/main/docs/eips/roundRobin-eip.adoc b/core/camel-core/src/main/docs/eips/roundRobin-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/roundRobin-eip.adoc
rename to core/camel-core/src/main/docs/eips/roundRobin-eip.adoc
diff --git a/camel-core/src/main/docs/eips/routingSlip-eip.adoc b/core/camel-core/src/main/docs/eips/routingSlip-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/routingSlip-eip.adoc
rename to core/camel-core/src/main/docs/eips/routingSlip-eip.adoc
diff --git a/camel-core/src/main/docs/eips/saga-eip.adoc b/core/camel-core/src/main/docs/eips/saga-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/saga-eip.adoc
rename to core/camel-core/src/main/docs/eips/saga-eip.adoc
diff --git a/camel-core/src/main/docs/eips/sample-eip.adoc b/core/camel-core/src/main/docs/eips/sample-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/sample-eip.adoc
rename to core/camel-core/src/main/docs/eips/sample-eip.adoc
diff --git a/camel-core/src/main/docs/eips/script-eip.adoc b/core/camel-core/src/main/docs/eips/script-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/script-eip.adoc
rename to core/camel-core/src/main/docs/eips/script-eip.adoc
diff --git a/camel-core/src/main/docs/eips/serviceCall-eip.adoc b/core/camel-core/src/main/docs/eips/serviceCall-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/serviceCall-eip.adoc
rename to core/camel-core/src/main/docs/eips/serviceCall-eip.adoc
diff --git a/camel-core/src/main/docs/eips/setBody-eip.adoc b/core/camel-core/src/main/docs/eips/setBody-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/setBody-eip.adoc
rename to core/camel-core/src/main/docs/eips/setBody-eip.adoc
diff --git a/camel-core/src/main/docs/eips/setFaultBody-eip.adoc b/core/camel-core/src/main/docs/eips/setFaultBody-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/setFaultBody-eip.adoc
rename to core/camel-core/src/main/docs/eips/setFaultBody-eip.adoc
diff --git a/camel-core/src/main/docs/eips/setHeader-eip.adoc b/core/camel-core/src/main/docs/eips/setHeader-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/setHeader-eip.adoc
rename to core/camel-core/src/main/docs/eips/setHeader-eip.adoc
diff --git a/camel-core/src/main/docs/eips/setOutHeader-eip.adoc b/core/camel-core/src/main/docs/eips/setOutHeader-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/setOutHeader-eip.adoc
rename to core/camel-core/src/main/docs/eips/setOutHeader-eip.adoc
diff --git a/camel-core/src/main/docs/eips/setProperty-eip.adoc b/core/camel-core/src/main/docs/eips/setProperty-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/setProperty-eip.adoc
rename to core/camel-core/src/main/docs/eips/setProperty-eip.adoc
diff --git a/camel-core/src/main/docs/eips/sort-eip.adoc b/core/camel-core/src/main/docs/eips/sort-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/sort-eip.adoc
rename to core/camel-core/src/main/docs/eips/sort-eip.adoc
diff --git a/camel-core/src/main/docs/eips/split-eip.adoc b/core/camel-core/src/main/docs/eips/split-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/split-eip.adoc
rename to core/camel-core/src/main/docs/eips/split-eip.adoc
diff --git a/camel-core/src/main/docs/eips/sticky-eip.adoc b/core/camel-core/src/main/docs/eips/sticky-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/sticky-eip.adoc
rename to core/camel-core/src/main/docs/eips/sticky-eip.adoc
diff --git a/camel-core/src/main/docs/eips/stop-eip.adoc b/core/camel-core/src/main/docs/eips/stop-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/stop-eip.adoc
rename to core/camel-core/src/main/docs/eips/stop-eip.adoc
diff --git a/camel-core/src/main/docs/eips/stream-config-eip.adoc b/core/camel-core/src/main/docs/eips/stream-config-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/stream-config-eip.adoc
rename to core/camel-core/src/main/docs/eips/stream-config-eip.adoc
diff --git a/camel-core/src/main/docs/eips/threads-eip.adoc b/core/camel-core/src/main/docs/eips/threads-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/threads-eip.adoc
rename to core/camel-core/src/main/docs/eips/threads-eip.adoc
diff --git a/camel-core/src/main/docs/eips/throttle-eip.adoc b/core/camel-core/src/main/docs/eips/throttle-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/throttle-eip.adoc
rename to core/camel-core/src/main/docs/eips/throttle-eip.adoc
diff --git a/camel-core/src/main/docs/eips/to-eip.adoc b/core/camel-core/src/main/docs/eips/to-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/to-eip.adoc
rename to core/camel-core/src/main/docs/eips/to-eip.adoc
diff --git a/camel-core/src/main/docs/eips/toD-eip.adoc b/core/camel-core/src/main/docs/eips/toD-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/toD-eip.adoc
rename to core/camel-core/src/main/docs/eips/toD-eip.adoc
diff --git a/camel-core/src/main/docs/eips/topic-eip.adoc b/core/camel-core/src/main/docs/eips/topic-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/topic-eip.adoc
rename to core/camel-core/src/main/docs/eips/topic-eip.adoc
diff --git a/camel-core/src/main/docs/eips/transactional-client.adoc b/core/camel-core/src/main/docs/eips/transactional-client.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/transactional-client.adoc
rename to core/camel-core/src/main/docs/eips/transactional-client.adoc
diff --git a/camel-core/src/main/docs/eips/transform-eip.adoc b/core/camel-core/src/main/docs/eips/transform-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/transform-eip.adoc
rename to core/camel-core/src/main/docs/eips/transform-eip.adoc
diff --git a/camel-core/src/main/docs/eips/unmarshal-eip.adoc b/core/camel-core/src/main/docs/eips/unmarshal-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/unmarshal-eip.adoc
rename to core/camel-core/src/main/docs/eips/unmarshal-eip.adoc
diff --git a/camel-core/src/main/docs/eips/validate-eip.adoc b/core/camel-core/src/main/docs/eips/validate-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/validate-eip.adoc
rename to core/camel-core/src/main/docs/eips/validate-eip.adoc
diff --git a/camel-core/src/main/docs/eips/weighted-eip.adoc b/core/camel-core/src/main/docs/eips/weighted-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/weighted-eip.adoc
rename to core/camel-core/src/main/docs/eips/weighted-eip.adoc
diff --git a/camel-core/src/main/docs/eips/when-eip.adoc b/core/camel-core/src/main/docs/eips/when-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/when-eip.adoc
rename to core/camel-core/src/main/docs/eips/when-eip.adoc
diff --git a/camel-core/src/main/docs/eips/wireTap-eip.adoc b/core/camel-core/src/main/docs/eips/wireTap-eip.adoc
similarity index 100%
rename from camel-core/src/main/docs/eips/wireTap-eip.adoc
rename to core/camel-core/src/main/docs/eips/wireTap-eip.adoc
diff --git a/camel-core/src/main/docs/exchangeProperty-language.adoc b/core/camel-core/src/main/docs/exchangeProperty-language.adoc
similarity index 100%
rename from camel-core/src/main/docs/exchangeProperty-language.adoc
rename to core/camel-core/src/main/docs/exchangeProperty-language.adoc
diff --git a/camel-core/src/main/docs/file-language.adoc b/core/camel-core/src/main/docs/file-language.adoc
similarity index 100%
rename from camel-core/src/main/docs/file-language.adoc
rename to core/camel-core/src/main/docs/file-language.adoc
diff --git a/camel-core/src/main/docs/gzip-dataformat.adoc b/core/camel-core/src/main/docs/gzip-dataformat.adoc
similarity index 100%
rename from camel-core/src/main/docs/gzip-dataformat.adoc
rename to core/camel-core/src/main/docs/gzip-dataformat.adoc
diff --git a/camel-core/src/main/docs/header-language.adoc b/core/camel-core/src/main/docs/header-language.adoc
similarity index 100%
rename from camel-core/src/main/docs/header-language.adoc
rename to core/camel-core/src/main/docs/header-language.adoc
diff --git a/camel-core/src/main/docs/health-check.adoc b/core/camel-core/src/main/docs/health-check.adoc
similarity index 100%
rename from camel-core/src/main/docs/health-check.adoc
rename to core/camel-core/src/main/docs/health-check.adoc
diff --git a/camel-core/src/main/docs/mock-component.adoc b/core/camel-core/src/main/docs/mock-component.adoc
similarity index 100%
rename from camel-core/src/main/docs/mock-component.adoc
rename to core/camel-core/src/main/docs/mock-component.adoc
diff --git a/camel-core/src/main/docs/ref-language.adoc b/core/camel-core/src/main/docs/ref-language.adoc
similarity index 100%
rename from camel-core/src/main/docs/ref-language.adoc
rename to core/camel-core/src/main/docs/ref-language.adoc
diff --git a/camel-core/src/main/docs/rest-dsl.adoc b/core/camel-core/src/main/docs/rest-dsl.adoc
similarity index 100%
rename from camel-core/src/main/docs/rest-dsl.adoc
rename to core/camel-core/src/main/docs/rest-dsl.adoc
diff --git a/camel-core/src/main/docs/return-address.adoc b/core/camel-core/src/main/docs/return-address.adoc
similarity index 100%
rename from camel-core/src/main/docs/return-address.adoc
rename to core/camel-core/src/main/docs/return-address.adoc
diff --git a/camel-core/src/main/docs/serialization-dataformat.adoc b/core/camel-core/src/main/docs/serialization-dataformat.adoc
similarity index 100%
rename from camel-core/src/main/docs/serialization-dataformat.adoc
rename to core/camel-core/src/main/docs/serialization-dataformat.adoc
diff --git a/camel-core/src/main/docs/service-registry.adoc b/core/camel-core/src/main/docs/service-registry.adoc
similarity index 100%
rename from camel-core/src/main/docs/service-registry.adoc
rename to core/camel-core/src/main/docs/service-registry.adoc
diff --git a/camel-core/src/main/docs/simple-language.adoc b/core/camel-core/src/main/docs/simple-language.adoc
similarity index 100%
rename from camel-core/src/main/docs/simple-language.adoc
rename to core/camel-core/src/main/docs/simple-language.adoc
diff --git a/camel-core/src/main/docs/string-dataformat.adoc b/core/camel-core/src/main/docs/string-dataformat.adoc
similarity index 100%
rename from camel-core/src/main/docs/string-dataformat.adoc
rename to core/camel-core/src/main/docs/string-dataformat.adoc
diff --git a/camel-core/src/main/docs/test-component.adoc b/core/camel-core/src/main/docs/test-component.adoc
similarity index 100%
rename from camel-core/src/main/docs/test-component.adoc
rename to core/camel-core/src/main/docs/test-component.adoc
diff --git a/camel-core/src/main/docs/tokenize-language.adoc b/core/camel-core/src/main/docs/tokenize-language.adoc
similarity index 100%
rename from camel-core/src/main/docs/tokenize-language.adoc
rename to core/camel-core/src/main/docs/tokenize-language.adoc
diff --git a/camel-core/src/main/docs/transformer.adoc b/core/camel-core/src/main/docs/transformer.adoc
similarity index 100%
rename from camel-core/src/main/docs/transformer.adoc
rename to core/camel-core/src/main/docs/transformer.adoc
diff --git a/camel-core/src/main/docs/validator.adoc b/core/camel-core/src/main/docs/validator.adoc
similarity index 100%
rename from camel-core/src/main/docs/validator.adoc
rename to core/camel-core/src/main/docs/validator.adoc
diff --git a/camel-core/src/main/docs/xpath-language.adoc b/core/camel-core/src/main/docs/xpath-language.adoc
similarity index 100%
rename from camel-core/src/main/docs/xpath-language.adoc
rename to core/camel-core/src/main/docs/xpath-language.adoc
diff --git a/camel-core/src/main/docs/xtokenize-language.adoc b/core/camel-core/src/main/docs/xtokenize-language.adoc
similarity index 100%
rename from camel-core/src/main/docs/xtokenize-language.adoc
rename to core/camel-core/src/main/docs/xtokenize-language.adoc
diff --git a/camel-core/src/main/docs/zip-dataformat.adoc b/core/camel-core/src/main/docs/zip-dataformat.adoc
similarity index 100%
rename from camel-core/src/main/docs/zip-dataformat.adoc
rename to core/camel-core/src/main/docs/zip-dataformat.adoc
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTask.java b/core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTask.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/AdviceWithTask.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTask.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java b/core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategies.java b/core/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategies.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/AggregationStrategies.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategies.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java b/core/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java b/core/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/Builder.java b/core/camel-core/src/main/java/org/apache/camel/builder/Builder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/Builder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/Builder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java b/core/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/BuilderSupport.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java b/core/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/DefaultFluentProducerTemplate.java b/core/camel-core/src/main/java/org/apache/camel/builder/DefaultFluentProducerTemplate.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/DefaultFluentProducerTemplate.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/DefaultFluentProducerTemplate.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/EnrichClause.java b/core/camel-core/src/main/java/org/apache/camel/builder/EnrichClause.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/EnrichClause.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/EnrichClause.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java b/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java b/core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ExchangeBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java b/core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java b/core/camel-core/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/FlexibleAggregationStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/NoErrorHandlerBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/NotifyBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/PredicateClause.java b/core/camel-core/src/main/java/org/apache/camel/builder/PredicateClause.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/PredicateClause.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/PredicateClause.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ProcessClause.java b/core/camel-core/src/main/java/org/apache/camel/builder/ProcessClause.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ProcessClause.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ProcessClause.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ProxyBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/RecordableInputStream.java b/core/camel-core/src/main/java/org/apache/camel/builder/RecordableInputStream.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/RecordableInputStream.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/RecordableInputStream.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/RecordableReader.java b/core/camel-core/src/main/java/org/apache/camel/builder/RecordableReader.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/RecordableReader.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/RecordableReader.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ScriptHelper.java b/core/camel-core/src/main/java/org/apache/camel/builder/ScriptHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ScriptHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ScriptHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/SimpleBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/TokenPairExpressionIterator.java b/core/camel-core/src/main/java/org/apache/camel/builder/TokenPairExpressionIterator.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/TokenPairExpressionIterator.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/TokenPairExpressionIterator.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/TokenXMLExpressionIterator.java b/core/camel-core/src/main/java/org/apache/camel/builder/TokenXMLExpressionIterator.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/TokenXMLExpressionIterator.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/TokenXMLExpressionIterator.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/TransformerBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/TransformerBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/TransformerBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/TransformerBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ValidatorBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/ValidatorBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ValidatorBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ValidatorBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/XMLTokenExpressionIterator.java b/core/camel-core/src/main/java/org/apache/camel/builder/XMLTokenExpressionIterator.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/XMLTokenExpressionIterator.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/XMLTokenExpressionIterator.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/package.html b/core/camel-core/src/main/java/org/apache/camel/builder/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/package.html
rename to core/camel-core/src/main/java/org/apache/camel/builder/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java b/core/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/xml/DefaultNamespaceContext.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/InvalidXPathExpression.java b/core/camel-core/src/main/java/org/apache/camel/builder/xml/InvalidXPathExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/xml/InvalidXPathExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/xml/InvalidXPathExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java b/core/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java b/core/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/xml/Namespaces.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/builder/xml/package.html b/core/camel-core/src/main/java/org/apache/camel/builder/xml/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/builder/xml/package.html
rename to core/camel-core/src/main/java/org/apache/camel/builder/xml/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/AbstractBeanProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/AbstractCamelInvocationHandler.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/AmbiguousMethodCallException.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/AnnotationExpressionFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanAnnotationExpressionFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanComponent.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanConstants.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanConstants.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanConstants.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanConstants.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanConverter.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanConverter.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanConverter.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanConverter.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanEndpoint.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanExpressionProcessor.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanExpressionProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanExpressionProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanExpressionProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanHelper.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanHolder.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfoCacheKey.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfoCacheKey.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanInfoCacheKey.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfoCacheKey.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanInvocation.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanProducer.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanProducer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanProducer.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanProducer.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanTypeHolder.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/BeanTypeHolder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/BeanTypeHolder.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/BeanTypeHolder.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ConstantStaticTypeBeanHolder.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/ConstantStaticTypeBeanHolder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/ConstantStaticTypeBeanHolder.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/ConstantStaticTypeBeanHolder.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ConstantTypeBeanHolder.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/ConstantTypeBeanHolder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/ConstantTypeBeanHolder.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/ConstantTypeBeanHolder.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/DefaultAnnotationExpressionFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/DefaultParameterMappingStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodBean.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/MethodBean.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/MethodBean.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/MethodBean.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/MethodInvocation.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/MethodNotFoundException.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodsFilter.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/MethodsFilter.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/MethodsFilter.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/MethodsFilter.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ParameterBindingException.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/ParameterBindingException.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/ParameterBindingException.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/ParameterBindingException.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/ParameterInfo.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ParameterMappingStrategy.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/ParameterMappingStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/ParameterMappingStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/ParameterMappingStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/PojoMessageInvocationHandler.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/PojoMessageInvocationHandler.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/PojoMessageInvocationHandler.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/PojoMessageInvocationHandler.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/PojoProxyHelper.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/PojoProxyHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/PojoProxyHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/PojoProxyHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/RegistryBean.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java b/core/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/XPathAnnotationExpressionFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/package.html b/core/camel-core/src/main/java/org/apache/camel/component/bean/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/bean/package.html
rename to core/camel-core/src/main/java/org/apache/camel/component/bean/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java b/core/camel-core/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
rename to core/camel-core/src/main/java/org/apache/camel/component/beanclass/ClassComponent.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/beanclass/ClassEndpoint.java b/core/camel-core/src/main/java/org/apache/camel/component/beanclass/ClassEndpoint.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/beanclass/ClassEndpoint.java
rename to core/camel-core/src/main/java/org/apache/camel/component/beanclass/ClassEndpoint.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/beanclass/package.html b/core/camel-core/src/main/java/org/apache/camel/component/beanclass/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/beanclass/package.html
rename to core/camel-core/src/main/java/org/apache/camel/component/beanclass/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java b/core/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
rename to core/camel-core/src/main/java/org/apache/camel/component/dataset/DataSet.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java b/core/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
rename to core/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java b/core/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
rename to core/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java b/core/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
rename to core/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java b/core/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
rename to core/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetSupport.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/FileDataSet.java b/core/camel-core/src/main/java/org/apache/camel/component/dataset/FileDataSet.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/dataset/FileDataSet.java
rename to core/camel-core/src/main/java/org/apache/camel/component/dataset/FileDataSet.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/ListDataSet.java b/core/camel-core/src/main/java/org/apache/camel/component/dataset/ListDataSet.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/dataset/ListDataSet.java
rename to core/camel-core/src/main/java/org/apache/camel/component/dataset/ListDataSet.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/SimpleDataSet.java b/core/camel-core/src/main/java/org/apache/camel/component/dataset/SimpleDataSet.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/dataset/SimpleDataSet.java
rename to core/camel-core/src/main/java/org/apache/camel/component/dataset/SimpleDataSet.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/package.html b/core/camel-core/src/main/java/org/apache/camel/component/dataset/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/dataset/package.html
rename to core/camel-core/src/main/java/org/apache/camel/component/dataset/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java b/core/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
rename to core/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java b/core/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
rename to core/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/core/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
rename to core/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/Time.java b/core/camel-core/src/main/java/org/apache/camel/component/mock/Time.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/mock/Time.java
rename to core/camel-core/src/main/java/org/apache/camel/component/mock/Time.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java b/core/camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java
rename to core/camel-core/src/main/java/org/apache/camel/component/mock/TimeClause.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/mock/package.html b/core/camel-core/src/main/java/org/apache/camel/component/mock/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/mock/package.html
rename to core/camel-core/src/main/java/org/apache/camel/component/mock/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/component/package.html b/core/camel-core/src/main/java/org/apache/camel/component/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/package.html
rename to core/camel-core/src/main/java/org/apache/camel/component/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java b/core/camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java
rename to core/camel-core/src/main/java/org/apache/camel/component/test/TestComponent.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java b/core/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
rename to core/camel-core/src/main/java/org/apache/camel/component/test/TestEndpoint.java
diff --git a/camel-core/src/main/java/org/apache/camel/component/test/package.html b/core/camel-core/src/main/java/org/apache/camel/component/test/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/component/test/package.html
rename to core/camel-core/src/main/java/org/apache/camel/component/test/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java b/core/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/AbstractCamelContext.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/AbstractDynamicRegistry.java b/core/camel-core/src/main/java/org/apache/camel/impl/AbstractDynamicRegistry.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/AbstractDynamicRegistry.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/AbstractDynamicRegistry.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/BreakpointSupport.java b/core/camel-core/src/main/java/org/apache/camel/impl/BreakpointSupport.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/BreakpointSupport.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/BreakpointSupport.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java b/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java b/core/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/CompositeRegistry.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/CompoundIterator.java b/core/camel-core/src/main/java/org/apache/camel/impl/CompoundIterator.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/CompoundIterator.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/CompoundIterator.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManager.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManager.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManager.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultAsyncProcessorAwaitManager.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelBeanPostProcessor.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelBeanPostProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultCamelBeanPostProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelBeanPostProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContextNameStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultClaimCheckRepository.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultClaimCheckRepository.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultClaimCheckRepository.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultClaimCheckRepository.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultClassResolver.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerCache.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerCache.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerCache.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerCache.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumerTemplate.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultDataFormatResolver.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultDebugger.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointRegistry.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointRegistry.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointRegistry.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointRegistry.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointUtilizationStatistics.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointUtilizationStatistics.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointUtilizationStatistics.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultEndpointUtilizationStatistics.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinder.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinderResolver.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinderResolver.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinderResolver.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultFactoryFinderResolver.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultHeadersMapFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultHeadersMapFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultHeadersMapFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultHeadersMapFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultInflightRepository.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultInjector.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultInjector.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultInjector.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultInjector.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultInterceptSendToEndpoint.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultInterceptSendToEndpoint.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultInterceptSendToEndpoint.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultInterceptSendToEndpoint.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultLanguageResolver.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementStrategy.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultManagementStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementStrategyFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementStrategyFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultManagementStrategyFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementStrategyFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistoryFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistoryFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistoryFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistoryFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultModelJAXBContextFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultNodeIdFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultProcessorFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultProcessorFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultProcessorFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultProcessorFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerCache.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerCache.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultProducerCache.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerCache.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteContext.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteController.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteController.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultRouteController.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteController.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteError.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteError.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultRouteError.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteError.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultRouteStartupOrder.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultStreamCachingStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultSubUnitOfWork.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultSubUnitOfWork.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultSubUnitOfWork.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultSubUnitOfWork.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultTransformerRegistry.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultTransformerRegistry.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultTransformerRegistry.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultTransformerRegistry.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWorkFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWorkFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWorkFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWorkFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultUuidGenerator.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultUuidGenerator.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultUuidGenerator.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultUuidGenerator.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultValidatorRegistry.java b/core/camel-core/src/main/java/org/apache/camel/impl/DefaultValidatorRegistry.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DefaultValidatorRegistry.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DefaultValidatorRegistry.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DeferProducer.java b/core/camel-core/src/main/java/org/apache/camel/impl/DeferProducer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DeferProducer.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DeferProducer.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DeferServiceStartupListener.java b/core/camel-core/src/main/java/org/apache/camel/impl/DeferServiceStartupListener.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DeferServiceStartupListener.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DeferServiceStartupListener.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DurationRoutePolicy.java b/core/camel-core/src/main/java/org/apache/camel/impl/DurationRoutePolicy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DurationRoutePolicy.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DurationRoutePolicy.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DurationRoutePolicyFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/DurationRoutePolicyFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/DurationRoutePolicyFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/DurationRoutePolicyFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/EndpointKey.java b/core/camel-core/src/main/java/org/apache/camel/impl/EndpointKey.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/EndpointKey.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/EndpointKey.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java b/core/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/EventDrivenConsumerRoute.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/EventNotifierCallback.java b/core/camel-core/src/main/java/org/apache/camel/impl/EventNotifierCallback.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/EventNotifierCallback.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/EventNotifierCallback.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ExplicitCamelContextNameStrategy.java b/core/camel-core/src/main/java/org/apache/camel/impl/ExplicitCamelContextNameStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/ExplicitCamelContextNameStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/ExplicitCamelContextNameStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/FileStateRepository.java b/core/camel-core/src/main/java/org/apache/camel/impl/FileStateRepository.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/FileStateRepository.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/FileStateRepository.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java b/core/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/FileWatcherReloadStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/HashMapHeadersMapFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/HashMapHeadersMapFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/HashMapHeadersMapFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/HashMapHeadersMapFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/HeadersMapFactoryResolver.java b/core/camel-core/src/main/java/org/apache/camel/impl/HeadersMapFactoryResolver.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/HeadersMapFactoryResolver.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/HeadersMapFactoryResolver.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpointProcessor.java b/core/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpointProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpointProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpointProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java b/core/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/JavaUuidGenerator.java b/core/camel-core/src/main/java/org/apache/camel/impl/JavaUuidGenerator.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/JavaUuidGenerator.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/JavaUuidGenerator.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java b/core/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/JndiRegistry.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java b/core/camel-core/src/main/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/LimitedPollingConsumerPollStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java b/core/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/MDCUnitOfWork.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/MemoryStateRepository.java b/core/camel-core/src/main/java/org/apache/camel/impl/MemoryStateRepository.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/MemoryStateRepository.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/MemoryStateRepository.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java b/core/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/PropertyPlaceholderDelegateRegistry.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ProvisionalEndpointRegistry.java b/core/camel-core/src/main/java/org/apache/camel/impl/ProvisionalEndpointRegistry.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/ProvisionalEndpointRegistry.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/ProvisionalEndpointRegistry.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ReloadStrategySupport.java b/core/camel-core/src/main/java/org/apache/camel/impl/ReloadStrategySupport.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/ReloadStrategySupport.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/ReloadStrategySupport.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/RouteIdFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/RouteService.java b/core/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/RouteService.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/RouteService.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/SerializationDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ServicePool.java b/core/camel-core/src/main/java/org/apache/camel/impl/ServicePool.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/ServicePool.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/ServicePool.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java b/core/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/SimpleRegistry.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/StringDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/impl/StringDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/StringDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/StringDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/SubscribeMethodProcessor.java b/core/camel-core/src/main/java/org/apache/camel/impl/SubscribeMethodProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/SubscribeMethodProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/SubscribeMethodProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/SupervisingRouteController.java b/core/camel-core/src/main/java/org/apache/camel/impl/SupervisingRouteController.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/SupervisingRouteController.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/SupervisingRouteController.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/SupervisingRouteControllerFilters.java b/core/camel-core/src/main/java/org/apache/camel/impl/SupervisingRouteControllerFilters.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/SupervisingRouteControllerFilters.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/SupervisingRouteControllerFilters.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/TypedProcessorFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/TypedProcessorFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/TypedProcessorFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/TypedProcessorFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java b/core/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/WebSpherePackageScanClassResolver.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/AbstractServiceRegistry.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/AbstractServiceRegistry.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/AbstractServiceRegistry.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/AbstractServiceRegistry.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilterFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilterFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilterFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilterFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscovery.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscovery.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscovery.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscovery.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscoveryFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscoveryFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscoveryFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/CachingServiceDiscoveryFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilter.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilter.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilter.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilter.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDefinition.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDiscovery.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDiscovery.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDiscovery.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceDiscovery.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceFilter.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceFilter.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceFilter.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceFilter.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceHealth.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceHealth.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceHealth.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceHealth.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancer.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancer.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancer.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancerFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancerFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancerFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceLoadBalancerFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilterFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilterFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilterFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilterFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilter.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilter.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilter.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilter.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilterFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilterFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilterFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/PassThroughServiceFilterFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicy.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicyFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicyFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicyFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrationRoutePolicyFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistryHelper.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistryHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistryHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistryHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrySelectors.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrySelectors.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrySelectors.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/ServiceRegistrySelectors.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscoveryFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscoveryFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscoveryFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscoveryFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/package.html b/core/camel-core/src/main/java/org/apache/camel/impl/cloud/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cloud/package.html
rename to core/camel-core/src/main/java/org/apache/camel/impl/cloud/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java b/core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java b/core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilter.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java b/core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteFilters.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java b/core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java b/core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/package.html b/core/camel-core/src/main/java/org/apache/camel/impl/cluster/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/cluster/package.html
rename to core/camel-core/src/main/java/org/apache/camel/impl/cluster/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/impl/package.html b/core/camel-core/src/main/java/org/apache/camel/impl/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/package.html
rename to core/camel-core/src/main/java/org/apache/camel/impl/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java b/core/camel-core/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java b/core/camel-core/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/transformer/TransformerKey.java b/core/camel-core/src/main/java/org/apache/camel/impl/transformer/TransformerKey.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/transformer/TransformerKey.java
rename to core/camel-core/src/main/java/org/apache/camel/impl/transformer/TransformerKey.java
diff --git a/camel-core/src/main/java/org/apache/camel/impl/transformer/package.html b/core/camel-core/src/main/java/org/apache/camel/impl/transformer/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/impl/transformer/package.html
rename to core/camel-core/src/main/java/org/apache/camel/impl/transformer/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/language/Bean.java b/core/camel-core/src/main/java/org/apache/camel/language/Bean.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/Bean.java
rename to core/camel-core/src/main/java/org/apache/camel/language/Bean.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/Constant.java b/core/camel-core/src/main/java/org/apache/camel/language/Constant.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/Constant.java
rename to core/camel-core/src/main/java/org/apache/camel/language/Constant.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java b/core/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java
rename to core/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java b/core/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java b/core/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java
rename to core/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/Simple.java b/core/camel-core/src/main/java/org/apache/camel/language/Simple.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/Simple.java
rename to core/camel-core/src/main/java/org/apache/camel/language/Simple.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/SpEL.java b/core/camel-core/src/main/java/org/apache/camel/language/SpEL.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/SpEL.java
rename to core/camel-core/src/main/java/org/apache/camel/language/SpEL.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/XPath.java b/core/camel-core/src/main/java/org/apache/camel/language/XPath.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/XPath.java
rename to core/camel-core/src/main/java/org/apache/camel/language/XPath.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java b/core/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java b/core/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
rename to core/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java b/core/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java
rename to core/camel-core/src/main/java/org/apache/camel/language/bean/RuntimeBeanExpressionException.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/package.html b/core/camel-core/src/main/java/org/apache/camel/language/bean/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/bean/package.html
rename to core/camel-core/src/main/java/org/apache/camel/language/bean/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java b/core/camel-core/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
rename to core/camel-core/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/constant/package.html b/core/camel-core/src/main/java/org/apache/camel/language/constant/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/constant/package.html
rename to core/camel-core/src/main/java/org/apache/camel/language/constant/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/language/header/HeaderLanguage.java b/core/camel-core/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
rename to core/camel-core/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/header/package.html b/core/camel-core/src/main/java/org/apache/camel/language/header/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/header/package.html
rename to core/camel-core/src/main/java/org/apache/camel/language/header/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/language/package.html b/core/camel-core/src/main/java/org/apache/camel/language/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/package.html
rename to core/camel-core/src/main/java/org/apache/camel/language/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java b/core/camel-core/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
rename to core/camel-core/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/property/package.html b/core/camel-core/src/main/java/org/apache/camel/language/property/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/property/package.html
rename to core/camel-core/src/main/java/org/apache/camel/language/property/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java b/core/camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java
rename to core/camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/ref/package.html b/core/camel-core/src/main/java/org/apache/camel/language/ref/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/ref/package.html
rename to core/camel-core/src/main/java/org/apache/camel/language/ref/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/FileLanguage.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/FileLanguage.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/FileLanguage.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/FileLanguage.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/Block.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/Block.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/Block.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/Block.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/ast/package.html b/core/camel-core/src/main/java/org/apache/camel/language/simple/ast/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/ast/package.html
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/ast/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/package.html b/core/camel-core/src/main/java/org/apache/camel/language/simple/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/package.html
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/types/TokenType.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/types/TokenType.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/types/TokenType.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/types/TokenType.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java b/core/camel-core/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/simple/types/package.html b/core/camel-core/src/main/java/org/apache/camel/language/simple/types/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/simple/types/package.html
rename to core/camel-core/src/main/java/org/apache/camel/language/simple/types/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java b/core/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
rename to core/camel-core/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguage.java b/core/camel-core/src/main/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguage.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguage.java
rename to core/camel-core/src/main/java/org/apache/camel/language/tokenizer/XMLTokenizeLanguage.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/tokenizer/package.html b/core/camel-core/src/main/java/org/apache/camel/language/tokenizer/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/tokenizer/package.html
rename to core/camel-core/src/main/java/org/apache/camel/language/tokenizer/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java b/core/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java
rename to core/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java
diff --git a/camel-core/src/main/java/org/apache/camel/language/xpath/package.html b/core/camel-core/src/main/java/org/apache/camel/language/xpath/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/language/xpath/package.html
rename to core/camel-core/src/main/java/org/apache/camel/language/xpath/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/main/Main.java b/core/camel-core/src/main/java/org/apache/camel/main/Main.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/main/Main.java
rename to core/camel-core/src/main/java/org/apache/camel/main/Main.java
diff --git a/camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java b/core/camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
rename to core/camel-core/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java b/core/camel-core/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/main/MainLifecycleStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/main/MainListener.java b/core/camel-core/src/main/java/org/apache/camel/main/MainListener.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/main/MainListener.java
rename to core/camel-core/src/main/java/org/apache/camel/main/MainListener.java
diff --git a/camel-core/src/main/java/org/apache/camel/main/MainListenerSupport.java b/core/camel-core/src/main/java/org/apache/camel/main/MainListenerSupport.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/main/MainListenerSupport.java
rename to core/camel-core/src/main/java/org/apache/camel/main/MainListenerSupport.java
diff --git a/camel-core/src/main/java/org/apache/camel/main/MainSupport.java b/core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/main/MainSupport.java
rename to core/camel-core/src/main/java/org/apache/camel/main/MainSupport.java
diff --git a/camel-core/src/main/java/org/apache/camel/main/package.html b/core/camel-core/src/main/java/org/apache/camel/main/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/main/package.html
rename to core/camel-core/src/main/java/org/apache/camel/main/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/Block.java b/core/camel-core/src/main/java/org/apache/camel/model/Block.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/Block.java
rename to core/camel-core/src/main/java/org/apache/camel/model/Block.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ClaimCheckDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ClaimCheckOperation.java b/core/camel-core/src/main/java/org/apache/camel/model/ClaimCheckOperation.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ClaimCheckOperation.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ClaimCheckOperation.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/Constants.java b/core/camel-core/src/main/java/org/apache/camel/model/Constants.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/Constants.java
rename to core/camel-core/src/main/java/org/apache/camel/model/Constants.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ContextScanDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/DelayDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/DynamicRouterDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/EndpointRequiredDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/EnrichDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ExecutorServiceAwareDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java b/core/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java b/core/camel-core/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ExpressionNodeHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ExpressionSubElementDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/GlobalOptionDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/GlobalOptionsDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java b/core/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java
rename to core/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationCommon.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/HystrixDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java b/core/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
rename to core/camel-core/src/main/java/org/apache/camel/model/IdentifiedType.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/InputTypeDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/InputTypeDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/InputTypeDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/InputTypeDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/InterceptSendToEndpointDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/LoadBalancerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/LogDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java b/core/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ModelCamelContext.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ModelChannel.java b/core/camel-core/src/main/java/org/apache/camel/model/ModelChannel.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ModelChannel.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ModelChannel.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java b/core/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/NoOutputDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java b/core/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
rename to core/camel-core/src/main/java/org/apache/camel/model/NoOutputExpressionNode.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/OnCompletionMode.java b/core/camel-core/src/main/java/org/apache/camel/model/OnCompletionMode.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/OnCompletionMode.java
rename to core/camel-core/src/main/java/org/apache/camel/model/OnCompletionMode.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/OnFallbackDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/OnFallbackDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/OptimisticLockRetryPolicyDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/OtherAttributesAware.java b/core/camel-core/src/main/java/org/apache/camel/model/OtherAttributesAware.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/OtherAttributesAware.java
rename to core/camel-core/src/main/java/org/apache/camel/model/OtherAttributesAware.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/OutputTypeDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/OutputTypeDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/OutputTypeDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/OutputTypeDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/PackageScanDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/PolicyDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/PollEnrichDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ProcessDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java b/core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/PropertyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/PropertyDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/PropertyDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/PropertyDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RedeliveryPolicyDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RemoveHeaderDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RemoveHeadersDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RemovePropertiesDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RemovePropertyDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java b/core/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RestContextRefDefinitionHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RollbackDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RouteBuilderDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java b/core/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RouteContainer.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RouteContainer.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java b/core/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java b/core/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RoutesDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SagaCompletionMode.java b/core/camel-core/src/main/java/org/apache/camel/model/SagaCompletionMode.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SagaCompletionMode.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SagaCompletionMode.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SagaDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SagaDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SagaDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SagaDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SagaOptionDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SagaPropagation.java b/core/camel-core/src/main/java/org/apache/camel/model/SagaPropagation.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SagaPropagation.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SagaPropagation.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SamplingDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ScriptDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ScriptDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ScriptDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ScriptDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SetFaultBodyDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/SplitDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ThreadsDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ThrottleDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/TimeUnitAdapter.java b/core/camel-core/src/main/java/org/apache/camel/model/TimeUnitAdapter.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/TimeUnitAdapter.java
rename to core/camel-core/src/main/java/org/apache/camel/model/TimeUnitAdapter.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/TransactedDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/ValidateDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/WireTapDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/BlacklistServiceCallServiceFilterConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/CachingServiceCallServiceDiscoveryConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceDiscoveryConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/ConsulServiceCallServiceDiscoveryConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/CustomServiceCallServiceFilterConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/DefaultServiceCallServiceLoadBalancerConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/DnsServiceCallServiceDiscoveryConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/EtcdServiceCallServiceDiscoveryConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/HealthyServiceCallServiceFilterConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/KubernetesServiceCallServiceDiscoveryConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/PassThroughServiceCallServiceFilterConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/RibbonServiceCallServiceLoadBalancerConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinitionConstants.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceChooserConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceDiscoveryConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceFilterConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/StaticServiceCallServiceDiscoveryConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/ZooKeeperServiceCallServiceDiscoveryConfiguration.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/package-info.java b/core/camel-core/src/main/java/org/apache/camel/model/cloud/package-info.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/cloud/package-info.java
rename to core/camel-core/src/main/java/org/apache/camel/model/cloud/package-info.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java b/core/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
rename to core/camel-core/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java b/core/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
rename to core/camel-core/src/main/java/org/apache/camel/model/config/ResequencerConfig.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java b/core/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
rename to core/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/config/package-info.java b/core/camel-core/src/main/java/org/apache/camel/model/config/package-info.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/config/package-info.java
rename to core/camel-core/src/main/java/org/apache/camel/model/config/package-info.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/ASN1DataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/AvroDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/BarcodeDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/Base64DataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/BeanioDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/BoonDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/CryptoDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/CustomDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirJsonDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/FhirXmlDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/GzipDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/IcalDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/JacksonXMLDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonLibrary.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/LZFDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/MimeMultipartDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/SoapJaxbDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/SyslogDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/TarFileDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/ThriftDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityCsvDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityFixedWidthDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityHeader.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/UniVocityTsvDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLLibrary.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterType.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipFileDataFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/package-info.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/package-info.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/dataformat/package-info.java
rename to core/camel-core/src/main/java/org/apache/camel/model/dataformat/package-info.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/ExchangePropertyExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/RefExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/SpELExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java b/core/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/package-info.java b/core/camel-core/src/main/java/org/apache/camel/model/language/package-info.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/language/package-info.java
rename to core/camel-core/src/main/java/org/apache/camel/model/language/package-info.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/package-info.java b/core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/package-info.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/loadbalancer/package-info.java
rename to core/camel-core/src/main/java/org/apache/camel/model/loadbalancer/package-info.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/package-info.java b/core/camel-core/src/main/java/org/apache/camel/model/package-info.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/package-info.java
rename to core/camel-core/src/main/java/org/apache/camel/model/package-info.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/CollectionFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/CollectionFormat.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/CollectionFormat.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/CollectionFormat.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/PatchVerbDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestConstants.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestConstants.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestConstants.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestConstants.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestContainer.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestContainer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestContainer.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestContainer.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationParamDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseHeaderDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestOperationResponseMsgDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestParamType.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestParamType.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestParamType.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestParamType.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityApiKey.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityBasicAuth.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestSecurityOAuth2.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/SecurityDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/package-info.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/package-info.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/rest/package-info.java
rename to core/camel-core/src/main/java/org/apache/camel/model/rest/package-info.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/package-info.java b/core/camel-core/src/main/java/org/apache/camel/model/transformer/package-info.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/transformer/package-info.java
rename to core/camel-core/src/main/java/org/apache/camel/model/transformer/package-info.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java
rename to core/camel-core/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java
diff --git a/camel-core/src/main/java/org/apache/camel/model/validator/package-info.java b/core/camel-core/src/main/java/org/apache/camel/model/validator/package-info.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/model/validator/package-info.java
rename to core/camel-core/src/main/java/org/apache/camel/model/validator/package-info.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessorAdvice.java b/core/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessorAdvice.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessorAdvice.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessorAdvice.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/CatchProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ClaimCheckAggregationStrategy.java b/core/camel-core/src/main/java/org/apache/camel/processor/ClaimCheckAggregationStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ClaimCheckAggregationStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ClaimCheckAggregationStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ClaimCheckProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ContractAdvice.java b/core/camel-core/src/main/java/org/apache/camel/processor/ContractAdvice.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ContractAdvice.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ContractAdvice.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java b/core/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java b/core/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/DefaultErrorHandler.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DeferServiceFactory.java b/core/camel-core/src/main/java/org/apache/camel/processor/DeferServiceFactory.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/DeferServiceFactory.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/DeferServiceFactory.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java b/core/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/DelayProcessorSupport.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Delayer.java b/core/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/Delayer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java b/core/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/DynamicRouter.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Enricher.java b/core/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/Enricher.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ErrorHandler.java b/core/camel-core/src/main/java/org/apache/camel/processor/ErrorHandler.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ErrorHandler.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ErrorHandler.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java b/core/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ExchangePatternProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java b/core/camel-core/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/FatalFallbackErrorHandler.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/FinallyProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/FinallyProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/FinallyProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/FinallyProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/InterceptEndpointProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/InterceptEndpointProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/InterceptEndpointProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/InterceptEndpointProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java b/core/camel-core/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/InterceptorToAsyncProcessorBridge.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java b/core/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/PipelineHelper.java b/core/camel-core/src/main/java/org/apache/camel/processor/PipelineHelper.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/PipelineHelper.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/PipelineHelper.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java b/core/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ProcessorExchangePair.java b/core/camel-core/src/main/java/org/apache/camel/processor/ProcessorExchangePair.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ProcessorExchangePair.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ProcessorExchangePair.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java b/core/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RecipientListProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java b/core/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java b/core/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/RemoveHeaderProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/RemoveHeadersProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RemovePropertiesProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/RemovePropertiesProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/RemovePropertiesProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/RemovePropertiesProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RemovePropertyProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/RemovePropertyProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/RemovePropertyProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/RemovePropertyProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java b/core/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/Resequencer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java b/core/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RollbackProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/RollbackProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/RollbackProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/RollbackProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java b/core/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java b/core/camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/SamplingThrottler.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ScriptProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/ScriptProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ScriptProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ScriptProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java b/core/camel-core/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/SharedCamelInternalProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/SortProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/SortProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/SortProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/SortProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Splitter.java b/core/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/Splitter.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/StopProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/StopProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/StopProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/StopProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java b/core/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ThreadsProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/Throttler.java b/core/camel-core/src/main/java/org/apache/camel/processor/Throttler.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/Throttler.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/Throttler.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ThrottlerRejectedExecutionException.java b/core/camel-core/src/main/java/org/apache/camel/processor/ThrottlerRejectedExecutionException.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ThrottlerRejectedExecutionException.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ThrottlerRejectedExecutionException.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/ThrowExceptionProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/TryProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java b/core/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProducer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/WrapProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/WrapProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/WrapProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/WrapProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AbstractListAggregationStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateController.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateController.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateController.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateController.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessorStatistics.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessorStatistics.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessorStatistics.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessorStatistics.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanAdapter.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyBeanInfo.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationStrategyMethodInfo.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/ClosedCorrelationKeyException.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/ClosedCorrelationKeyException.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/ClosedCorrelationKeyException.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/ClosedCorrelationKeyException.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregateController.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregateController.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregateController.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregateController.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedBodyAggregationStrategy.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedBodyAggregationStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedBodyAggregationStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedBodyAggregationStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedExchangeAggregationStrategy.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedExchangeAggregationStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedExchangeAggregationStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedExchangeAggregationStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedMessageAggregationStrategy.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedMessageAggregationStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedMessageAggregationStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/GroupedMessageAggregationStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/OptimisticLockRetryPolicy.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/OptimisticLockRetryPolicy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/OptimisticLockRetryPolicy.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/OptimisticLockRetryPolicy.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/ShareUnitOfWorkAggregationStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseLatestAggregationStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseOriginalAggregationStrategy.java b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseOriginalAggregationStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/UseOriginalAggregationStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/UseOriginalAggregationStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/package.html b/core/camel-core/src/main/java/org/apache/camel/processor/aggregate/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/aggregate/package.html
rename to core/camel-core/src/main/java/org/apache/camel/processor/aggregate/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java b/core/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java b/core/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyKey.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyStrategy.java b/core/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyStrategy.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyStrategy.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/ExceptionPolicyStrategy.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/package.html b/core/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/package.html
rename to core/camel-core/src/main/java/org/apache/camel/processor/exceptionpolicy/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java b/core/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java b/core/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/idempotent/NoMessageIdException.java b/core/camel-core/src/main/java/org/apache/camel/processor/idempotent/NoMessageIdException.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/idempotent/NoMessageIdException.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/idempotent/NoMessageIdException.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/idempotent/package.html b/core/camel-core/src/main/java/org/apache/camel/processor/idempotent/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/idempotent/package.html
rename to core/camel-core/src/main/java/org/apache/camel/processor/idempotent/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java b/core/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogDebugger.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java b/core/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/interceptor/BacklogTracer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java b/core/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/interceptor/Debug.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java b/core/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java b/core/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java b/core/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java b/core/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFaultInterceptor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/package.html b/core/camel-core/src/main/java/org/apache/camel/processor/interceptor/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/interceptor/package.html
rename to core/camel-core/src/main/java/org/apache/camel/processor/interceptor/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/DistributionRatio.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/DistributionRatio.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/DistributionRatio.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/DistributionRatio.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/ExceptionFailureStatistics.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/ExceptionFailureStatistics.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/ExceptionFailureStatistics.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/ExceptionFailureStatistics.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/FailOverLoadBalancer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancer.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerConsumer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/LoadBalancerSupport.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/QueueLoadBalancer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RandomLoadBalancer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/RoundRobinLoadBalancer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/TopicLoadBalancer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRandomLoadBalancer.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRandomLoadBalancer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRandomLoadBalancer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRandomLoadBalancer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRoundRobinLoadBalancer.java b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRoundRobinLoadBalancer.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRoundRobinLoadBalancer.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedRoundRobinLoadBalancer.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/package.html b/core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/loadbalancer/package.html
rename to core/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/processor/package.html b/core/camel-core/src/main/java/org/apache/camel/processor/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/package.html
rename to core/camel-core/src/main/java/org/apache/camel/processor/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/DefaultExchangeComparator.java b/core/camel-core/src/main/java/org/apache/camel/processor/resequencer/DefaultExchangeComparator.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/resequencer/DefaultExchangeComparator.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/resequencer/DefaultExchangeComparator.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/Element.java b/core/camel-core/src/main/java/org/apache/camel/processor/resequencer/Element.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/resequencer/Element.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/resequencer/Element.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ElementComparator.java b/core/camel-core/src/main/java/org/apache/camel/processor/resequencer/ElementComparator.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/resequencer/ElementComparator.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/resequencer/ElementComparator.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ExpressionResultComparator.java b/core/camel-core/src/main/java/org/apache/camel/processor/resequencer/ExpressionResultComparator.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/resequencer/ExpressionResultComparator.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/resequencer/ExpressionResultComparator.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/MessageRejectedException.java b/core/camel-core/src/main/java/org/apache/camel/processor/resequencer/MessageRejectedException.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/resequencer/MessageRejectedException.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/resequencer/MessageRejectedException.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java b/core/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/Sequence.java b/core/camel-core/src/main/java/org/apache/camel/processor/resequencer/Sequence.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/resequencer/Sequence.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/resequencer/Sequence.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceElementComparator.java b/core/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceElementComparator.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceElementComparator.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceElementComparator.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceSender.java b/core/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceSender.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceSender.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/resequencer/SequenceSender.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/Timeout.java b/core/camel-core/src/main/java/org/apache/camel/processor/resequencer/Timeout.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/resequencer/Timeout.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/resequencer/Timeout.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/TimeoutHandler.java b/core/camel-core/src/main/java/org/apache/camel/processor/resequencer/TimeoutHandler.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/resequencer/TimeoutHandler.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/resequencer/TimeoutHandler.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/resequencer/package.html b/core/camel-core/src/main/java/org/apache/camel/processor/resequencer/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/resequencer/package.html
rename to core/camel-core/src/main/java/org/apache/camel/processor/resequencer/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/processor/saga/MandatorySagaProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/saga/MandatorySagaProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/saga/MandatorySagaProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/saga/MandatorySagaProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/saga/NeverSagaProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/saga/NeverSagaProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/saga/NeverSagaProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/saga/NeverSagaProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/saga/NotSupportedSagaProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/saga/NotSupportedSagaProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/saga/NotSupportedSagaProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/saga/NotSupportedSagaProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/saga/RequiredSagaProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/saga/RequiredSagaProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/saga/RequiredSagaProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/saga/RequiredSagaProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/saga/RequiresNewSagaProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/saga/RequiresNewSagaProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/saga/RequiresNewSagaProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/saga/RequiresNewSagaProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/saga/SagaProcessorBuilder.java b/core/camel-core/src/main/java/org/apache/camel/processor/saga/SagaProcessorBuilder.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/saga/SagaProcessorBuilder.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/saga/SagaProcessorBuilder.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/saga/SupportsSagaProcessor.java b/core/camel-core/src/main/java/org/apache/camel/processor/saga/SupportsSagaProcessor.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/saga/SupportsSagaProcessor.java
rename to core/camel-core/src/main/java/org/apache/camel/processor/saga/SupportsSagaProcessor.java
diff --git a/camel-core/src/main/java/org/apache/camel/processor/saga/package.html b/core/camel-core/src/main/java/org/apache/camel/processor/saga/package.html
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/processor/saga/package.html
rename to core/camel-core/src/main/java/org/apache/camel/processor/saga/package.html
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/AggregateReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/AggregateReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/AggregateReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/AggregateReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/BeanReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/BeanReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/BeanReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/BeanReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/CatchReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/CatchReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/CatchReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/CatchReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/ChoiceReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/ChoiceReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/ClaimCheckReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/ConvertBodyReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/DelayReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/DelayReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/DelayReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/DelayReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/DynamicRouterReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/EnrichReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/EnrichReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/EnrichReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/EnrichReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/ErrorHandlerReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/ErrorHandlerReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/ErrorHandlerReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/ErrorHandlerReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/ExpressionReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/ExpressionReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/ExpressionReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/ExpressionReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/FilterReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/FilterReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/FilterReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/FilterReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/FinallyReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/FinallyReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/FinallyReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/FinallyReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/HystrixReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/HystrixReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/HystrixReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/HystrixReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/IdempotentConsumerReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/InterceptFromReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/InterceptReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/InterceptReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/InterceptReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/InterceptReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/InterceptSendToEndpointReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/LoadBalanceReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/LogReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/LogReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/LogReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/LogReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/LoopReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/LoopReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/LoopReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/LoopReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/MarshalReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/MarshalReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/MarshalReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/MarshalReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/MulticastReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/MulticastReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/MulticastReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/MulticastReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/OnCompletionReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/OnExceptionReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/OnFallbackReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/OtherwiseReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/PipelineReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/PipelineReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/PipelineReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/PipelineReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/PolicyReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/PolicyReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/PolicyReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/PolicyReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/PollEnrichReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/ProcessReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/ProcessReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/ProcessReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/ProcessReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/ProcessorReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/RecipientListReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/RecipientListReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/RecipientListReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/RecipientListReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/RemoveHeaderReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/RemoveHeadersReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java
similarity index 100%
rename from camel-core/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java
rename to core/camel-core/src/main/java/org/apache/camel/reifier/RemovePropertiesReifier.java
diff --git a/camel-core/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/RemovePropertyReifier.java
... 13637 lines suppressed ...