diff --git a/build.sbt b/build.sbt
index 06b850d..df64b53 100644
--- a/build.sbt
+++ b/build.sbt
@@ -16,16 +16,6 @@ libraryDependencies ++= Dependencies.scalaLogging(scalaVersion.value, isScala3.v
 initialCommands := """|import com.typesafe.scalalogging._
                       |import org.slf4j.{ Logger => Underlying, _ }""".stripMargin
 
-Compile / unmanagedSourceDirectories ++= {
-  val sourceDir = (Compile / sourceDirectory).value
-  val extraFilesOpt = CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((2, _)) => Some(sourceDir / "scala-2.x")
-    case Some((3, _)) => Some(sourceDir / "scala-3.x")
-    case _ => None
-  }
-  extraFilesOpt.toSeq
-}
-
 // OSGi
 
 import com.typesafe.sbt.osgi.SbtOsgi
diff --git a/src/main/scala-2.x/com/typesafe/scalalogging/LoggerImpl.scala b/src/main/scala-2/com/typesafe/scalalogging/LoggerImpl.scala
similarity index 100%
rename from src/main/scala-2.x/com/typesafe/scalalogging/LoggerImpl.scala
rename to src/main/scala-2/com/typesafe/scalalogging/LoggerImpl.scala
diff --git a/src/main/scala-2.x/com/typesafe/scalalogging/LoggerMacro.scala b/src/main/scala-2/com/typesafe/scalalogging/LoggerMacro.scala
similarity index 100%
rename from src/main/scala-2.x/com/typesafe/scalalogging/LoggerMacro.scala
rename to src/main/scala-2/com/typesafe/scalalogging/LoggerMacro.scala
diff --git a/src/main/scala-2.x/com/typesafe/scalalogging/LoggerTakingImplicitImpl.scala b/src/main/scala-2/com/typesafe/scalalogging/LoggerTakingImplicitImpl.scala
similarity index 100%
rename from src/main/scala-2.x/com/typesafe/scalalogging/LoggerTakingImplicitImpl.scala
rename to src/main/scala-2/com/typesafe/scalalogging/LoggerTakingImplicitImpl.scala
diff --git a/src/main/scala-2.x/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala b/src/main/scala-2/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala
similarity index 100%
rename from src/main/scala-2.x/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala
rename to src/main/scala-2/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala
diff --git a/src/main/scala-3.x/com/typesafe/scalalogging/LoggerImpl.scala b/src/main/scala-3/com/typesafe/scalalogging/LoggerImpl.scala
similarity index 100%
rename from src/main/scala-3.x/com/typesafe/scalalogging/LoggerImpl.scala
rename to src/main/scala-3/com/typesafe/scalalogging/LoggerImpl.scala
diff --git a/src/main/scala-3.x/com/typesafe/scalalogging/LoggerMacro.scala b/src/main/scala-3/com/typesafe/scalalogging/LoggerMacro.scala
similarity index 100%
rename from src/main/scala-3.x/com/typesafe/scalalogging/LoggerMacro.scala
rename to src/main/scala-3/com/typesafe/scalalogging/LoggerMacro.scala
diff --git a/src/main/scala-3.x/com/typesafe/scalalogging/LoggerTakingImplicitImpl.scala b/src/main/scala-3/com/typesafe/scalalogging/LoggerTakingImplicitImpl.scala
similarity index 100%
rename from src/main/scala-3.x/com/typesafe/scalalogging/LoggerTakingImplicitImpl.scala
rename to src/main/scala-3/com/typesafe/scalalogging/LoggerTakingImplicitImpl.scala
diff --git a/src/main/scala-3.x/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala b/src/main/scala-3/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala
similarity index 100%
rename from src/main/scala-3.x/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala
rename to src/main/scala-3/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala