diff --git a/loader/src/main/java/net/neoforged/fml/ModLoader.java b/loader/src/main/java/net/neoforged/fml/ModLoader.java
index 4340b0b1d..98acdcebf 100644
--- a/loader/src/main/java/net/neoforged/fml/ModLoader.java
+++ b/loader/src/main/java/net/neoforged/fml/ModLoader.java
@@ -34,9 +34,9 @@
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.fml.loading.ImmediateWindowHandler;
 import net.neoforged.fml.loading.LoadingModList;
-import net.neoforged.fml.loading.moddiscovery.JarModsDotTomlModProvider;
 import net.neoforged.fml.loading.moddiscovery.ModFileInfo;
 import net.neoforged.fml.loading.moddiscovery.ModInfo;
+import net.neoforged.fml.loading.moddiscovery.locators.JarModsDotTomlModProvider;
 import net.neoforged.fml.loading.progress.ProgressMeter;
 import net.neoforged.fml.loading.progress.StartupNotificationManager;
 import net.neoforged.neoforgespi.language.IModInfo;
diff --git a/loader/src/main/java/net/neoforged/fml/javafmlmod/AutomaticEventSubscriber.java b/loader/src/main/java/net/neoforged/fml/javafmlmod/AutomaticEventSubscriber.java
index e7948051e..5084b6028 100644
--- a/loader/src/main/java/net/neoforged/fml/javafmlmod/AutomaticEventSubscriber.java
+++ b/loader/src/main/java/net/neoforged/fml/javafmlmod/AutomaticEventSubscriber.java
@@ -19,7 +19,7 @@
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.loading.FMLEnvironment;
-import net.neoforged.fml.loading.moddiscovery.ModAnnotation;
+import net.neoforged.fml.loading.modscan.ModAnnotation;
 import net.neoforged.neoforgespi.language.ModFileScanData;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/FMLLoader.java b/loader/src/main/java/net/neoforged/fml/loading/FMLLoader.java
index f2d7d0cd0..68e716669 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/FMLLoader.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/FMLLoader.java
@@ -26,10 +26,10 @@
 import net.neoforged.coremod.CoreModScriptingEngine;
 import net.neoforged.fml.common.asm.RuntimeDistCleaner;
 import net.neoforged.fml.loading.mixin.DeferredMixinConfigRegistration;
-import net.neoforged.fml.loading.moddiscovery.BackgroundScanHandler;
 import net.neoforged.fml.loading.moddiscovery.ModDiscoverer;
 import net.neoforged.fml.loading.moddiscovery.ModFile;
 import net.neoforged.fml.loading.moddiscovery.ModValidator;
+import net.neoforged.fml.loading.modscan.BackgroundScanHandler;
 import net.neoforged.fml.loading.targets.CommonLaunchHandler;
 import org.slf4j.Logger;
 
diff --git a/loader/src/main/java/net/neoforged/fml/loading/LanguageLoadingProvider.java b/loader/src/main/java/net/neoforged/fml/loading/LanguageLoadingProvider.java
index 40b8ad5bc..debb8f698 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/LanguageLoadingProvider.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/LanguageLoadingProvider.java
@@ -23,8 +23,8 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Stream;
-import net.neoforged.fml.loading.moddiscovery.ExplodedDirectoryLocator;
 import net.neoforged.fml.loading.moddiscovery.ModFile;
+import net.neoforged.fml.loading.moddiscovery.locators.ExplodedDirectoryLocator;
 import net.neoforged.neoforgespi.language.IModLanguageProvider;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/LoadingModList.java b/loader/src/main/java/net/neoforged/fml/loading/LoadingModList.java
index dc8188e6b..d1f76b9fd 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/LoadingModList.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/LoadingModList.java
@@ -18,10 +18,10 @@
 import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 import net.neoforged.fml.loading.mixin.DeferredMixinConfigRegistration;
-import net.neoforged.fml.loading.moddiscovery.BackgroundScanHandler;
 import net.neoforged.fml.loading.moddiscovery.ModFile;
 import net.neoforged.fml.loading.moddiscovery.ModFileInfo;
 import net.neoforged.fml.loading.moddiscovery.ModInfo;
+import net.neoforged.fml.loading.modscan.BackgroundScanHandler;
 
 /**
  * Master list of all mods <em>in the loading context. This class cannot refer outside the
diff --git a/loader/src/main/java/net/neoforged/fml/loading/ModSorter.java b/loader/src/main/java/net/neoforged/fml/loading/ModSorter.java
index 777ea3012..ec05a8f24 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/ModSorter.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/ModSorter.java
@@ -29,10 +29,10 @@
 import java.util.jar.Manifest;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import net.neoforged.fml.loading.moddiscovery.MinecraftLocator;
 import net.neoforged.fml.loading.moddiscovery.ModFile;
 import net.neoforged.fml.loading.moddiscovery.ModFileInfo;
 import net.neoforged.fml.loading.moddiscovery.ModInfo;
+import net.neoforged.fml.loading.moddiscovery.locators.MinecraftLocator;
 import net.neoforged.fml.loading.toposort.CyclePresentException;
 import net.neoforged.fml.loading.toposort.TopologicalSort;
 import net.neoforged.neoforgespi.language.IModInfo;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModDiscoverer.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModDiscoverer.java
index 933dfedc5..325dceb2a 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModDiscoverer.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModDiscoverer.java
@@ -24,6 +24,7 @@
 import net.neoforged.fml.loading.ImmediateWindowHandler;
 import net.neoforged.fml.loading.LogMarkers;
 import net.neoforged.fml.loading.UniqueModListBuilder;
+import net.neoforged.fml.loading.moddiscovery.locators.ModsFolderLocator;
 import net.neoforged.fml.loading.progress.StartupNotificationManager;
 import net.neoforged.neoforgespi.Environment;
 import net.neoforged.neoforgespi.locating.IDependencyLocator;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFile.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFile.java
index 182eef004..d566e2d0f 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFile.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFile.java
@@ -23,6 +23,7 @@
 import java.util.stream.Stream;
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.fml.loading.LogMarkers;
+import net.neoforged.fml.loading.modscan.Scanner;
 import net.neoforged.neoforgespi.language.IModFileInfo;
 import net.neoforged.neoforgespi.language.IModInfo;
 import net.neoforged.neoforgespi.language.IModLanguageProvider;
@@ -53,7 +54,7 @@ public class ModFile implements IModFile {
     private List<String> mixinConfigs;
     private List<Path> accessTransformers;
 
-    static final Attributes.Name TYPE = new Attributes.Name("FMLModType");
+    public static final Attributes.Name TYPE = new Attributes.Name("FMLModType");
     private SecureJar.Status securityStatus;
 
     public ModFile(final SecureJar jar, final IModProvider provider, final ModFileFactory.ModFileInfoParser parser) {
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFileParser.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFileParser.java
index 800edaeec..06889c9fd 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFileParser.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFileParser.java
@@ -18,6 +18,7 @@
 import java.util.Map;
 import java.util.Optional;
 import net.neoforged.fml.loading.LogMarkers;
+import net.neoforged.fml.loading.moddiscovery.locators.JarModsDotTomlModProvider;
 import net.neoforged.neoforgespi.language.IModFileInfo;
 import net.neoforged.neoforgespi.locating.IModFile;
 import net.neoforged.neoforgespi.locating.InvalidModFileException;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModInfo.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModInfo.java
index 0ef510c31..9079163df 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModInfo.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModInfo.java
@@ -16,6 +16,7 @@
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.fml.loading.StringSubstitutor;
 import net.neoforged.fml.loading.StringUtils;
+import net.neoforged.fml.loading.moddiscovery.locators.MinecraftLocator;
 import net.neoforged.neoforgespi.language.IConfigurable;
 import net.neoforged.neoforgespi.language.IModInfo;
 import net.neoforged.neoforgespi.language.MavenVersionAdapter;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModJarMetadata.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModJarMetadata.java
index 094994ef1..b42b8318d 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModJarMetadata.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModJarMetadata.java
@@ -16,7 +16,7 @@ public final class ModJarMetadata extends LazyJarMetadata implements JarMetadata
     private final JarContents jarContents;
     private IModFile modFile;
 
-    ModJarMetadata(JarContents jarContents) {
+    public ModJarMetadata(JarContents jarContents) {
         this.jarContents = jarContents;
     }
 
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModValidator.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModValidator.java
index afb42de85..ba817b9ab 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModValidator.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModValidator.java
@@ -18,6 +18,7 @@
 import net.neoforged.fml.loading.LoadingModList;
 import net.neoforged.fml.loading.LogMarkers;
 import net.neoforged.fml.loading.ModSorter;
+import net.neoforged.fml.loading.modscan.BackgroundScanHandler;
 import net.neoforged.neoforgespi.locating.IModFile;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/NightConfigWrapper.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/NightConfigWrapper.java
index 0f8b70697..458daaf88 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/NightConfigWrapper.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/NightConfigWrapper.java
@@ -25,7 +25,7 @@ public NightConfigWrapper(final UnmodifiableConfig config) {
         this.config = config;
     }
 
-    NightConfigWrapper setFile(IModFileInfo file) {
+    public NightConfigWrapper setFile(IModFileInfo file) {
         this.file = file;
         return this;
     }
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/AbstractJarFileModLocator.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/AbstractJarFileModLocator.java
similarity index 90%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/AbstractJarFileModLocator.java
rename to loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/AbstractJarFileModLocator.java
index 8949c19e2..03b4168c9 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/AbstractJarFileModLocator.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/AbstractJarFileModLocator.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.moddiscovery.locators;
 
 import java.io.File;
 import java.nio.file.Path;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/BuiltinGameLibraryLocator.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/BuiltinGameLibraryLocator.java
similarity index 95%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/BuiltinGameLibraryLocator.java
rename to loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/BuiltinGameLibraryLocator.java
index 14eb70e64..fe81b5958 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/BuiltinGameLibraryLocator.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/BuiltinGameLibraryLocator.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.moddiscovery.locators;
 
 import cpw.mods.jarhandling.JarContents;
 import cpw.mods.jarhandling.JarContentsBuilder;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ClasspathLocator.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/ClasspathLocator.java
similarity index 98%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ClasspathLocator.java
rename to loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/ClasspathLocator.java
index c5bf9b4f5..eb6c04404 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ClasspathLocator.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/ClasspathLocator.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.moddiscovery.locators;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.JarContents;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ExplodedDirectoryLocator.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/ExplodedDirectoryLocator.java
similarity index 96%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ExplodedDirectoryLocator.java
rename to loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/ExplodedDirectoryLocator.java
index eb6fa9614..18ca1c41b 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ExplodedDirectoryLocator.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/ExplodedDirectoryLocator.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.moddiscovery.locators;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.JarContents;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/JarInJarDependencyLocator.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/JarInJarDependencyLocator.java
similarity index 99%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/JarInJarDependencyLocator.java
rename to loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/JarInJarDependencyLocator.java
index 4f6652b4e..1a9f25f43 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/JarInJarDependencyLocator.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/JarInJarDependencyLocator.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.moddiscovery.locators;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/JarModsDotTomlModProvider.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/JarModsDotTomlModProvider.java
similarity index 95%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/JarModsDotTomlModProvider.java
rename to loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/JarModsDotTomlModProvider.java
index c1fd1ce62..e003445a4 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/JarModsDotTomlModProvider.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/JarModsDotTomlModProvider.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.moddiscovery.locators;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.JarContents;
@@ -14,6 +14,9 @@
 import java.util.Optional;
 import java.util.function.Function;
 import net.neoforged.fml.loading.LogMarkers;
+import net.neoforged.fml.loading.moddiscovery.ModFile;
+import net.neoforged.fml.loading.moddiscovery.ModFileParser;
+import net.neoforged.fml.loading.moddiscovery.ModJarMetadata;
 import net.neoforged.neoforgespi.language.IConfigurable;
 import net.neoforged.neoforgespi.language.IModFileInfo;
 import net.neoforged.neoforgespi.language.IModInfo;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/MavenDirectoryLocator.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/MavenDirectoryLocator.java
similarity index 94%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/MavenDirectoryLocator.java
rename to loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/MavenDirectoryLocator.java
index 0b6b54aba..62f4db551 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/MavenDirectoryLocator.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/MavenDirectoryLocator.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.moddiscovery.locators;
 
 import cpw.mods.jarhandling.JarContents;
 import cpw.mods.jarhandling.JarContentsBuilder;
@@ -15,6 +15,7 @@
 import java.util.stream.Stream;
 import net.neoforged.fml.loading.FMLPaths;
 import net.neoforged.fml.loading.MavenCoordinateResolver;
+import net.neoforged.fml.loading.moddiscovery.ModListHandler;
 import net.neoforged.neoforgespi.locating.IModLocator;
 
 public class MavenDirectoryLocator implements IModLocator {
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/MinecraftLocator.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/MinecraftLocator.java
similarity index 94%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/MinecraftLocator.java
rename to loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/MinecraftLocator.java
index 478ace632..6e1285fad 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/MinecraftLocator.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/MinecraftLocator.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.moddiscovery.locators;
 
 import com.electronwill.nightconfig.core.Config;
 import com.mojang.logging.LogUtils;
@@ -16,6 +16,10 @@
 import java.util.stream.Stream;
 import net.neoforged.fml.loading.ClasspathTransformerDiscoverer;
 import net.neoforged.fml.loading.FMLLoader;
+import net.neoforged.fml.loading.moddiscovery.ModFile;
+import net.neoforged.fml.loading.moddiscovery.ModFileInfo;
+import net.neoforged.fml.loading.moddiscovery.ModJarMetadata;
+import net.neoforged.fml.loading.moddiscovery.NightConfigWrapper;
 import net.neoforged.neoforgespi.language.IModFileInfo;
 import net.neoforged.neoforgespi.locating.IModFile;
 import net.neoforged.neoforgespi.locating.IModLocator;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModsFolderLocator.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/ModsFolderLocator.java
similarity index 94%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModsFolderLocator.java
rename to loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/ModsFolderLocator.java
index eb2b3fb72..bcb7bab04 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModsFolderLocator.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/locators/ModsFolderLocator.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.moddiscovery.locators;
 
 import com.mojang.logging.LogUtils;
 import cpw.mods.jarhandling.JarContents;
@@ -37,7 +37,7 @@ public ModsFolderLocator() {
         this(modFolder, "mods folder");
     }
 
-    ModsFolderLocator(Path modFolder, String name) {
+    public ModsFolderLocator(Path modFolder, String name) {
         this.modFolder = modFolder;
         this.customName = name;
     }
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/BackgroundScanHandler.java b/loader/src/main/java/net/neoforged/fml/loading/modscan/BackgroundScanHandler.java
similarity index 97%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/BackgroundScanHandler.java
rename to loader/src/main/java/net/neoforged/fml/loading/modscan/BackgroundScanHandler.java
index 784bc3494..ccbb2a0a2 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/BackgroundScanHandler.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/modscan/BackgroundScanHandler.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.modscan;
 
 import com.mojang.logging.LogUtils;
 import java.time.Duration;
@@ -19,6 +19,7 @@
 import net.neoforged.fml.loading.ImmediateWindowHandler;
 import net.neoforged.fml.loading.LoadingModList;
 import net.neoforged.fml.loading.LogMarkers;
+import net.neoforged.fml.loading.moddiscovery.ModFile;
 import net.neoforged.neoforgespi.language.ModFileScanData;
 import org.slf4j.Logger;
 
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModAnnotation.java b/loader/src/main/java/net/neoforged/fml/loading/modscan/ModAnnotation.java
similarity index 98%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModAnnotation.java
rename to loader/src/main/java/net/neoforged/fml/loading/modscan/ModAnnotation.java
index 8a325cded..c80c14191 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModAnnotation.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/modscan/ModAnnotation.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.modscan;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Lists;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModAnnotationVisitor.java b/loader/src/main/java/net/neoforged/fml/loading/modscan/ModAnnotationVisitor.java
similarity index 97%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModAnnotationVisitor.java
rename to loader/src/main/java/net/neoforged/fml/loading/modscan/ModAnnotationVisitor.java
index 3fdeeeb81..149a084fd 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModAnnotationVisitor.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/modscan/ModAnnotationVisitor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.modscan;
 
 import java.util.LinkedList;
 import org.objectweb.asm.AnnotationVisitor;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModClassVisitor.java b/loader/src/main/java/net/neoforged/fml/loading/modscan/ModClassVisitor.java
similarity index 98%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModClassVisitor.java
rename to loader/src/main/java/net/neoforged/fml/loading/modscan/ModClassVisitor.java
index ba04b8a96..fefb4f33d 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModClassVisitor.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/modscan/ModClassVisitor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.modscan;
 
 import java.lang.annotation.ElementType;
 import java.util.LinkedList;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFieldVisitor.java b/loader/src/main/java/net/neoforged/fml/loading/modscan/ModFieldVisitor.java
similarity index 95%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFieldVisitor.java
rename to loader/src/main/java/net/neoforged/fml/loading/modscan/ModFieldVisitor.java
index 8b08032a5..8c3786c11 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFieldVisitor.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/modscan/ModFieldVisitor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.modscan;
 
 import java.lang.annotation.ElementType;
 import java.util.LinkedList;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModMethodVisitor.java b/loader/src/main/java/net/neoforged/fml/loading/modscan/ModMethodVisitor.java
similarity index 95%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModMethodVisitor.java
rename to loader/src/main/java/net/neoforged/fml/loading/modscan/ModMethodVisitor.java
index 135027284..0b35290cf 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModMethodVisitor.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/modscan/ModMethodVisitor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.modscan;
 
 import java.lang.annotation.ElementType;
 import java.util.LinkedList;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/Scanner.java b/loader/src/main/java/net/neoforged/fml/loading/modscan/Scanner.java
similarity index 95%
rename from loader/src/main/java/net/neoforged/fml/loading/moddiscovery/Scanner.java
rename to loader/src/main/java/net/neoforged/fml/loading/modscan/Scanner.java
index 2bb056317..6a59740ec 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/Scanner.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/modscan/Scanner.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.fml.loading.moddiscovery;
+package net.neoforged.fml.loading.modscan;
 
 import com.mojang.logging.LogUtils;
 import java.io.IOException;
@@ -12,6 +12,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import net.neoforged.fml.loading.LogMarkers;
+import net.neoforged.fml.loading.moddiscovery.ModFile;
 import net.neoforged.neoforgespi.language.IModLanguageProvider;
 import net.neoforged.neoforgespi.language.ModFileScanData;
 import org.objectweb.asm.ClassReader;
diff --git a/loader/src/main/java/net/neoforged/fml/loading/targets/CommonDevLaunchHandler.java b/loader/src/main/java/net/neoforged/fml/loading/targets/CommonDevLaunchHandler.java
index 2b02e9cd9..5c89047a4 100644
--- a/loader/src/main/java/net/neoforged/fml/loading/targets/CommonDevLaunchHandler.java
+++ b/loader/src/main/java/net/neoforged/fml/loading/targets/CommonDevLaunchHandler.java
@@ -17,7 +17,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import net.neoforged.fml.loading.FileUtils;
-import net.neoforged.fml.loading.moddiscovery.JarModsDotTomlModProvider;
+import net.neoforged.fml.loading.moddiscovery.locators.JarModsDotTomlModProvider;
 
 public abstract class CommonDevLaunchHandler extends CommonLaunchHandler {
     @Override
diff --git a/loader/src/main/resources/META-INF/services/net.neoforged.neoforgespi.locating.IDependencyLocator b/loader/src/main/resources/META-INF/services/net.neoforged.neoforgespi.locating.IDependencyLocator
index 8dc3d96d6..bf5b64fc2 100644
--- a/loader/src/main/resources/META-INF/services/net.neoforged.neoforgespi.locating.IDependencyLocator
+++ b/loader/src/main/resources/META-INF/services/net.neoforged.neoforgespi.locating.IDependencyLocator
@@ -1 +1 @@
-net.neoforged.fml.loading.moddiscovery.JarInJarDependencyLocator
\ No newline at end of file
+net.neoforged.fml.loading.moddiscovery.locators.JarInJarDependencyLocator
diff --git a/loader/src/main/resources/META-INF/services/net.neoforged.neoforgespi.locating.IModLocator b/loader/src/main/resources/META-INF/services/net.neoforged.neoforgespi.locating.IModLocator
index 920303df9..53226c297 100644
--- a/loader/src/main/resources/META-INF/services/net.neoforged.neoforgespi.locating.IModLocator
+++ b/loader/src/main/resources/META-INF/services/net.neoforged.neoforgespi.locating.IModLocator
@@ -1,6 +1,6 @@
-net.neoforged.fml.loading.moddiscovery.ModsFolderLocator
-net.neoforged.fml.loading.moddiscovery.MavenDirectoryLocator
-net.neoforged.fml.loading.moddiscovery.ExplodedDirectoryLocator
-net.neoforged.fml.loading.moddiscovery.MinecraftLocator
-net.neoforged.fml.loading.moddiscovery.ClasspathLocator
-net.neoforged.fml.loading.moddiscovery.BuiltinGameLibraryLocator
+net.neoforged.fml.loading.moddiscovery.locators.ModsFolderLocator
+net.neoforged.fml.loading.moddiscovery.locators.MavenDirectoryLocator
+net.neoforged.fml.loading.moddiscovery.locators.ExplodedDirectoryLocator
+net.neoforged.fml.loading.moddiscovery.locators.MinecraftLocator
+net.neoforged.fml.loading.moddiscovery.locators.ClasspathLocator
+net.neoforged.fml.loading.moddiscovery.locators.BuiltinGameLibraryLocator