diff --git a/cbor/src/main/java/tools/jackson/jaxrs/cbor/CBORMapperConfigurator.java b/cbor/src/main/java/tools/jackson/jaxrs/cbor/CBORMapperConfigurator.java
index 52b9cd5c..8bbe4826 100644
--- a/cbor/src/main/java/tools/jackson/jaxrs/cbor/CBORMapperConfigurator.java
+++ b/cbor/src/main/java/tools/jackson/jaxrs/cbor/CBORMapperConfigurator.java
@@ -4,7 +4,7 @@
 import tools.jackson.databind.cfg.MapperBuilder;
 
 import tools.jackson.dataformat.cbor.CBORFactory;
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
+import tools.jackson.dataformat.cbor.CBORMapper;
 import tools.jackson.jaxrs.cfg.MapperConfiguratorBase;
 
 /**
diff --git a/cbor/src/main/java/tools/jackson/jaxrs/cbor/JacksonCBORProvider.java b/cbor/src/main/java/tools/jackson/jaxrs/cbor/JacksonCBORProvider.java
index fc7ac0ff..b7f6293d 100644
--- a/cbor/src/main/java/tools/jackson/jaxrs/cbor/JacksonCBORProvider.java
+++ b/cbor/src/main/java/tools/jackson/jaxrs/cbor/JacksonCBORProvider.java
@@ -10,7 +10,8 @@
 
 import tools.jackson.databind.*;
 
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
+import tools.jackson.dataformat.cbor.CBORMapper;
+
 import tools.jackson.jaxrs.base.ProviderBase;
 import tools.jackson.jaxrs.cbor.PackageVersion;
 
diff --git a/cbor/src/main/java/tools/jackson/jaxrs/cbor/JacksonJaxbCBORProvider.java b/cbor/src/main/java/tools/jackson/jaxrs/cbor/JacksonJaxbCBORProvider.java
index 182704d0..4eb63d9e 100644
--- a/cbor/src/main/java/tools/jackson/jaxrs/cbor/JacksonJaxbCBORProvider.java
+++ b/cbor/src/main/java/tools/jackson/jaxrs/cbor/JacksonJaxbCBORProvider.java
@@ -7,7 +7,7 @@
 
 import tools.jackson.databind.AnnotationIntrospector;
 
-import tools.jackson.dataformat.cbor.databind.CBORMapper;
+import tools.jackson.dataformat.cbor.CBORMapper;
 
 import tools.jackson.module.jaxb.JaxbAnnotationIntrospector;
 
diff --git a/json/src/test/java/tools/jackson/jaxrs/json/TestSerializeWithoutAutoflush.java b/json/src/test/java/tools/jackson/jaxrs/json/TestSerializeWithoutAutoflush.java
index b250e50c..e1c39bdd 100644
--- a/json/src/test/java/tools/jackson/jaxrs/json/TestSerializeWithoutAutoflush.java
+++ b/json/src/test/java/tools/jackson/jaxrs/json/TestSerializeWithoutAutoflush.java
@@ -13,7 +13,6 @@
 import tools.jackson.databind.DefaultTyping;
 import tools.jackson.databind.SerializationFeature;
 import tools.jackson.databind.json.JsonMapper;
-import tools.jackson.jaxrs.json.JacksonJsonProvider;
 import tools.jackson.jaxrs.json.testutil.NoCheckSubTypeValidator;
 
 /**
diff --git a/smile/src/main/java/tools/jackson/jaxrs/smile/JacksonJaxbSmileProvider.java b/smile/src/main/java/tools/jackson/jaxrs/smile/JacksonJaxbSmileProvider.java
index 822e7e45..170d4fbc 100644
--- a/smile/src/main/java/tools/jackson/jaxrs/smile/JacksonJaxbSmileProvider.java
+++ b/smile/src/main/java/tools/jackson/jaxrs/smile/JacksonJaxbSmileProvider.java
@@ -6,7 +6,9 @@
 import javax.ws.rs.ext.Provider;
 
 import tools.jackson.databind.AnnotationIntrospector;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+
+import tools.jackson.dataformat.smile.SmileMapper;
+
 import tools.jackson.module.jaxb.JaxbAnnotationIntrospector;
 
 /**
diff --git a/smile/src/main/java/tools/jackson/jaxrs/smile/JacksonSmileProvider.java b/smile/src/main/java/tools/jackson/jaxrs/smile/JacksonSmileProvider.java
index 6007ce9c..8d0b6861 100644
--- a/smile/src/main/java/tools/jackson/jaxrs/smile/JacksonSmileProvider.java
+++ b/smile/src/main/java/tools/jackson/jaxrs/smile/JacksonSmileProvider.java
@@ -10,7 +10,8 @@
 
 import tools.jackson.databind.*;
 
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
+
 import tools.jackson.jaxrs.base.ProviderBase;
 import tools.jackson.jaxrs.smile.PackageVersion;
 
diff --git a/smile/src/main/java/tools/jackson/jaxrs/smile/SmileMapperConfigurator.java b/smile/src/main/java/tools/jackson/jaxrs/smile/SmileMapperConfigurator.java
index 38ef1d62..ed91b767 100644
--- a/smile/src/main/java/tools/jackson/jaxrs/smile/SmileMapperConfigurator.java
+++ b/smile/src/main/java/tools/jackson/jaxrs/smile/SmileMapperConfigurator.java
@@ -4,7 +4,8 @@
 import tools.jackson.databind.cfg.MapperBuilder;
 
 import tools.jackson.dataformat.smile.SmileFactory;
-import tools.jackson.dataformat.smile.databind.SmileMapper;
+import tools.jackson.dataformat.smile.SmileMapper;
+
 import tools.jackson.jaxrs.cfg.MapperConfiguratorBase;
 
 /**