diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/BasicConfigurator.java b/logback-classic/src/main/java/ch/qos/logback/classic/BasicConfigurator.java
index 2a1830a545..0515dd0077 100644
--- a/logback-classic/src/main/java/ch/qos/logback/classic/BasicConfigurator.java
+++ b/logback-classic/src/main/java/ch/qos/logback/classic/BasicConfigurator.java
@@ -14,7 +14,7 @@
 package ch.qos.logback.classic;
 
 import ch.qos.logback.classic.layout.TTLLLayout;
-import ch.qos.logback.core.spi.Configurator;
+import ch.qos.logback.classic.spi.Configurator;
 import ch.qos.logback.classic.spi.ConfiguratorRank;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.ConsoleAppender;
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/joran/SerializedModelConfigurator.java b/logback-classic/src/main/java/ch/qos/logback/classic/joran/SerializedModelConfigurator.java
index 363dbbcfe2..f3e6ba1b2d 100644
--- a/logback-classic/src/main/java/ch/qos/logback/classic/joran/SerializedModelConfigurator.java
+++ b/logback-classic/src/main/java/ch/qos/logback/classic/joran/SerializedModelConfigurator.java
@@ -24,7 +24,7 @@
 import ch.qos.logback.core.model.ModelUtil;
 import ch.qos.logback.core.model.processor.DefaultProcessor;
 import ch.qos.logback.core.model.processor.ModelInterpretationContext;
-import ch.qos.logback.core.spi.Configurator;
+import ch.qos.logback.classic.spi.Configurator;
 import ch.qos.logback.core.spi.ContextAwareBase;
 import ch.qos.logback.core.status.InfoStatus;
 import ch.qos.logback.core.status.StatusManager;
diff --git a/logback-core/src/main/java/ch/qos/logback/core/spi/Configurator.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/Configurator.java
similarity index 98%
rename from logback-core/src/main/java/ch/qos/logback/core/spi/Configurator.java
rename to logback-classic/src/main/java/ch/qos/logback/classic/spi/Configurator.java
index aaad81beb4..21f9bdc4b8 100644
--- a/logback-core/src/main/java/ch/qos/logback/core/spi/Configurator.java
+++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/Configurator.java
@@ -11,7 +11,7 @@
  * under the terms of the GNU Lesser General Public License version 2.1
  * as published by the Free Software Foundation.
  */
-package ch.qos.logback.core.spi;
+package ch.qos.logback.classic.spi;
 
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.spi.ContextAware;
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java b/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java
index 7b5010d223..8c52bbb976 100644
--- a/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java
+++ b/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java
@@ -10,10 +10,9 @@
  */
 package ch.qos.logback.classic.util;
 
-import ch.qos.logback.classic.BasicConfigurator;
 import ch.qos.logback.classic.ClassicConstants;
 import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.core.spi.Configurator;
+import ch.qos.logback.classic.spi.Configurator;
 import ch.qos.logback.classic.spi.ConfiguratorRank;
 import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.LogbackException;
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/util/DefaultJoranConfigurator.java b/logback-classic/src/main/java/ch/qos/logback/classic/util/DefaultJoranConfigurator.java
index 00ed95247e..64eb3b14d2 100644
--- a/logback-classic/src/main/java/ch/qos/logback/classic/util/DefaultJoranConfigurator.java
+++ b/logback-classic/src/main/java/ch/qos/logback/classic/util/DefaultJoranConfigurator.java
@@ -6,7 +6,7 @@
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.LogbackException;
 import ch.qos.logback.core.joran.spi.JoranException;
-import ch.qos.logback.core.spi.Configurator;
+import ch.qos.logback.classic.spi.Configurator;
 import ch.qos.logback.core.spi.ContextAwareBase;
 import ch.qos.logback.core.status.InfoStatus;
 import ch.qos.logback.core.status.StatusManager;
diff --git a/logback-classic/src/main/java/module-info.java b/logback-classic/src/main/java/module-info.java
index 28fafa54bb..9876c07763 100644
--- a/logback-classic/src/main/java/module-info.java
+++ b/logback-classic/src/main/java/module-info.java
@@ -1,3 +1,4 @@
+import ch.qos.logback.classic.spi.Configurator;
 
 module ch.qos.logback.classic {
   // requires static means optional
@@ -17,7 +18,7 @@
   requires org.slf4j;
 
   requires ch.qos.logback.core;
-  uses ch.qos.logback.core.spi.Configurator;
+  uses Configurator;
   provides org.slf4j.spi.SLF4JServiceProvider with ch.qos.logback.classic.spi.LogbackServiceProvider;
 
   exports ch.qos.logback.classic;
diff --git a/logback-classic/src/test/input/fqcn.txt b/logback-classic/src/test/input/fqcn.txt
index 13f057f3f8..a0234a76df 100644
--- a/logback-classic/src/test/input/fqcn.txt
+++ b/logback-classic/src/test/input/fqcn.txt
@@ -240,7 +240,7 @@ ch.qos.logback.classic.sift.JNDIBasedContextDiscriminator
 ch.qos.logback.classic.sift.MDCBasedDiscriminator
 ch.qos.logback.classic.spi.CallerData
 ch.qos.logback.classic.spi.ClassPackagingData
-ch.qos.logback.core.spi.Configurator
+ch.qos.logback.classic.spi.Configurator
 ch.qos.logback.classic.spi.EventArgUtil
 ch.qos.logback.classic.spi.ILoggingEvent
 ch.qos.logback.classic.spi.IThrowableProxy
diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerTest.java
index bdd691d022..c23f271367 100755
--- a/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerTest.java
+++ b/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerTest.java
@@ -49,7 +49,7 @@
 
 public class ContextInitializerTest {
 
-    static final String PATH_TO_META_INF_CONF_SERVICE = "META-INF/services/ch.qos.logback.core.spi.Configurator";
+    static final String PATH_TO_META_INF_CONF_SERVICE = "META-INF/services/ch.qos.logback.classic.spi.Configurator";
     static final String FAKE_META_INF_SERVICES = "FAKE_META_INF_SERVICES_ch_qos_logback_classic_spi_Configurator";
     LoggerContext loggerContext = new LoggerContext();
     Logger root = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME);
diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/util/MockConfigurator.java b/logback-classic/src/test/java/ch/qos/logback/classic/util/MockConfigurator.java
index 23bd246c18..581f6e670f 100644
--- a/logback-classic/src/test/java/ch/qos/logback/classic/util/MockConfigurator.java
+++ b/logback-classic/src/test/java/ch/qos/logback/classic/util/MockConfigurator.java
@@ -13,7 +13,7 @@
  */
 package ch.qos.logback.classic.util;
 
-import ch.qos.logback.core.spi.Configurator;
+import ch.qos.logback.classic.spi.Configurator;
 import ch.qos.logback.classic.spi.ConfiguratorRank;
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.spi.ContextAwareBase;
diff --git a/logback-core/src/main/java/ch/qos/logback/core/model/processor/XMLIncludeModelHandler.java b/logback-core/src/main/java/ch/qos/logback/core/model/processor/XMLIncludeModelHandler.java
deleted file mode 100644
index 7ad44d51e3..0000000000
--- a/logback-core/src/main/java/ch/qos/logback/core/model/processor/XMLIncludeModelHandler.java
+++ /dev/null
@@ -1,2 +0,0 @@
-package ch.qos.logback.core.model.processor;public class XMLIncludeModelHandler {
-}