diff --git a/core/src/main/java/io/cloudevents/core/message/impl/GenericStructuredMessage.java b/core/src/main/java/io/cloudevents/core/message/impl/GenericStructuredMessage.java
index 745c4bb18..63224d6f0 100644
--- a/core/src/main/java/io/cloudevents/core/message/impl/GenericStructuredMessage.java
+++ b/core/src/main/java/io/cloudevents/core/message/impl/GenericStructuredMessage.java
@@ -19,8 +19,8 @@
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.core.format.EventFormat;
-import io.cloudevents.core.format.EventFormatProvider;
 import io.cloudevents.core.message.StructuredMessageVisitor;
+import io.cloudevents.core.provider.EventFormatProvider;
 import io.cloudevents.lang.Nullable;
 import io.cloudevents.visitor.CloudEventVisitException;
 
diff --git a/core/src/main/java/io/cloudevents/core/message/impl/MessageUtils.java b/core/src/main/java/io/cloudevents/core/message/impl/MessageUtils.java
index 9a2a076d6..e5da6cdca 100644
--- a/core/src/main/java/io/cloudevents/core/message/impl/MessageUtils.java
+++ b/core/src/main/java/io/cloudevents/core/message/impl/MessageUtils.java
@@ -19,9 +19,9 @@
 
 import io.cloudevents.SpecVersion;
 import io.cloudevents.core.format.EventFormat;
-import io.cloudevents.core.format.EventFormatProvider;
 import io.cloudevents.core.message.Encoding;
 import io.cloudevents.core.message.Message;
+import io.cloudevents.core.provider.EventFormatProvider;
 
 import java.util.Map;
 import java.util.function.Function;
diff --git a/core/src/main/java/io/cloudevents/core/format/EventFormatProvider.java b/core/src/main/java/io/cloudevents/core/provider/EventFormatProvider.java
similarity index 95%
rename from core/src/main/java/io/cloudevents/core/format/EventFormatProvider.java
rename to core/src/main/java/io/cloudevents/core/provider/EventFormatProvider.java
index 4e2589eef..446100f42 100644
--- a/core/src/main/java/io/cloudevents/core/format/EventFormatProvider.java
+++ b/core/src/main/java/io/cloudevents/core/provider/EventFormatProvider.java
@@ -15,7 +15,9 @@
  *
  */
 
-package io.cloudevents.core.format;
+package io.cloudevents.core.provider;
+
+import io.cloudevents.core.format.EventFormat;
 
 import java.util.HashMap;
 import java.util.ServiceLoader;
diff --git a/core/src/main/java/io/cloudevents/core/extensions/ExtensionsParser.java b/core/src/main/java/io/cloudevents/core/provider/ExtensionProvider.java
similarity index 80%
rename from core/src/main/java/io/cloudevents/core/extensions/ExtensionsParser.java
rename to core/src/main/java/io/cloudevents/core/provider/ExtensionProvider.java
index 6bf45da15..ec7e93881 100644
--- a/core/src/main/java/io/cloudevents/core/extensions/ExtensionsParser.java
+++ b/core/src/main/java/io/cloudevents/core/provider/ExtensionProvider.java
@@ -15,29 +15,29 @@
  *
  */
 
-package io.cloudevents.core.extensions;
+package io.cloudevents.core.provider;
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.Extension;
+import io.cloudevents.core.extensions.DistributedTracingExtension;
 
 import java.util.HashMap;
 import java.util.function.Supplier;
 
-public final class ExtensionsParser {
+public final class ExtensionProvider {
 
     private static class SingletonContainer {
-        private final static ExtensionsParser INSTANCE = new ExtensionsParser();
+        private final static ExtensionProvider INSTANCE = new ExtensionProvider();
     }
 
-    public static ExtensionsParser getInstance() {
+    public static ExtensionProvider getInstance() {
         return SingletonContainer.INSTANCE;
     }
 
-    private HashMap<Class<?>, Supplier<Extension>> extensionFactories;
-
+    private final HashMap<Class<?>, Supplier<Extension>> extensionFactories;
 
     // TODO SPI in future?
-    private ExtensionsParser() {
+    private ExtensionProvider() {
         this.extensionFactories = new HashMap<>();
         registerExtension(DistributedTracingExtension.class, DistributedTracingExtension::new);
     }
diff --git a/core/src/test/java/io/cloudevents/core/extensions/DistributedTracingExtensionTest.java b/core/src/test/java/io/cloudevents/core/extensions/DistributedTracingExtensionTest.java
index 7e6335a5e..91b55dc73 100644
--- a/core/src/test/java/io/cloudevents/core/extensions/DistributedTracingExtensionTest.java
+++ b/core/src/test/java/io/cloudevents/core/extensions/DistributedTracingExtensionTest.java
@@ -18,6 +18,7 @@
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.core.builder.CloudEventBuilder;
+import io.cloudevents.core.provider.ExtensionProvider;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -48,7 +49,7 @@ public void parseExtension() {
             .withExtension(DistributedTracingExtension.TRACESTATE, "state")
             .build();
 
-        DistributedTracingExtension tracing = ExtensionsParser
+        DistributedTracingExtension tracing = ExtensionProvider
             .getInstance()
             .parseExtension(DistributedTracingExtension.class, event);
 
diff --git a/core/src/test/java/io/cloudevents/core/format/EventFormatProviderTest.java b/core/src/test/java/io/cloudevents/core/provider/EventFormatProviderTest.java
similarity index 97%
rename from core/src/test/java/io/cloudevents/core/format/EventFormatProviderTest.java
rename to core/src/test/java/io/cloudevents/core/provider/EventFormatProviderTest.java
index 01db7283a..8e9027623 100644
--- a/core/src/test/java/io/cloudevents/core/format/EventFormatProviderTest.java
+++ b/core/src/test/java/io/cloudevents/core/provider/EventFormatProviderTest.java
@@ -15,7 +15,7 @@
  *
  */
 
-package io.cloudevents.core.format;
+package io.cloudevents.core.provider;
 
 import io.cloudevents.core.mock.CSVFormat;
 import org.junit.jupiter.api.Test;
diff --git a/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonFormatTest.java b/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonFormatTest.java
index 3250b46eb..8c96aa2b9 100644
--- a/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonFormatTest.java
+++ b/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonFormatTest.java
@@ -20,7 +20,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.cloudevents.CloudEvent;
-import io.cloudevents.core.format.EventFormatProvider;
+import io.cloudevents.core.provider.EventFormatProvider;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
diff --git a/http/restful-ws-integration-tests/restful-ws-jersey/src/test/java/io/cloudevents/http/restful/ws/jersey/TestJersey.java b/http/restful-ws-integration-tests/restful-ws-jersey/src/test/java/io/cloudevents/http/restful/ws/jersey/TestJersey.java
index d0a1a129b..6c17e0505 100644
--- a/http/restful-ws-integration-tests/restful-ws-jersey/src/test/java/io/cloudevents/http/restful/ws/jersey/TestJersey.java
+++ b/http/restful-ws-integration-tests/restful-ws-jersey/src/test/java/io/cloudevents/http/restful/ws/jersey/TestJersey.java
@@ -18,8 +18,8 @@
 package io.cloudevents.http.restful.ws.jersey;
 
 import com.github.hanleyt.JerseyExtension;
-import io.cloudevents.core.format.EventFormatProvider;
 import io.cloudevents.core.mock.CSVFormat;
+import io.cloudevents.core.provider.EventFormatProvider;
 import io.cloudevents.http.restful.ws.BaseTest;
 import io.cloudevents.http.restful.ws.CloudEventsProvider;
 import io.cloudevents.http.restful.ws.TestResource;
diff --git a/http/restful-ws-integration-tests/restful-ws-resteasy/src/test/java/io/cloudevents/http/restful/ws/resteasy/TestResteasy.java b/http/restful-ws-integration-tests/restful-ws-resteasy/src/test/java/io/cloudevents/http/restful/ws/resteasy/TestResteasy.java
index 416e02221..cba075146 100644
--- a/http/restful-ws-integration-tests/restful-ws-resteasy/src/test/java/io/cloudevents/http/restful/ws/resteasy/TestResteasy.java
+++ b/http/restful-ws-integration-tests/restful-ws-resteasy/src/test/java/io/cloudevents/http/restful/ws/resteasy/TestResteasy.java
@@ -18,8 +18,8 @@
 
 package io.cloudevents.http.restful.ws.resteasy;
 
-import io.cloudevents.core.format.EventFormatProvider;
 import io.cloudevents.core.mock.CSVFormat;
+import io.cloudevents.core.provider.EventFormatProvider;
 import io.cloudevents.http.restful.ws.BaseTest;
 import io.cloudevents.http.restful.ws.CloudEventsProvider;
 import io.cloudevents.http.restful.ws.TestResource;
diff --git a/http/restful-ws-integration-tests/restful-ws-spring/src/test/java/io/cloudevents/http/restful/ws/spring/TestSpringBootWithJersey.java b/http/restful-ws-integration-tests/restful-ws-spring/src/test/java/io/cloudevents/http/restful/ws/spring/TestSpringBootWithJersey.java
index fba0e0b1d..3f7519ce5 100644
--- a/http/restful-ws-integration-tests/restful-ws-spring/src/test/java/io/cloudevents/http/restful/ws/spring/TestSpringBootWithJersey.java
+++ b/http/restful-ws-integration-tests/restful-ws-spring/src/test/java/io/cloudevents/http/restful/ws/spring/TestSpringBootWithJersey.java
@@ -17,8 +17,8 @@
 
 package io.cloudevents.http.restful.ws.spring;
 
-import io.cloudevents.core.format.EventFormatProvider;
 import io.cloudevents.core.mock.CSVFormat;
+import io.cloudevents.core.provider.EventFormatProvider;
 import io.cloudevents.http.restful.ws.BaseTest;
 import io.cloudevents.http.restful.ws.CloudEventsProvider;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/http/restful-ws/src/main/java/io/cloudevents/http/restful/ws/CloudEventsProvider.java b/http/restful-ws/src/main/java/io/cloudevents/http/restful/ws/CloudEventsProvider.java
index 212a626dc..8ca64ecb4 100644
--- a/http/restful-ws/src/main/java/io/cloudevents/http/restful/ws/CloudEventsProvider.java
+++ b/http/restful-ws/src/main/java/io/cloudevents/http/restful/ws/CloudEventsProvider.java
@@ -19,9 +19,9 @@
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.core.format.EventFormat;
-import io.cloudevents.core.format.EventFormatProvider;
 import io.cloudevents.core.message.Message;
 import io.cloudevents.core.message.MessageVisitor;
+import io.cloudevents.core.provider.EventFormatProvider;
 import io.cloudevents.http.restful.ws.impl.RestfulWSClientMessageVisitor;
 import io.cloudevents.http.restful.ws.impl.RestfulWSMessageFactory;
 import io.cloudevents.http.restful.ws.impl.RestfulWSMessageVisitor;
diff --git a/kafka/src/main/java/io/cloudevents/kafka/CloudEventSerializer.java b/kafka/src/main/java/io/cloudevents/kafka/CloudEventSerializer.java
index a18b06fa2..f34c58091 100644
--- a/kafka/src/main/java/io/cloudevents/kafka/CloudEventSerializer.java
+++ b/kafka/src/main/java/io/cloudevents/kafka/CloudEventSerializer.java
@@ -19,9 +19,9 @@
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.core.format.EventFormat;
-import io.cloudevents.core.format.EventFormatProvider;
 import io.cloudevents.core.message.Encoding;
 import io.cloudevents.core.message.Message;
+import io.cloudevents.core.provider.EventFormatProvider;
 import io.cloudevents.kafka.impl.KafkaSerializerMessageVisitorImpl;
 import org.apache.kafka.common.header.Headers;
 import org.apache.kafka.common.serialization.Serializer;
diff --git a/kafka/src/test/java/io/cloudevents/kafka/CloudEventSerializerTest.java b/kafka/src/test/java/io/cloudevents/kafka/CloudEventSerializerTest.java
index 79ce8e711..96a5b0077 100644
--- a/kafka/src/test/java/io/cloudevents/kafka/CloudEventSerializerTest.java
+++ b/kafka/src/test/java/io/cloudevents/kafka/CloudEventSerializerTest.java
@@ -18,10 +18,10 @@
 package io.cloudevents.kafka;
 
 import io.cloudevents.CloudEvent;
-import io.cloudevents.core.format.EventFormatProvider;
 import io.cloudevents.core.message.Encoding;
 import io.cloudevents.core.message.Message;
 import io.cloudevents.core.mock.CSVFormat;
+import io.cloudevents.core.provider.EventFormatProvider;
 import io.cloudevents.core.test.Data;
 import org.apache.kafka.common.header.Headers;
 import org.apache.kafka.common.header.internals.RecordHeaders;