 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 singleSourceDeps.append(.target(name: "ObjectiveCTests"))
 #endif
-targets += singleSourceLibraries.map { x in
-    return .target(name: x,
+
+targets += singleSourceLibraries.map { name in
+  return .target(name: name,
       dependencies: singleSourceDeps,
       path: "single-source",
-      sources: ["\(x).swift"])
+      sources: ["\(name).swift"])
 }
-targets += multiSourceLibraries.map { x in
-  return .target(name: x,
+
+targets += multiSourceLibraries.map { lib in
+  return .target(
+    name: lib.name,
     dependencies: [
       .target(name: "TestsUtils")
     ],
-    path: "multi-source/\(x)")
+    path: lib.parentSubDir)
 }
+
+//===---
+// Top Level Definition
+//
 
 let p = Package(
   name: "swiftbench",

// swift-tools-version:4.2

import PackageDescription
import Foundation

unsupportedTests.insert("ObjectiveCBridgingStubs")
#endif

//===---
// Single Source Libraries
//

/// Return the source files in subDirectory that we will translate into
/// libraries. Each source library will be compiled as its own module.
func getSingleSourceLibraries(subDirectory: String) -> [String] {
  let f = FileManager.`default`
  let dirURL = URL(fileURLWithPath: subDirectory)
  let fileURLs = try! f.contentsOfDirectory(at: dirURL,
                                            includingPropertiesForKeys: nil)
  return fileURLs.compactMap { (path: URL) -> String? in
