 
       allLocalPackages = kmpFiles.compactMap { file in
         let filePath = cachedKMPsDirectory.appendingPathComponent(file)
-        return ResourceFileManager.shared.getPackageInfo(for: filePath)
+        return (ResourceFileManager.shared.getPackageInfo(for: filePath)!, filePath)
       }
     } catch {
       log.error("Could not check contents of Documents directory for resource-migration assist")
     }
 
     // Filters out Packages that don't contain the matching resource type.
-    let localPackages = allLocalPackages.compactMap { return $0 as? Package }
-
-    // Step 2 - drop version numbers from all filenames.  KMP installations don't include them, and
-    // the version numbered filenames will actually interfere with migration.
-    resources.forEach { resource in
-      let srcLocation = Storage.active.legacyResourceURL(for: resource)!
-      let dstLocation = Storage.active.resourceURL(for: resource)!
-
-      do {
-        if FileManager.default.fileExists(atPath: srcLocation.path) {
-          try FileManager.default.moveItem(at: srcLocation, to: dstLocation)
-        }
-      } catch {
-        log.error("Could not remove version number from filename for resource \(resource.packageID ?? "<no package>").\(resource.id)")
-        log.error("Source: \(srcLocation)")
+    let localPackages: [(Package, URL)] = allLocalPackages.compactMap { tuple in
+      if let package = tuple.0 as? Package {
+        return (package, tuple.1)
+      } else {
+        return nil
       }
     }
 

    //          then migrate by reinstalling the KMP.
    var matched: [Resource] = []

    localPackages.forEach { package in
      let packageMatches: [Resource] = resources.compactMap { resource in
        if let possibleMatch = package.findResource(withID: resource.typedFullID) {
          if possibleMatch.version == resource.version {

      }

      // All resources within packageMatches were sourced from the current package.
      // Time to set migrate these.  Overwrites any obstructing files with the
      // the decompressed KMP's contents.
      do {
        // We've already parsed the metadata, but now we need to have the files ready for install.
        let package = try ResourceFileManager.shared.prepareKMPInstall(from: kmpFile) as! Package
        try packageMatches.forEach { resource in
          try ResourceFileManager.shared.install(resourceWithID: resource.typedFullID, from: package)
        }
        // Post-install cleanup.
        try FileManager.default.removeItem(at: package.sourceFolder)
      } catch {
        log.error("Could not install resource from locally-cached package: \(String(describing: error))")
      }

      matched.append(contentsOf: packageMatches)
    }
