diff --git a/application/src/main/java/io/vertx/launcher/application/VertxApplication.java b/application/src/main/java/io/vertx/launcher/application/VertxApplication.java
index c36d93c..a2256ff 100644
--- a/application/src/main/java/io/vertx/launcher/application/VertxApplication.java
+++ b/application/src/main/java/io/vertx/launcher/application/VertxApplication.java
@@ -11,8 +11,8 @@
 
 package io.vertx.launcher.application;
 
-import io.vertx.core.impl.logging.Logger;
-import io.vertx.core.impl.logging.LoggerFactory;
+import io.vertx.core.internal.logging.Logger;
+import io.vertx.core.internal.logging.LoggerFactory;
 import io.vertx.launcher.application.impl.CommandException;
 import io.vertx.launcher.application.impl.VertxApplicationCommand;
 import picocli.CommandLine;
diff --git a/application/src/main/java/io/vertx/launcher/application/impl/Utils.java b/application/src/main/java/io/vertx/launcher/application/impl/Utils.java
index 3ebfa92..d83511e 100644
--- a/application/src/main/java/io/vertx/launcher/application/impl/Utils.java
+++ b/application/src/main/java/io/vertx/launcher/application/impl/Utils.java
@@ -13,7 +13,7 @@
 
 import io.vertx.core.VertxException;
 import io.vertx.core.buffer.Buffer;
-import io.vertx.core.impl.logging.Logger;
+import io.vertx.core.internal.logging.Logger;
 import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.JsonObject;
 
diff --git a/application/src/main/java/io/vertx/launcher/application/impl/VertxApplicationCommand.java b/application/src/main/java/io/vertx/launcher/application/impl/VertxApplicationCommand.java
index fca2f50..ee25578 100644
--- a/application/src/main/java/io/vertx/launcher/application/impl/VertxApplicationCommand.java
+++ b/application/src/main/java/io/vertx/launcher/application/impl/VertxApplicationCommand.java
@@ -13,8 +13,8 @@
 
 import io.vertx.core.*;
 import io.vertx.core.eventbus.EventBusOptions;
-import io.vertx.core.impl.VertxInternal;
-import io.vertx.core.impl.logging.Logger;
+import io.vertx.core.internal.VertxInternal;
+import io.vertx.core.internal.logging.Logger;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.metrics.MetricsOptions;
 import io.vertx.core.spi.VertxMetricsFactory;
diff --git a/application/src/test/java/io/vertx/launcher/application/VertxApplicationExtensibilityTest.java b/application/src/test/java/io/vertx/launcher/application/VertxApplicationExtensibilityTest.java
index f349a37..1bc64e8 100644
--- a/application/src/test/java/io/vertx/launcher/application/VertxApplicationExtensibilityTest.java
+++ b/application/src/test/java/io/vertx/launcher/application/VertxApplicationExtensibilityTest.java
@@ -14,7 +14,7 @@
 import io.vertx.core.Verticle;
 import io.vertx.core.VertxBuilder;
 import io.vertx.core.VertxOptions;
-import io.vertx.core.impl.VertxInternal;
+import io.vertx.core.internal.VertxInternal;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.metrics.impl.DummyVertxMetrics;
 import io.vertx.test.fakecluster.FakeClusterManager;
diff --git a/application/src/test/java/io/vertx/launcher/application/VertxApplicationTest.java b/application/src/test/java/io/vertx/launcher/application/VertxApplicationTest.java
index c1db5f5..802bee2 100644
--- a/application/src/test/java/io/vertx/launcher/application/VertxApplicationTest.java
+++ b/application/src/test/java/io/vertx/launcher/application/VertxApplicationTest.java
@@ -14,7 +14,7 @@
 import io.vertx.core.CustomMetricsOptions;
 import io.vertx.core.Vertx;
 import io.vertx.core.VertxOptions;
-import io.vertx.core.impl.VertxInternal;
+import io.vertx.core.internal.VertxInternal;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.metrics.MetricsOptions;
 import io.vertx.core.spi.VertxServiceProvider;
diff --git a/cli/src/main/java/io/vertx/core/impl/launcher/commands/BareCommand.java b/cli/src/main/java/io/vertx/core/impl/launcher/commands/BareCommand.java
index 80c838f..1f5c3d5 100644
--- a/cli/src/main/java/io/vertx/core/impl/launcher/commands/BareCommand.java
+++ b/cli/src/main/java/io/vertx/core/impl/launcher/commands/BareCommand.java
@@ -16,7 +16,7 @@
 import io.vertx.core.eventbus.AddressHelper;
 import io.vertx.core.eventbus.EventBusOptions;
 import io.vertx.core.impl.launcher.VertxLifecycleHooks;
-import io.vertx.core.impl.logging.Logger;
+import io.vertx.core.internal.logging.Logger;
 import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.metrics.MetricsOptions;
diff --git a/cli/src/main/java/io/vertx/core/impl/launcher/commands/ClasspathHandler.java b/cli/src/main/java/io/vertx/core/impl/launcher/commands/ClasspathHandler.java
index 537f0fd..3d1329e 100644
--- a/cli/src/main/java/io/vertx/core/impl/launcher/commands/ClasspathHandler.java
+++ b/cli/src/main/java/io/vertx/core/impl/launcher/commands/ClasspathHandler.java
@@ -14,8 +14,8 @@
 import io.vertx.core.*;
 import io.vertx.core.cli.annotations.Description;
 import io.vertx.core.cli.annotations.Option;
-import io.vertx.core.impl.logging.Logger;
-import io.vertx.core.impl.logging.LoggerFactory;
+import io.vertx.core.internal.logging.Logger;
+import io.vertx.core.internal.logging.LoggerFactory;
 import io.vertx.core.spi.launcher.DefaultCommand;
 
 import java.io.File;
diff --git a/cli/src/main/java/io/vertx/core/impl/launcher/commands/RunCommand.java b/cli/src/main/java/io/vertx/core/impl/launcher/commands/RunCommand.java
index 19ebf0d..047b587 100644
--- a/cli/src/main/java/io/vertx/core/impl/launcher/commands/RunCommand.java
+++ b/cli/src/main/java/io/vertx/core/impl/launcher/commands/RunCommand.java
@@ -15,7 +15,7 @@
 import io.vertx.core.cli.CLIException;
 import io.vertx.core.cli.CommandLine;
 import io.vertx.core.cli.annotations.*;
-import io.vertx.core.impl.VertxInternal;
+import io.vertx.core.internal.VertxInternal;
 import io.vertx.core.impl.launcher.VertxLifecycleHooks;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.spi.launcher.ExecutionContext;
diff --git a/cli/src/main/java/io/vertx/core/impl/launcher/commands/VersionCommand.java b/cli/src/main/java/io/vertx/core/impl/launcher/commands/VersionCommand.java
index a62760e..8319d7c 100644
--- a/cli/src/main/java/io/vertx/core/impl/launcher/commands/VersionCommand.java
+++ b/cli/src/main/java/io/vertx/core/impl/launcher/commands/VersionCommand.java
@@ -15,9 +15,9 @@
 import io.vertx.core.cli.annotations.Description;
 import io.vertx.core.cli.annotations.Name;
 import io.vertx.core.cli.annotations.Summary;
-import io.vertx.core.impl.VertxInternal;
-import io.vertx.core.impl.logging.Logger;
-import io.vertx.core.impl.logging.LoggerFactory;
+import io.vertx.core.internal.VertxInternal;
+import io.vertx.core.internal.logging.Logger;
+import io.vertx.core.internal.logging.LoggerFactory;
 import io.vertx.core.spi.launcher.DefaultCommand;
 
 /**
diff --git a/cli/src/main/java/io/vertx/core/impl/launcher/commands/VertxIsolatedDeployer.java b/cli/src/main/java/io/vertx/core/impl/launcher/commands/VertxIsolatedDeployer.java
index a3dcbf1..62c285c 100644
--- a/cli/src/main/java/io/vertx/core/impl/launcher/commands/VertxIsolatedDeployer.java
+++ b/cli/src/main/java/io/vertx/core/impl/launcher/commands/VertxIsolatedDeployer.java
@@ -12,8 +12,8 @@
 package io.vertx.core.impl.launcher.commands;
 
 import io.vertx.core.*;
-import io.vertx.core.impl.logging.Logger;
-import io.vertx.core.impl.logging.LoggerFactory;
+import io.vertx.core.internal.logging.Logger;
+import io.vertx.core.internal.logging.LoggerFactory;
 
 /**
  * A class isolating the deployment of verticle.
diff --git a/cli/src/main/java/io/vertx/core/impl/launcher/commands/Watcher.java b/cli/src/main/java/io/vertx/core/impl/launcher/commands/Watcher.java
index e8985fe..7cfbe72 100644
--- a/cli/src/main/java/io/vertx/core/impl/launcher/commands/Watcher.java
+++ b/cli/src/main/java/io/vertx/core/impl/launcher/commands/Watcher.java
@@ -12,8 +12,8 @@
 package io.vertx.core.impl.launcher.commands;
 
 import io.vertx.core.Handler;
-import io.vertx.core.impl.logging.Logger;
-import io.vertx.core.impl.logging.LoggerFactory;
+import io.vertx.core.internal.logging.Logger;
+import io.vertx.core.internal.logging.LoggerFactory;
 
 import java.io.File;
 import java.nio.file.WatchService;
diff --git a/cli/src/test/java/io/vertx/core/impl/launcher/LauncherExtensibilityTest.java b/cli/src/test/java/io/vertx/core/impl/launcher/LauncherExtensibilityTest.java
index 05e996d..d6683dc 100644
--- a/cli/src/test/java/io/vertx/core/impl/launcher/LauncherExtensibilityTest.java
+++ b/cli/src/test/java/io/vertx/core/impl/launcher/LauncherExtensibilityTest.java
@@ -17,7 +17,7 @@
 import io.vertx.core.VertxOptions;
 import io.vertx.core.cli.CLIException;
 import io.vertx.core.cli.annotations.Name;
-import io.vertx.core.impl.VertxInternal;
+import io.vertx.core.internal.VertxInternal;
 import io.vertx.core.impl.launcher.commands.CommandTestBase;
 import io.vertx.core.impl.launcher.commands.HttpTestVerticle;
 import io.vertx.core.impl.launcher.commands.RunCommandTest;