diff --git a/Frameworks/Account/Account.xcodeproj/project.pbxproj b/Frameworks/Account/Account.xcodeproj/project.pbxproj
index 3bb101735..3fe9ce883 100644
--- a/Frameworks/Account/Account.xcodeproj/project.pbxproj
+++ b/Frameworks/Account/Account.xcodeproj/project.pbxproj
@@ -127,8 +127,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				841973FF1F6DD1C5006346C4 /* RSParser.framework in Frameworks */,
 				841973FE1F6DD1BC006346C4 /* RSCore.framework in Frameworks */,
+				841973FF1F6DD1C5006346C4 /* RSParser.framework in Frameworks */,
 				841973FD1F6DD1B7006346C4 /* Data.framework in Frameworks */,
 				8469F8171F6DD0AD0084783E /* Database.framework in Frameworks */,
 			);
diff --git a/Frameworks/Account/Local/LocalAccountRefresher.swift b/Frameworks/Account/Local/LocalAccountRefresher.swift
index c0ffb71eb..eac5d6990 100644
--- a/Frameworks/Account/Local/LocalAccountRefresher.swift
+++ b/Frameworks/Account/Local/LocalAccountRefresher.swift
@@ -65,7 +65,7 @@ final class LocalAccountRefresher: DownloadSessionDelegate {
 //			print("Hashed content of \(feed.url) has not changed.")
 			return
 		}
-		
+
 		let parserData = ParserData(url: feed.url, data: data)
 		FeedParser.parse(parserData) { (parsedFeed, error) in
 			
diff --git a/Frameworks/RSParser/Feeds/XML/RSAtomParser.m b/Frameworks/RSParser/Feeds/XML/RSAtomParser.m
index c71c0a94f..dd1ec2a1a 100755
--- a/Frameworks/RSParser/Feeds/XML/RSAtomParser.m
+++ b/Frameworks/RSParser/Feeds/XML/RSAtomParser.m
@@ -7,14 +7,13 @@
 //
 
 #import <libxml/xmlstring.h>
-#import "RSAtomParser.h"
-#import "RSSAXParser.h"
-#import "RSParsedFeed.h"
-#import "RSParsedArticle.h"
-#import "NSString+RSParser.h"
-#import "RSDateParser.h"
-//#import "RSParser-Swift.h"
-
+#import <RSParser/RSAtomParser.h>
+#import <RSParser/RSSAXParser.h>
+#import <RSParser/RSParsedFeed.h>
+#import <RSParser/RSParsedArticle.h>
+#import <RSParser/NSString+RSParser.h>
+#import <RSParser/RSDateParser.h>
+#import <RSParser/ParserData.h>
 
 @interface RSAtomParser () <RSSAXParserDelegate>
 
diff --git a/Frameworks/RSParser/Feeds/XML/RSParsedArticle.m b/Frameworks/RSParser/Feeds/XML/RSParsedArticle.m
index ae3963388..ad3e5fa27 100755
--- a/Frameworks/RSParser/Feeds/XML/RSParsedArticle.m
+++ b/Frameworks/RSParser/Feeds/XML/RSParsedArticle.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 Ranchero Software LLC. All rights reserved.
 //
 
-#import "RSParsedArticle.h"
-#import "RSParserInternal.h"
-#import "NSString+RSParser.h"
+#import <RSParser/RSParsedArticle.h>
+#import <RSParser/RSParserInternal.h>
+#import <RSParser/NSString+RSParser.h>
 
 
 @implementation RSParsedArticle
diff --git a/Frameworks/RSParser/Feeds/XML/RSParsedFeed.m b/Frameworks/RSParser/Feeds/XML/RSParsedFeed.m
index 0a9be8418..8b71b0b52 100755
--- a/Frameworks/RSParser/Feeds/XML/RSParsedFeed.m
+++ b/Frameworks/RSParser/Feeds/XML/RSParsedFeed.m
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Ranchero Software, LLC. All rights reserved.
 //
 
-#import "RSParsedFeed.h"
+#import <RSParser/RSParsedFeed.h>
 
 @implementation RSParsedFeed
 
diff --git a/Frameworks/RSParser/Feeds/XML/RSRSSParser.m b/Frameworks/RSParser/Feeds/XML/RSRSSParser.m
index 0b487f407..fad0bd0be 100755
--- a/Frameworks/RSParser/Feeds/XML/RSRSSParser.m
+++ b/Frameworks/RSParser/Feeds/XML/RSRSSParser.m
@@ -7,14 +7,14 @@
 //
 
 #import <libxml/xmlstring.h>
-#import "RSRSSParser.h"
-#import "RSSAXParser.h"
-#import "RSParsedFeed.h"
-#import "RSParsedArticle.h"
-#import "RSParserInternal.h"
-#import "NSString+RSParser.h"
-#import "RSDateParser.h"
-#import "RSParser-Swift.h"
+#import <RSParser/RSRSSParser.h>
+#import <RSParser/RSSAXParser.h>
+#import <RSParser/RSParsedFeed.h>
+#import <RSParser/RSParsedArticle.h>
+#import <RSParser/RSParserInternal.h>
+#import <RSParser/NSString+RSParser.h>
+#import <RSParser/RSDateParser.h>
+#import <RSParser/ParserData.h>
 
 
 @interface RSRSSParser () <RSSAXParserDelegate>
diff --git a/Frameworks/RSParser/HTML/RSHTMLLinkParser.m b/Frameworks/RSParser/HTML/RSHTMLLinkParser.m
index 3270ae743..c6e7bd752 100755
--- a/Frameworks/RSParser/HTML/RSHTMLLinkParser.m
+++ b/Frameworks/RSParser/HTML/RSHTMLLinkParser.m
@@ -7,11 +7,11 @@
 //
 
 #import <libxml/xmlstring.h>
-#import "RSHTMLLinkParser.h"
-#import "RSSAXHTMLParser.h"
-#import "RSSAXParser.h"
-#import "RSParserInternal.h"
-#import "RSParser-Swift.h"
+#import <RSParser/RSHTMLLinkParser.h>
+#import <RSParser/RSSAXHTMLParser.h>
+#import <RSParser/RSSAXParser.h>
+#import <RSParser/RSParserInternal.h>
+#import <RSParser/ParserData.h>
 
 
 @interface RSHTMLLinkParser() <RSSAXHTMLParserDelegate>
diff --git a/Frameworks/RSParser/HTML/RSHTMLMetadata.m b/Frameworks/RSParser/HTML/RSHTMLMetadata.m
index 87662d8b4..54c8dd4ee 100755
--- a/Frameworks/RSParser/HTML/RSHTMLMetadata.m
+++ b/Frameworks/RSParser/HTML/RSHTMLMetadata.m
@@ -6,8 +6,8 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import "RSHTMLMetadata.h"
-#import "RSParserInternal.h"
+#import <RSParser/RSHTMLMetadata.h>
+#import <RSParser/RSParserInternal.h>
 
 static NSString *urlStringFromDictionary(NSDictionary *d);
 static NSString *absoluteURLStringWithRelativeURLString(NSString *relativeURLString, NSString *baseURLString);
diff --git a/Frameworks/RSParser/HTML/RSHTMLMetadataParser.m b/Frameworks/RSParser/HTML/RSHTMLMetadataParser.m
index 8746d72f3..3ab264be5 100755
--- a/Frameworks/RSParser/HTML/RSHTMLMetadataParser.m
+++ b/Frameworks/RSParser/HTML/RSHTMLMetadataParser.m
@@ -7,12 +7,13 @@
 //
 
 #import <libxml/xmlstring.h>
-#import "RSHTMLMetadataParser.h"
-#import "RSHTMLMetadata.h"
-#import "RSSAXHTMLParser.h"
-#import "RSSAXParser.h"
-#import "RSParserInternal.h"
-#import "RSParser-Swift.h"
+#import <RSParser/RSHTMLMetadataParser.h>
+#import <RSParser/RSHTMLMetadata.h>
+#import <RSParser/RSSAXHTMLParser.h>
+#import <RSParser/RSSAXParser.h>
+#import <RSParser/RSParserInternal.h>
+#import <RSParser/ParserData.h>
+
 
 @interface RSHTMLMetadataParser () <RSSAXHTMLParserDelegate>
 
diff --git a/Frameworks/RSParser/HTML/RSSAXHTMLParser.m b/Frameworks/RSParser/HTML/RSSAXHTMLParser.m
index c059349aa..ea9cb2f6e 100755
--- a/Frameworks/RSParser/HTML/RSSAXHTMLParser.m
+++ b/Frameworks/RSParser/HTML/RSSAXHTMLParser.m
@@ -6,12 +6,12 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import "RSSAXHTMLParser.h"
-#import "RSSAXParser.h"
+#import <RSParser/RSSAXHTMLParser.h>
+#import <RSParser/RSSAXParser.h>
 #import <libxml/tree.h>
 #import <libxml/xmlstring.h>
 #import <libxml/HTMLparser.h>
-#import "RSParserInternal.h"
+#import <RSParser/RSParserInternal.h>
 
 
 @interface RSSAXHTMLParser ()
diff --git a/Frameworks/RSParser/OPML/RSOPMLAttributes.m b/Frameworks/RSParser/OPML/RSOPMLAttributes.m
index 89b591565..49bb91e8e 100755
--- a/Frameworks/RSParser/OPML/RSOPMLAttributes.m
+++ b/Frameworks/RSParser/OPML/RSOPMLAttributes.m
@@ -6,8 +6,8 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import "RSOPMLAttributes.h"
-#import "RSParserInternal.h"
+#import <RSParser/RSOPMLAttributes.h>
+#import <RSParser/RSParserInternal.h>
 
 
 NSString *OPMLTextKey = @"text";
diff --git a/Frameworks/RSParser/OPML/RSOPMLDocument.h b/Frameworks/RSParser/OPML/RSOPMLDocument.h
index 8b08f5e3b..0d4398ab8 100755
--- a/Frameworks/RSParser/OPML/RSOPMLDocument.h
+++ b/Frameworks/RSParser/OPML/RSOPMLDocument.h
@@ -7,7 +7,7 @@
 //
 
 @import Foundation;
-#import "RSOPMLItem.h"
+#import <RSParser/RSOPMLItem.h>
 
 
 @interface RSOPMLDocument : RSOPMLItem
diff --git a/Frameworks/RSParser/OPML/RSOPMLDocument.m b/Frameworks/RSParser/OPML/RSOPMLDocument.m
index 0674bb862..02ac55956 100755
--- a/Frameworks/RSParser/OPML/RSOPMLDocument.m
+++ b/Frameworks/RSParser/OPML/RSOPMLDocument.m
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import "RSOPMLDocument.h"
+#import <RSParser/RSOPMLDocument.h>
 
 @implementation RSOPMLDocument
 
diff --git a/Frameworks/RSParser/OPML/RSOPMLError.m b/Frameworks/RSParser/OPML/RSOPMLError.m
index 7aa3c5e9d..93b477a41 100755
--- a/Frameworks/RSParser/OPML/RSOPMLError.m
+++ b/Frameworks/RSParser/OPML/RSOPMLError.m
@@ -6,7 +6,7 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import "RSOPMLError.h"
+#import <RSParser/RSOPMLError.h>
 
 NSString *RSOPMLErrorDomain = @"com.ranchero.OPML";
 
diff --git a/Frameworks/RSParser/OPML/RSOPMLFeedSpecifier.m b/Frameworks/RSParser/OPML/RSOPMLFeedSpecifier.m
index a48d7526c..2147ff95c 100755
--- a/Frameworks/RSParser/OPML/RSOPMLFeedSpecifier.m
+++ b/Frameworks/RSParser/OPML/RSOPMLFeedSpecifier.m
@@ -6,8 +6,8 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import "RSOPMLFeedSpecifier.h"
-#import "RSParserInternal.h"
+#import <RSParser/RSOPMLFeedSpecifier.h>
+#import <RSParser/RSParserInternal.h>
 
 
 @implementation RSOPMLFeedSpecifier
diff --git a/Frameworks/RSParser/OPML/RSOPMLItem.m b/Frameworks/RSParser/OPML/RSOPMLItem.m
index 58ce34338..9eeda020a 100755
--- a/Frameworks/RSParser/OPML/RSOPMLItem.m
+++ b/Frameworks/RSParser/OPML/RSOPMLItem.m
@@ -6,10 +6,10 @@
 //  Copyright © 2016 Ranchero Software, LLC. All rights reserved.
 //
 
-#import "RSOPMLItem.h"
-#import "RSOPMLAttributes.h"
-#import "RSOPMLFeedSpecifier.h"
-#import "RSParserInternal.h"
+#import <RSParser/RSOPMLItem.h>
+#import <RSParser/RSOPMLAttributes.h>
+#import <RSParser/RSOPMLFeedSpecifier.h>
+#import <RSParser/RSParserInternal.h>
 
 
 @interface RSOPMLItem ()
diff --git a/Frameworks/RSParser/OPML/RSOPMLParser.m b/Frameworks/RSParser/OPML/RSOPMLParser.m
index 669238bd8..d23f9e61b 100755
--- a/Frameworks/RSParser/OPML/RSOPMLParser.m
+++ b/Frameworks/RSParser/OPML/RSOPMLParser.m
@@ -8,12 +8,12 @@
 
 #import "RSOPMLParser.h"
 #import <libxml/xmlstring.h>
-#import "RSSAXParser.h"
-#import "RSOPMLItem.h"
-#import "RSOPMLDocument.h"
-#import "RSOPMLAttributes.h"
-#import "RSParser-Swift.h"
-#import "RSOPMLError.h"
+#import <RSParser/RSSAXParser.h>
+#import <RSParser/RSOPMLItem.h>
+#import <RSParser/RSOPMLDocument.h>
+#import <RSParser/RSOPMLAttributes.h>
+#import <RSParser/RSOPMLError.h>
+#import <RSParser/ParserData.h>
 
 
 @interface RSOPMLParser () <RSSAXParserDelegate>
diff --git a/Frameworks/RSParser/ParserData.h b/Frameworks/RSParser/ParserData.h
new file mode 100644
index 000000000..30517d98d
--- /dev/null
+++ b/Frameworks/RSParser/ParserData.h
@@ -0,0 +1,23 @@
+//
+//  ParserData.h
+//  RSParser
+//
+//  Created by Brent Simmons on 10/4/17.
+//  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
+//
+
+@import Foundation;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ParserData : NSObject
+
+@property (nonatomic, readonly) NSString *url;
+@property (nonatomic, readonly) NSData *data;
+
+- (instancetype)initWithURL:(NSString *)url data:(NSData *)data;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
diff --git a/Frameworks/RSParser/ParserData.m b/Frameworks/RSParser/ParserData.m
new file mode 100644
index 000000000..68c5f0356
--- /dev/null
+++ b/Frameworks/RSParser/ParserData.m
@@ -0,0 +1,26 @@
+//
+//  ParserData.m
+//  RSParser
+//
+//  Created by Brent Simmons on 10/4/17.
+//  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
+//
+
+#import "ParserData.h"
+
+@implementation ParserData
+
+- (instancetype)initWithURL:(NSString *)url data:(NSData *)data {
+
+	self = [super init];
+	if (!self) {
+		return nil;
+	}
+
+	_url = url;
+	_data = data;
+
+	return self;
+}
+
+@end
diff --git a/Frameworks/RSParser/ParserData.swift b/Frameworks/RSParser/ParserData.swift
deleted file mode 100644
index d04588338..000000000
--- a/Frameworks/RSParser/ParserData.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  ParserData.swift
-//  RSParser
-//
-//  Created by Brent Simmons on 6/20/17.
-//  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
-//
-
-import Foundation
-
-@objc public final class ParserData: NSObject {
-
-	@objc public let url: String
-	@objc public let data: Data
-
-	public init(url: String, data: Data) {
-
-		self.url = url
-		self.data = data
-		super.init()
-	}
-}
diff --git a/Frameworks/RSParser/RSParser.h b/Frameworks/RSParser/RSParser.h
index 28c853fff..a6ce8aad0 100644
--- a/Frameworks/RSParser/RSParser.h
+++ b/Frameworks/RSParser/RSParser.h
@@ -10,6 +10,8 @@
 
 // To parse RSS, Atom, JSON Feed, and RSS-in-JSON the easy way, see FeedParser.swift.
 
+#import <RSParser/ParserData.h>
+
 // Dates
 
 #import <RSParser/RSDateParser.h>
diff --git a/Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj b/Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj
index cdfe99674..27fa65303 100644
--- a/Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj
+++ b/Frameworks/RSParser/RSParser.xcodeproj/project.pbxproj
@@ -18,7 +18,6 @@
 		84285AAF1F006BC0002E8708 /* libxml2.2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 84285AAE1F006BC0002E8708 /* libxml2.2.tbd */; };
 		84285AB21F00702E002E8708 /* RSOPMLError.h in Headers */ = {isa = PBXBuildFile; fileRef = 84285AB01F00702E002E8708 /* RSOPMLError.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		84285AB31F00702E002E8708 /* RSOPMLError.m in Sources */ = {isa = PBXBuildFile; fileRef = 84285AB11F00702E002E8708 /* RSOPMLError.m */; };
-		84469CE21EFA2F3E004A6B28 /* ParserData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84469CE11EFA2F3E004A6B28 /* ParserData.swift */; };
 		84469CEF1EFA3000004A6B28 /* RSOPMLAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 84469CE51EFA3000004A6B28 /* RSOPMLAttributes.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		84469CF01EFA3000004A6B28 /* RSOPMLAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = 84469CE61EFA3000004A6B28 /* RSOPMLAttributes.m */; };
 		84469CF11EFA3000004A6B28 /* RSOPMLDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 84469CE71EFA3000004A6B28 /* RSOPMLDocument.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -86,6 +85,8 @@
 		84D81BE41EFA2D3D00652332 /* ParsedItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D81BE31EFA2D3D00652332 /* ParsedItem.swift */; };
 		84D81BE61EFA2DFB00652332 /* ParsedAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D81BE51EFA2DFB00652332 /* ParsedAttachment.swift */; };
 		84D81BE81EFA2E6700652332 /* ParsedHub.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D81BE71EFA2E6700652332 /* ParsedHub.swift */; };
+		84E7E69F1F85780D0046719D /* ParserData.h in Headers */ = {isa = PBXBuildFile; fileRef = 84E7E69D1F85780D0046719D /* ParserData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		84E7E6A01F85780D0046719D /* ParserData.m in Sources */ = {isa = PBXBuildFile; fileRef = 84E7E69E1F85780D0046719D /* ParserData.m */; };
 		84FF5F8E1EFA285800C15A01 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FF5F841EFA285800C15A01 /* RSParser.framework */; };
 /* End PBXBuildFile section */
 
@@ -112,7 +113,6 @@
 		84285AB01F00702E002E8708 /* RSOPMLError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSOPMLError.h; sourceTree = "<group>"; };
 		84285AB11F00702E002E8708 /* RSOPMLError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSOPMLError.m; sourceTree = "<group>"; };
 		84285AB41F007255002E8708 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
-		84469CE11EFA2F3E004A6B28 /* ParserData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParserData.swift; sourceTree = "<group>"; };
 		84469CE51EFA3000004A6B28 /* RSOPMLAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSOPMLAttributes.h; sourceTree = "<group>"; };
 		84469CE61EFA3000004A6B28 /* RSOPMLAttributes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSOPMLAttributes.m; sourceTree = "<group>"; };
 		84469CE71EFA3000004A6B28 /* RSOPMLDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSOPMLDocument.h; sourceTree = "<group>"; };
@@ -181,6 +181,8 @@
 		84D81BE31EFA2D3D00652332 /* ParsedItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ParsedItem.swift; path = Feeds/ParsedItem.swift; sourceTree = "<group>"; };
 		84D81BE51EFA2DFB00652332 /* ParsedAttachment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ParsedAttachment.swift; path = Feeds/ParsedAttachment.swift; sourceTree = "<group>"; };
 		84D81BE71EFA2E6700652332 /* ParsedHub.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ParsedHub.swift; path = Feeds/ParsedHub.swift; sourceTree = "<group>"; };
+		84E7E69D1F85780D0046719D /* ParserData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParserData.h; sourceTree = "<group>"; };
+		84E7E69E1F85780D0046719D /* ParserData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ParserData.m; sourceTree = "<group>"; };
 		84FF5F841EFA285800C15A01 /* RSParser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RSParser.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		84FF5F8D1EFA285800C15A01 /* RSParserTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RSParserTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		84FF5F941EFA285800C15A01 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -352,7 +354,8 @@
 			children = (
 				84285AB41F007255002E8708 /* README.md */,
 				84D81BDA1EFA28E700652332 /* RSParser.h */,
-				84469CE11EFA2F3E004A6B28 /* ParserData.swift */,
+				84E7E69D1F85780D0046719D /* ParserData.h */,
+				84E7E69E1F85780D0046719D /* ParserData.m */,
 				84469CE31EFA2FB0004A6B28 /* Feeds */,
 				84285AA61F004879002E8708 /* Dates */,
 				84469CE41EFA3000004A6B28 /* OPML */,
@@ -411,6 +414,7 @@
 				84D81BDC1EFA28E700652332 /* RSParser.h in Headers */,
 				84469D0B1EFA307E004A6B28 /* RSHTMLMetadataParser.h in Headers */,
 				84469CFC1EFA3069004A6B28 /* RSSAXParser.h in Headers */,
+				84E7E69F1F85780D0046719D /* ParserData.h in Headers */,
 				84469D071EFA307E004A6B28 /* RSHTMLLinkParser.h in Headers */,
 				84469D0D1EFA307E004A6B28 /* RSSAXHTMLParser.h in Headers */,
 				84469D2B1EFA3134004A6B28 /* RSParsedArticle.h in Headers */,
@@ -544,10 +548,10 @@
 				84469CF41EFA3000004A6B28 /* RSOPMLFeedSpecifier.m in Sources */,
 				84469CF01EFA3000004A6B28 /* RSOPMLAttributes.m in Sources */,
 				84469D381EFF2645004A6B28 /* RSSInJSONParser.swift in Sources */,
+				84E7E6A01F85780D0046719D /* ParserData.m in Sources */,
 				84469D301EFA3134004A6B28 /* RSRSSParser.m in Sources */,
 				84469D191EFA30A2004A6B28 /* RSDateParser.m in Sources */,
 				84469CFD1EFA3069004A6B28 /* RSSAXParser.m in Sources */,
-				84469CE21EFA2F3E004A6B28 /* ParserData.swift in Sources */,
 				84469CF21EFA3000004A6B28 /* RSOPMLDocument.m in Sources */,
 				84469CF61EFA3000004A6B28 /* RSOPMLItem.m in Sources */,
 				84D81BE41EFA2D3D00652332 /* ParsedItem.swift in Sources */,
diff --git a/Frameworks/RSParser/SAX/RSSAXParser.m b/Frameworks/RSParser/SAX/RSSAXParser.m
index 46916d91b..fe79e0c97 100755
--- a/Frameworks/RSParser/SAX/RSSAXParser.m
+++ b/Frameworks/RSParser/SAX/RSSAXParser.m
@@ -8,8 +8,8 @@
 
 #import <libxml/tree.h>
 #import <libxml/xmlstring.h>
-#import "RSSAXParser.h"
-#import "RSParserInternal.h"
+#import <RSParser/RSSAXParser.h>
+#import <RSParser/RSParserInternal.h>
 
 
 @interface RSSAXParser ()
diff --git a/Frameworks/RSParser/Utilities/NSData+RSParser.m b/Frameworks/RSParser/Utilities/NSData+RSParser.m
index 4974a1718..928fb02b4 100644
--- a/Frameworks/RSParser/Utilities/NSData+RSParser.m
+++ b/Frameworks/RSParser/Utilities/NSData+RSParser.m
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Ranchero Software, LLC. All rights reserved.
 //
 
-#import "NSData+RSParser.h"
+#import <RSParser/NSData+RSParser.h>
 
 /* TODO: find real-world cases where the isProbably* cases fail when they should succeed, and add them to tests.*/
 
diff --git a/Frameworks/RSParser/Utilities/NSString+RSParser.m b/Frameworks/RSParser/Utilities/NSString+RSParser.m
index d6c705841..40768975e 100755
--- a/Frameworks/RSParser/Utilities/NSString+RSParser.m
+++ b/Frameworks/RSParser/Utilities/NSString+RSParser.m
@@ -7,7 +7,7 @@
 //
 
 #import <CommonCrypto/CommonDigest.h>
-#import "NSString+RSParser.h"
+#import <RSParser/NSString+RSParser.h>
 
 
 @interface NSScanner (RSParser)
diff --git a/Frameworks/RSParser/Utilities/RSDateParser.m b/Frameworks/RSParser/Utilities/RSDateParser.m
index 3b7d19e88..295c459f6 100755
--- a/Frameworks/RSParser/Utilities/RSDateParser.m
+++ b/Frameworks/RSParser/Utilities/RSDateParser.m
@@ -7,7 +7,7 @@
 //
 
 #import <time.h>
-#import "RSDateParser.h"
+#import <RSParser/RSDateParser.h>
 
 typedef struct {
 	const char *abbreviation;
diff --git a/Frameworks/RSParser/Utilities/RSParserInternal.m b/Frameworks/RSParser/Utilities/RSParserInternal.m
index 1bd66ce40..ecc944b73 100755
--- a/Frameworks/RSParser/Utilities/RSParserInternal.m
+++ b/Frameworks/RSParser/Utilities/RSParserInternal.m
@@ -7,7 +7,7 @@
 //
 
 #import <CommonCrypto/CommonDigest.h>
-#import "RSParserInternal.h"
+#import <RSParser/RSParserInternal.h>
 
 
 static BOOL RSParserIsNil(id obj) {
diff --git a/Frameworks/RSWeb/RSWeb/URL+RSWeb.swift b/Frameworks/RSWeb/RSWeb/URL+RSWeb.swift
index d482fc167..99d039916 100755
--- a/Frameworks/RSWeb/RSWeb/URL+RSWeb.swift
+++ b/Frameworks/RSWeb/RSWeb/URL+RSWeb.swift
@@ -63,7 +63,7 @@ private extension String {
 			return self
 		}
 		
-		let index = self.index(self.startIndex, offsetBy: prefix.characters.count)
+		let index = self.index(self.startIndex, offsetBy: prefix.count)
 		return String(self[..<index])
 	}
 }