From 591e451b69eed2434e60d5f9eddb45fcb86c6ed4 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Tue, 24 Sep 2024 14:45:53 -0700
Subject: [PATCH] =?UTF-8?q?Simplify=20Parser=20=E2=80=94=C2=A0use=20one=20?=
 =?UTF-8?q?target=20instead=20of=20multiple.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xcschemes/OPMLParser.xcscheme             | 67 -------------------
 .../xcode/xcshareddata/xcschemes/SAX.xcscheme | 67 -------------------
 Modules/Parser/Package.swift                  | 60 ++---------------
 .../{ => Parser}/DateParser/DateParser.swift  |  0
 .../FeedParser/Feeds/FeedParser.swift         |  0
 .../FeedParser/Feeds/FeedParserError.swift    |  0
 .../FeedParser/Feeds/FeedType.swift           |  1 -
 .../Feeds/JSON/JSONFeedParser.swift           |  2 -
 .../Feeds/JSON/RSSInJSONParser.swift          |  2 -
 .../FeedParser/Feeds/ParsedAttachment.swift   |  0
 .../FeedParser/Feeds/ParsedAuthor.swift       |  0
 .../FeedParser/Feeds/ParsedFeed.swift         |  0
 .../FeedParser/Feeds/ParsedHub.swift          |  0
 .../FeedParser/Feeds/ParsedItem.swift         |  0
 .../FeedParser/Feeds/XML/AtomParser.swift     |  2 -
 .../FeedParser/Feeds/XML/RSSArticle.swift     |  0
 .../FeedParser/Feeds/XML/RSSAuthor.swift      |  0
 .../FeedParser/Feeds/XML/RSSEnclosure.swift   |  0
 .../FeedParser/Feeds/XML/RSSFeed.swift        |  0
 .../Feeds/XML/RSSFeedTransformer.swift        |  0
 .../FeedParser/Feeds/XML/RSSParser.swift      |  2 -
 .../FeedParser/JSON/JSONTypes.swift           |  0
 .../FeedParser/JSON/JSONUtilities.swift       |  0
 .../{ => Parser}/HTMLParser/HTMLLink.swift    |  0
 .../HTMLParser/HTMLLinkParser.swift           |  1 -
 .../HTMLParser/HTMLMetadata.swift             |  1 -
 .../HTMLParser/HTMLMetadataParser.swift       |  1 -
 .../{ => Parser}/HTMLParser/HTMLTag.swift     |  0
 .../OPMLParser/OPMLAttributes.swift           |  0
 .../OPMLParser/OPMLDocument.swift             |  0
 .../OPMLParser/OPMLFeedSpecifier.swift        |  1 -
 .../{ => Parser}/OPMLParser/OPMLItem.swift    |  0
 .../{ => Parser}/OPMLParser/OPMLParser.swift  |  1 -
 .../SAX/Extensions/Data+SAX.swift             |  0
 .../SAX/Extensions/Dictionary+SAX.swift       |  0
 .../SAX/Extensions/String+SAX.swift           |  0
 .../{ => Parser}/SAX/HTMLEntityDecoder.swift  |  0
 .../Sources/{ => Parser}/SAX/ParserData.swift |  0
 .../{ => Parser}/SAX/SAXHTMLParser.swift      |  0
 .../Sources/{ => Parser}/SAX/SAXParser.swift  |  0
 .../{ => Parser}/SAX/SAXUtilities.swift       |  0
 .../Tests/ParserTests/AtomParserTests.swift   |  2 +-
 .../Tests/ParserTests/DateParserTests.swift   |  2 +-
 .../ParserTests/EntityDecodingTests.swift     |  2 +-
 .../ParserTests/FeedParserTypeTests.swift     |  3 +-
 .../Tests/ParserTests/HTMLLinkTests.swift     |  3 +-
 .../Tests/ParserTests/HTMLMetadataTests.swift |  2 +-
 .../ParserTests/JSONFeedParserTests.swift     |  2 +-
 .../Parser/Tests/ParserTests/OPMLTests.swift  |  3 +-
 .../ParserTests/RSSInJSONParserTests.swift    |  3 +-
 .../Tests/ParserTests/RSSParserTests.swift    |  2 +-
 51 files changed, 14 insertions(+), 218 deletions(-)
 delete mode 100644 Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/OPMLParser.xcscheme
 delete mode 100644 Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/SAX.xcscheme
 rename Modules/Parser/Sources/{ => Parser}/DateParser/DateParser.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/FeedParser.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/FeedParserError.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/FeedType.swift (99%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/JSON/JSONFeedParser.swift (99%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/JSON/RSSInJSONParser.swift (99%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/ParsedAttachment.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/ParsedAuthor.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/ParsedFeed.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/ParsedHub.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/ParsedItem.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/XML/AtomParser.swift (99%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/XML/RSSArticle.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/XML/RSSAuthor.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/XML/RSSEnclosure.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/XML/RSSFeed.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/XML/RSSFeedTransformer.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/Feeds/XML/RSSParser.swift (99%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/JSON/JSONTypes.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/FeedParser/JSON/JSONUtilities.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/HTMLParser/HTMLLink.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/HTMLParser/HTMLLinkParser.swift (99%)
 rename Modules/Parser/Sources/{ => Parser}/HTMLParser/HTMLMetadata.swift (99%)
 rename Modules/Parser/Sources/{ => Parser}/HTMLParser/HTMLMetadataParser.swift (99%)
 rename Modules/Parser/Sources/{ => Parser}/HTMLParser/HTMLTag.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/OPMLParser/OPMLAttributes.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/OPMLParser/OPMLDocument.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/OPMLParser/OPMLFeedSpecifier.swift (98%)
 rename Modules/Parser/Sources/{ => Parser}/OPMLParser/OPMLItem.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/OPMLParser/OPMLParser.swift (99%)
 rename Modules/Parser/Sources/{ => Parser}/SAX/Extensions/Data+SAX.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/SAX/Extensions/Dictionary+SAX.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/SAX/Extensions/String+SAX.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/SAX/HTMLEntityDecoder.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/SAX/ParserData.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/SAX/SAXHTMLParser.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/SAX/SAXParser.swift (100%)
 rename Modules/Parser/Sources/{ => Parser}/SAX/SAXUtilities.swift (100%)

diff --git a/Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/OPMLParser.xcscheme b/Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/OPMLParser.xcscheme
deleted file mode 100644
index 218cca92a..000000000
--- a/Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/OPMLParser.xcscheme
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1530"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "OPMLParser"
-               BuildableName = "OPMLParser"
-               BlueprintName = "OPMLParser"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "OPMLParser"
-            BuildableName = "OPMLParser"
-            BlueprintName = "OPMLParser"
-            ReferencedContainer = "container:">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/SAX.xcscheme b/Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/SAX.xcscheme
deleted file mode 100644
index 0267c802a..000000000
--- a/Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/SAX.xcscheme
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1530"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "SAX"
-               BuildableName = "SAX"
-               BlueprintName = "SAX"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "SAX"
-            BuildableName = "SAX"
-            BlueprintName = "SAX"
-            ReferencedContainer = "container:">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/Modules/Parser/Package.swift b/Modules/Parser/Package.swift
index 9e749f804..e9aaf44ff 100644
--- a/Modules/Parser/Package.swift
+++ b/Modules/Parser/Package.swift
@@ -9,25 +9,9 @@ let package = Package(
 	products: [
 		// Products define the executables and libraries a package produces, and make them visible to other packages.
 		.library(
-			name: "FeedParser",
+			name: "Parser",
 			type: .dynamic,
-			targets: ["FeedParser"]),
-		.library(
-			name: "SAX",
-			type: .dynamic,
-			targets: ["SAX"]),
-		.library(
-			name: "OPMLParser",
-			type: .dynamic,
-			targets: ["OPMLParser"]),
-		.library(
-			name: "HTMLParser",
-			type: .dynamic,
-			targets: ["HTMLParser"]),
-		.library(
-			name: "DateParser",
-			type: .dynamic,
-			targets: ["DateParser"])
+			targets: ["Parser"])
 	],
 	dependencies: [
 		.package(path: "../FoundationExtras"),
@@ -36,53 +20,17 @@ let package = Package(
 		// Targets are the basic building blocks of a package. A target can define a module or a test suite.
 		// Targets can depend on other targets in this package, and on products in packages this package depends on.
 		.target(
-			name: "OPMLParser",
-			dependencies: [
-				"SAX"
-			],
-			swiftSettings: [
-				.enableExperimentalFeature("StrictConcurrency")
-			]),
-		.target(
-			name: "HTMLParser",
+			name: "Parser",
 			dependencies: [
 				"FoundationExtras",
-				"SAX"
 			],
 			swiftSettings: [
 				.enableExperimentalFeature("StrictConcurrency")
 			]),
-		.target(
-			name: "FeedParser",
-			dependencies: [
-				"SAX",
-				"FoundationExtras",
-				"DateParser"
-			],
-			swiftSettings: [
-				.enableExperimentalFeature("StrictConcurrency")
-			]),
-		.target(
-			name: "SAX",
-			dependencies: [
-				"FoundationExtras"
-			],
-			swiftSettings: [
-				.enableExperimentalFeature("StrictConcurrency")
-			]),
-		.target(
-			name: "DateParser",
-			dependencies: [],
-			swiftSettings: [
-				.enableExperimentalFeature("StrictConcurrency")
-			]),
 		.testTarget(
 			name: "ParserTests",
 			dependencies: [
-				"FeedParser",
-				"OPMLParser",
-				"DateParser",
-				"HTMLParser"
+				"Parser"
 			],
 			exclude: ["Info.plist"],
 			resources: [.copy("Resources")]),
diff --git a/Modules/Parser/Sources/DateParser/DateParser.swift b/Modules/Parser/Sources/Parser/DateParser/DateParser.swift
similarity index 100%
rename from Modules/Parser/Sources/DateParser/DateParser.swift
rename to Modules/Parser/Sources/Parser/DateParser/DateParser.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/FeedParser.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/FeedParser.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/Feeds/FeedParser.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/FeedParser.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/FeedParserError.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/FeedParserError.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/Feeds/FeedParserError.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/FeedParserError.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/FeedType.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/FeedType.swift
similarity index 99%
rename from Modules/Parser/Sources/FeedParser/Feeds/FeedType.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/FeedType.swift
index f26cd1ab2..21d70539d 100644
--- a/Modules/Parser/Sources/FeedParser/Feeds/FeedType.swift
+++ b/Modules/Parser/Sources/Parser/FeedParser/Feeds/FeedType.swift
@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import SAX
 
 public enum FeedType: Sendable {
 
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/JSON/JSONFeedParser.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/JSON/JSONFeedParser.swift
similarity index 99%
rename from Modules/Parser/Sources/FeedParser/Feeds/JSON/JSONFeedParser.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/JSON/JSONFeedParser.swift
index 488a1db4c..a8665af2e 100644
--- a/Modules/Parser/Sources/FeedParser/Feeds/JSON/JSONFeedParser.swift
+++ b/Modules/Parser/Sources/Parser/FeedParser/Feeds/JSON/JSONFeedParser.swift
@@ -7,8 +7,6 @@
 //
 
 import Foundation
-import SAX
-import DateParser
 
 // See https://jsonfeed.org/version/1.1
 
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/JSON/RSSInJSONParser.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/JSON/RSSInJSONParser.swift
similarity index 99%
rename from Modules/Parser/Sources/FeedParser/Feeds/JSON/RSSInJSONParser.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/JSON/RSSInJSONParser.swift
index 6e7feca1f..39f9623a7 100644
--- a/Modules/Parser/Sources/FeedParser/Feeds/JSON/RSSInJSONParser.swift
+++ b/Modules/Parser/Sources/Parser/FeedParser/Feeds/JSON/RSSInJSONParser.swift
@@ -7,8 +7,6 @@
 //
 
 import Foundation
-import SAX
-import DateParser
 
 // See https://github.com/scripting/Scripting-News/blob/master/rss-in-json/README.md
 // Also: http://cyber.harvard.edu/rss/rss.html
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/ParsedAttachment.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/ParsedAttachment.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/Feeds/ParsedAttachment.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/ParsedAttachment.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/ParsedAuthor.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/ParsedAuthor.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/Feeds/ParsedAuthor.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/ParsedAuthor.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/ParsedFeed.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/ParsedFeed.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/Feeds/ParsedFeed.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/ParsedFeed.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/ParsedHub.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/ParsedHub.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/Feeds/ParsedHub.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/ParsedHub.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/ParsedItem.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/ParsedItem.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/Feeds/ParsedItem.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/ParsedItem.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/XML/AtomParser.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/AtomParser.swift
similarity index 99%
rename from Modules/Parser/Sources/FeedParser/Feeds/XML/AtomParser.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/AtomParser.swift
index a77015c3f..ef7002390 100644
--- a/Modules/Parser/Sources/FeedParser/Feeds/XML/AtomParser.swift
+++ b/Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/AtomParser.swift
@@ -8,8 +8,6 @@
 
 import Foundation
 import FoundationExtras
-import SAX
-import DateParser
 
 final class AtomParser {
 
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/XML/RSSArticle.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSArticle.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/Feeds/XML/RSSArticle.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSArticle.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/XML/RSSAuthor.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSAuthor.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/Feeds/XML/RSSAuthor.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSAuthor.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/XML/RSSEnclosure.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSEnclosure.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/Feeds/XML/RSSEnclosure.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSEnclosure.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/XML/RSSFeed.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSFeed.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/Feeds/XML/RSSFeed.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSFeed.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/XML/RSSFeedTransformer.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSFeedTransformer.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/Feeds/XML/RSSFeedTransformer.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSFeedTransformer.swift
diff --git a/Modules/Parser/Sources/FeedParser/Feeds/XML/RSSParser.swift b/Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSParser.swift
similarity index 99%
rename from Modules/Parser/Sources/FeedParser/Feeds/XML/RSSParser.swift
rename to Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSParser.swift
index 341b0f702..75ead7108 100644
--- a/Modules/Parser/Sources/FeedParser/Feeds/XML/RSSParser.swift
+++ b/Modules/Parser/Sources/Parser/FeedParser/Feeds/XML/RSSParser.swift
@@ -8,8 +8,6 @@
 
 import Foundation
 import FoundationExtras
-import SAX
-import DateParser
 
 public final class RSSParser {
 
diff --git a/Modules/Parser/Sources/FeedParser/JSON/JSONTypes.swift b/Modules/Parser/Sources/Parser/FeedParser/JSON/JSONTypes.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/JSON/JSONTypes.swift
rename to Modules/Parser/Sources/Parser/FeedParser/JSON/JSONTypes.swift
diff --git a/Modules/Parser/Sources/FeedParser/JSON/JSONUtilities.swift b/Modules/Parser/Sources/Parser/FeedParser/JSON/JSONUtilities.swift
similarity index 100%
rename from Modules/Parser/Sources/FeedParser/JSON/JSONUtilities.swift
rename to Modules/Parser/Sources/Parser/FeedParser/JSON/JSONUtilities.swift
diff --git a/Modules/Parser/Sources/HTMLParser/HTMLLink.swift b/Modules/Parser/Sources/Parser/HTMLParser/HTMLLink.swift
similarity index 100%
rename from Modules/Parser/Sources/HTMLParser/HTMLLink.swift
rename to Modules/Parser/Sources/Parser/HTMLParser/HTMLLink.swift
diff --git a/Modules/Parser/Sources/HTMLParser/HTMLLinkParser.swift b/Modules/Parser/Sources/Parser/HTMLParser/HTMLLinkParser.swift
similarity index 99%
rename from Modules/Parser/Sources/HTMLParser/HTMLLinkParser.swift
rename to Modules/Parser/Sources/Parser/HTMLParser/HTMLLinkParser.swift
index 00994fd63..d084860d4 100644
--- a/Modules/Parser/Sources/HTMLParser/HTMLLinkParser.swift
+++ b/Modules/Parser/Sources/Parser/HTMLParser/HTMLLinkParser.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import FoundationExtras
-import SAX
 
 public final class HTMLLinkParser {
 
diff --git a/Modules/Parser/Sources/HTMLParser/HTMLMetadata.swift b/Modules/Parser/Sources/Parser/HTMLParser/HTMLMetadata.swift
similarity index 99%
rename from Modules/Parser/Sources/HTMLParser/HTMLMetadata.swift
rename to Modules/Parser/Sources/Parser/HTMLParser/HTMLMetadata.swift
index bf804d760..651fd7a58 100644
--- a/Modules/Parser/Sources/HTMLParser/HTMLMetadata.swift
+++ b/Modules/Parser/Sources/Parser/HTMLParser/HTMLMetadata.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import SAX
 
 public final class HTMLMetadata {
 
diff --git a/Modules/Parser/Sources/HTMLParser/HTMLMetadataParser.swift b/Modules/Parser/Sources/Parser/HTMLParser/HTMLMetadataParser.swift
similarity index 99%
rename from Modules/Parser/Sources/HTMLParser/HTMLMetadataParser.swift
rename to Modules/Parser/Sources/Parser/HTMLParser/HTMLMetadataParser.swift
index ab96da818..fe317067a 100644
--- a/Modules/Parser/Sources/HTMLParser/HTMLMetadataParser.swift
+++ b/Modules/Parser/Sources/Parser/HTMLParser/HTMLMetadataParser.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 import FoundationExtras
-import SAX
 
 public final class HTMLMetadataParser {
 
diff --git a/Modules/Parser/Sources/HTMLParser/HTMLTag.swift b/Modules/Parser/Sources/Parser/HTMLParser/HTMLTag.swift
similarity index 100%
rename from Modules/Parser/Sources/HTMLParser/HTMLTag.swift
rename to Modules/Parser/Sources/Parser/HTMLParser/HTMLTag.swift
diff --git a/Modules/Parser/Sources/OPMLParser/OPMLAttributes.swift b/Modules/Parser/Sources/Parser/OPMLParser/OPMLAttributes.swift
similarity index 100%
rename from Modules/Parser/Sources/OPMLParser/OPMLAttributes.swift
rename to Modules/Parser/Sources/Parser/OPMLParser/OPMLAttributes.swift
diff --git a/Modules/Parser/Sources/OPMLParser/OPMLDocument.swift b/Modules/Parser/Sources/Parser/OPMLParser/OPMLDocument.swift
similarity index 100%
rename from Modules/Parser/Sources/OPMLParser/OPMLDocument.swift
rename to Modules/Parser/Sources/Parser/OPMLParser/OPMLDocument.swift
diff --git a/Modules/Parser/Sources/OPMLParser/OPMLFeedSpecifier.swift b/Modules/Parser/Sources/Parser/OPMLParser/OPMLFeedSpecifier.swift
similarity index 98%
rename from Modules/Parser/Sources/OPMLParser/OPMLFeedSpecifier.swift
rename to Modules/Parser/Sources/Parser/OPMLParser/OPMLFeedSpecifier.swift
index d22f566b1..2b5e43856 100644
--- a/Modules/Parser/Sources/OPMLParser/OPMLFeedSpecifier.swift
+++ b/Modules/Parser/Sources/Parser/OPMLParser/OPMLFeedSpecifier.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import SAX
 
 public struct OPMLFeedSpecifier: Sendable {
 
diff --git a/Modules/Parser/Sources/OPMLParser/OPMLItem.swift b/Modules/Parser/Sources/Parser/OPMLParser/OPMLItem.swift
similarity index 100%
rename from Modules/Parser/Sources/OPMLParser/OPMLItem.swift
rename to Modules/Parser/Sources/Parser/OPMLParser/OPMLItem.swift
diff --git a/Modules/Parser/Sources/OPMLParser/OPMLParser.swift b/Modules/Parser/Sources/Parser/OPMLParser/OPMLParser.swift
similarity index 99%
rename from Modules/Parser/Sources/OPMLParser/OPMLParser.swift
rename to Modules/Parser/Sources/Parser/OPMLParser/OPMLParser.swift
index ab21c4185..4ec38d5b1 100644
--- a/Modules/Parser/Sources/OPMLParser/OPMLParser.swift
+++ b/Modules/Parser/Sources/Parser/OPMLParser/OPMLParser.swift
@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import SAX
 
 public final class OPMLParser {
 
diff --git a/Modules/Parser/Sources/SAX/Extensions/Data+SAX.swift b/Modules/Parser/Sources/Parser/SAX/Extensions/Data+SAX.swift
similarity index 100%
rename from Modules/Parser/Sources/SAX/Extensions/Data+SAX.swift
rename to Modules/Parser/Sources/Parser/SAX/Extensions/Data+SAX.swift
diff --git a/Modules/Parser/Sources/SAX/Extensions/Dictionary+SAX.swift b/Modules/Parser/Sources/Parser/SAX/Extensions/Dictionary+SAX.swift
similarity index 100%
rename from Modules/Parser/Sources/SAX/Extensions/Dictionary+SAX.swift
rename to Modules/Parser/Sources/Parser/SAX/Extensions/Dictionary+SAX.swift
diff --git a/Modules/Parser/Sources/SAX/Extensions/String+SAX.swift b/Modules/Parser/Sources/Parser/SAX/Extensions/String+SAX.swift
similarity index 100%
rename from Modules/Parser/Sources/SAX/Extensions/String+SAX.swift
rename to Modules/Parser/Sources/Parser/SAX/Extensions/String+SAX.swift
diff --git a/Modules/Parser/Sources/SAX/HTMLEntityDecoder.swift b/Modules/Parser/Sources/Parser/SAX/HTMLEntityDecoder.swift
similarity index 100%
rename from Modules/Parser/Sources/SAX/HTMLEntityDecoder.swift
rename to Modules/Parser/Sources/Parser/SAX/HTMLEntityDecoder.swift
diff --git a/Modules/Parser/Sources/SAX/ParserData.swift b/Modules/Parser/Sources/Parser/SAX/ParserData.swift
similarity index 100%
rename from Modules/Parser/Sources/SAX/ParserData.swift
rename to Modules/Parser/Sources/Parser/SAX/ParserData.swift
diff --git a/Modules/Parser/Sources/SAX/SAXHTMLParser.swift b/Modules/Parser/Sources/Parser/SAX/SAXHTMLParser.swift
similarity index 100%
rename from Modules/Parser/Sources/SAX/SAXHTMLParser.swift
rename to Modules/Parser/Sources/Parser/SAX/SAXHTMLParser.swift
diff --git a/Modules/Parser/Sources/SAX/SAXParser.swift b/Modules/Parser/Sources/Parser/SAX/SAXParser.swift
similarity index 100%
rename from Modules/Parser/Sources/SAX/SAXParser.swift
rename to Modules/Parser/Sources/Parser/SAX/SAXParser.swift
diff --git a/Modules/Parser/Sources/SAX/SAXUtilities.swift b/Modules/Parser/Sources/Parser/SAX/SAXUtilities.swift
similarity index 100%
rename from Modules/Parser/Sources/SAX/SAXUtilities.swift
rename to Modules/Parser/Sources/Parser/SAX/SAXUtilities.swift
diff --git a/Modules/Parser/Tests/ParserTests/AtomParserTests.swift b/Modules/Parser/Tests/ParserTests/AtomParserTests.swift
index eb2f738ed..94fd6cbe0 100644
--- a/Modules/Parser/Tests/ParserTests/AtomParserTests.swift
+++ b/Modules/Parser/Tests/ParserTests/AtomParserTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import FeedParser
+import Parser
 
 final class AtomParserTests: XCTestCase {
 
diff --git a/Modules/Parser/Tests/ParserTests/DateParserTests.swift b/Modules/Parser/Tests/ParserTests/DateParserTests.swift
index 3861e15f4..4f03febbd 100644
--- a/Modules/Parser/Tests/ParserTests/DateParserTests.swift
+++ b/Modules/Parser/Tests/ParserTests/DateParserTests.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import XCTest
-@testable import DateParser
+@testable import Parser
 
 final class DateParserTests: XCTestCase {
 	
diff --git a/Modules/Parser/Tests/ParserTests/EntityDecodingTests.swift b/Modules/Parser/Tests/ParserTests/EntityDecodingTests.swift
index 292b6b183..db8112cf3 100644
--- a/Modules/Parser/Tests/ParserTests/EntityDecodingTests.swift
+++ b/Modules/Parser/Tests/ParserTests/EntityDecodingTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import SAX
+import Parser
 
 final class EntityDecodingTests: XCTestCase {
 
diff --git a/Modules/Parser/Tests/ParserTests/FeedParserTypeTests.swift b/Modules/Parser/Tests/ParserTests/FeedParserTypeTests.swift
index 8600936e2..3649e5acd 100644
--- a/Modules/Parser/Tests/ParserTests/FeedParserTypeTests.swift
+++ b/Modules/Parser/Tests/ParserTests/FeedParserTypeTests.swift
@@ -7,8 +7,7 @@
 //
 
 import XCTest
-@testable import FeedParser
-import SAX
+@testable import Parser
 
 final class FeedParserTypeTests: XCTestCase {
 
diff --git a/Modules/Parser/Tests/ParserTests/HTMLLinkTests.swift b/Modules/Parser/Tests/ParserTests/HTMLLinkTests.swift
index cdc8834d6..7e7c69acc 100644
--- a/Modules/Parser/Tests/ParserTests/HTMLLinkTests.swift
+++ b/Modules/Parser/Tests/ParserTests/HTMLLinkTests.swift
@@ -7,8 +7,7 @@
 //
 
 import XCTest
-import HTMLParser
-import libxml2
+import Parser
 
 final class HTMLLinkTests: XCTestCase {
 
diff --git a/Modules/Parser/Tests/ParserTests/HTMLMetadataTests.swift b/Modules/Parser/Tests/ParserTests/HTMLMetadataTests.swift
index 4133a9a8c..6adc5de7f 100644
--- a/Modules/Parser/Tests/ParserTests/HTMLMetadataTests.swift
+++ b/Modules/Parser/Tests/ParserTests/HTMLMetadataTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import HTMLParser
+import Parser
 
 final class HTMLMetadataTests: XCTestCase {
 
diff --git a/Modules/Parser/Tests/ParserTests/JSONFeedParserTests.swift b/Modules/Parser/Tests/ParserTests/JSONFeedParserTests.swift
index 3e605ed16..f96dde79e 100644
--- a/Modules/Parser/Tests/ParserTests/JSONFeedParserTests.swift
+++ b/Modules/Parser/Tests/ParserTests/JSONFeedParserTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import FeedParser
+import Parser
 
 final class JSONFeedParserTests: XCTestCase {
 
diff --git a/Modules/Parser/Tests/ParserTests/OPMLTests.swift b/Modules/Parser/Tests/ParserTests/OPMLTests.swift
index 4e8400e56..563cd149e 100644
--- a/Modules/Parser/Tests/ParserTests/OPMLTests.swift
+++ b/Modules/Parser/Tests/ParserTests/OPMLTests.swift
@@ -7,8 +7,7 @@
 //
 
 import XCTest
-import SAX
-@testable import OPMLParser
+@testable import Parser
 
 final class OPMLTests: XCTestCase {
 
diff --git a/Modules/Parser/Tests/ParserTests/RSSInJSONParserTests.swift b/Modules/Parser/Tests/ParserTests/RSSInJSONParserTests.swift
index 2474b286e..240076af2 100644
--- a/Modules/Parser/Tests/ParserTests/RSSInJSONParserTests.swift
+++ b/Modules/Parser/Tests/ParserTests/RSSInJSONParserTests.swift
@@ -7,8 +7,7 @@
 //
 
 import XCTest
-import SAX
-import FeedParser
+import Parser
 
 final class RSSInJSONParserTests: XCTestCase {
 
diff --git a/Modules/Parser/Tests/ParserTests/RSSParserTests.swift b/Modules/Parser/Tests/ParserTests/RSSParserTests.swift
index 25f71fad3..62f9d0294 100644
--- a/Modules/Parser/Tests/ParserTests/RSSParserTests.swift
+++ b/Modules/Parser/Tests/ParserTests/RSSParserTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import FeedParser
+import Parser
 
 final class RSSParserTests: XCTestCase {