From 758f2511150b54e7473bb01c64e08e8e8cfaf333 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Thu, 14 Nov 2024 20:32:12 -0800
Subject: [PATCH] Remove a number of instances of the word master.

---
 NetNewsWire.xcodeproj/project.pbxproj         | 12 ++--
 iOS/Base.lproj/Main.storyboard                | 43 ++++++------
 .../Cell/FeedRowIdentifier.swift}             |  4 +-
 .../Cell/FeedTableViewCell.swift}             | 22 +++----
 .../Cell/FeedTableViewCellLayout.swift}       | 58 ++++++++--------
 .../Cell/FeedTableViewSectionHeader.swift}    | 22 +++----
 .../FeedTableViewSectionHeaderLayout.swift}   | 32 ++++-----
 .../Cell/FeedUnreadCountView.swift}           |  4 +-
 .../FeedViewController+Drag.swift}            |  4 +-
 .../FeedViewController+Drop.swift}            |  4 +-
 .../FeedViewController.swift}                 | 66 +++++++++----------
 .../RefreshProgressView.swift                 |  0
 .../RefreshProgressView.xib                   |  0
 .../ShadowTableChanges.swift                  |  0
 iOS/SceneCoordinator.swift                    | 16 ++---
 iOS/Settings/Settings.storyboard              | 53 ++++++++-------
 .../TimelinePreviewTableViewController.swift  |  6 +-
 .../Cell/MultilineUILabelSizer.swift          |  0
 .../Cell/SingleLineUILabelSizer.swift         |  0
 .../TimelineAccessibilityCellLayout.swift     |  4 +-
 .../Cell/TimelineCellData.swift}              |  4 +-
 .../Cell/TimelineCellLayout.swift             |  6 +-
 .../Cell/TimelineDefaultCellLayout.swift      |  4 +-
 .../Cell/TimelineTableViewCell.swift}         | 18 ++---
 .../Cell/UnreadIndicatorView.swift}           |  4 +-
 .../MarkAsReadAlertController.swift           |  0
 .../MasterTimelineTitleView.swift             |  0
 .../MasterTimelineTitleView.xib               |  0
 .../MasterTimelineUnreadCountView.swift       |  2 +-
 .../MasterTimelineViewController.swift        | 28 ++++----
 .../TimelineDataSource.swift}                 |  4 +-
 31 files changed, 209 insertions(+), 211 deletions(-)
 rename iOS/{MasterFeed/Cell/MasterFeedRowIdentifier.swift => Feed/Cell/FeedRowIdentifier.swift} (78%)
 rename iOS/{MasterFeed/Cell/MasterFeedTableViewCell.swift => Feed/Cell/FeedTableViewCell.swift} (82%)
 rename iOS/{MasterFeed/Cell/MasterFeedTableViewCellLayout.swift => Feed/Cell/FeedTableViewCellLayout.swift} (59%)
 rename iOS/{MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift => Feed/Cell/FeedTableViewSectionHeader.swift} (85%)
 rename iOS/{MasterFeed/Cell/MasterFeedTableViewSectionHeaderLayout.swift => Feed/Cell/FeedTableViewSectionHeaderLayout.swift} (62%)
 rename iOS/{MasterFeed/Cell/MasterFeedUnreadCountView.swift => Feed/Cell/FeedUnreadCountView.swift} (97%)
 rename iOS/{MasterFeed/MasterFeedViewController+Drag.swift => Feed/FeedViewController+Drag.swift} (89%)
 rename iOS/{MasterFeed/MasterFeedViewController+Drop.swift => Feed/FeedViewController+Drop.swift} (98%)
 rename iOS/{MasterFeed/MasterFeedViewController.swift => Feed/FeedViewController.swift} (93%)
 rename iOS/{MasterFeed => Feed}/RefreshProgressView.swift (100%)
 rename iOS/{MasterFeed => Feed}/RefreshProgressView.xib (100%)
 rename iOS/{MasterFeed => Feed}/ShadowTableChanges.swift (100%)
 rename iOS/{MasterTimeline => Timeline}/Cell/MultilineUILabelSizer.swift (100%)
 rename iOS/{MasterTimeline => Timeline}/Cell/SingleLineUILabelSizer.swift (100%)
 rename iOS/{MasterTimeline => Timeline}/Cell/TimelineAccessibilityCellLayout.swift (93%)
 rename iOS/{MasterTimeline/Cell/MasterTimelineCellData.swift => Timeline/Cell/TimelineCellData.swift} (97%)
 rename iOS/{MasterTimeline => Timeline}/Cell/TimelineCellLayout.swift (87%)
 rename iOS/{MasterTimeline => Timeline}/Cell/TimelineDefaultCellLayout.swift (95%)
 rename iOS/{MasterTimeline/Cell/MasterTimelineTableViewCell.swift => Timeline/Cell/TimelineTableViewCell.swift} (93%)
 rename iOS/{MasterTimeline/Cell/MasterUnreadIndicatorView.swift => Timeline/Cell/UnreadIndicatorView.swift} (78%)
 rename iOS/{MasterTimeline => Timeline}/MarkAsReadAlertController.swift (100%)
 rename iOS/{MasterTimeline => Timeline}/MasterTimelineTitleView.swift (100%)
 rename iOS/{MasterTimeline => Timeline}/MasterTimelineTitleView.xib (100%)
 rename iOS/{MasterTimeline => Timeline}/MasterTimelineUnreadCountView.swift (93%)
 rename iOS/{MasterTimeline => Timeline}/MasterTimelineViewController.swift (96%)
 rename iOS/{MasterTimeline/MasterTimelineDataSource.swift => Timeline/TimelineDataSource.swift} (51%)

diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index c92388493..edca111f7 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -545,8 +545,8 @@
 		843006D42CE16406001B820C /* Add */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Add; sourceTree = "<group>"; };
 		843006E42CE16409001B820C /* Account */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Account; sourceTree = "<group>"; };
 		843006FA2CE1640C001B820C /* Article */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Article; sourceTree = "<group>"; };
-		843007182CE1640F001B820C /* MasterTimeline */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = MasterTimeline; sourceTree = "<group>"; };
-		843007342CE16412001B820C /* MasterFeed */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = MasterFeed; sourceTree = "<group>"; };
+		843007182CE1640F001B820C /* Timeline */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Timeline; sourceTree = "<group>"; };
+		843007342CE16412001B820C /* Feed */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Feed; sourceTree = "<group>"; };
 		845E30622CE1639500770277 /* Resources */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (845E306D2CE1639500770277 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, 845E306E2CE1639500770277 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Resources; sourceTree = "<group>"; };
 		84BAE0AA2CE1C4D500402E69 /* Mac */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (84BAE1402CE1C4D500402E69 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, 84BAE1412CE1C4D500402E69 /* PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet */, 84BAE1422CE1C4D500402E69 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, 84BAE1432CE1C4D500402E69 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = Mac; sourceTree = "<group>"; };
 		84BAE17F2CE1C7F800402E69 /* IntentsExtension */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (84BAE1812CE1C7F800402E69 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = IntentsExtension; sourceTree = "<group>"; };
@@ -730,8 +730,8 @@
 				51BB7C262335A8E5008E8144 /* ArticleActivityItemSource.swift */,
 				C5A6ED5123C9AF4300AB6BE2 /* TitleActivityItemSource.swift */,
 				51B62E67233186730085F949 /* IconView.swift */,
-				843007342CE16412001B820C /* MasterFeed */,
-				843007182CE1640F001B820C /* MasterTimeline */,
+				843007342CE16412001B820C /* Feed */,
+				843007182CE1640F001B820C /* Timeline */,
 				843006FA2CE1640C001B820C /* Article */,
 				843006E42CE16409001B820C /* Account */,
 				843006D42CE16406001B820C /* Add */,
@@ -907,8 +907,8 @@
 				843006D42CE16406001B820C /* Add */,
 				843006E42CE16409001B820C /* Account */,
 				843006FA2CE1640C001B820C /* Article */,
-				843007182CE1640F001B820C /* MasterTimeline */,
-				843007342CE16412001B820C /* MasterFeed */,
+				843007182CE1640F001B820C /* Timeline */,
+				843007342CE16412001B820C /* Feed */,
 				845E30622CE1639500770277 /* Resources */,
 				84C1EC192CDFE49100C7456A /* Shared */,
 			);
diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index 44386a8f9..8a9779033 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/iOS/Base.lproj/Main.storyboard
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -18,7 +17,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="h1Q-FS-jlg" customClass="ArticleSearchBar" customModule="NetNewsWire" customModuleProvider="target">
+                            <view hidden="YES" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h1Q-FS-jlg" customClass="ArticleSearchBar" customModule="NetNewsWire" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="777" width="414" height="36"/>
                                 <color key="backgroundColor" name="barBackgroundColor"/>
                             </view>
@@ -113,14 +112,14 @@
         <!--Timeline-->
         <scene sceneID="fag-XH-avP">
             <objects>
-                <tableViewController storyboardIdentifier="MasterTimelineViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" clearsSelectionOnViewWillAppear="NO" id="Kyk-vK-QRX" customClass="MasterTimelineViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController storyboardIdentifier="TimelineViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" clearsSelectionOnViewWillAppear="NO" id="Kyk-vK-QRX" customClass="TimelineViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="onDrag" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="mtv-Ik-FoJ">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="725"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="721"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="208" id="T5d-L4-OKG" customClass="MasterTimelineTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="28" width="414" height="208"/>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="208" id="T5d-L4-OKG" customClass="TimelineTableViewCell">
+                                <rect key="frame" x="0.0" y="50" width="414" height="208"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="T5d-L4-OKG" id="QKC-jN-XDy">
                                     <rect key="frame" x="0.0" y="0.0" width="414" height="208"/>
@@ -159,13 +158,13 @@
         <!--Feeds-->
         <scene sceneID="smW-Zh-WAh">
             <objects>
-                <tableViewController storyboardIdentifier="MasterFeedViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" clearsSelectionOnViewWillAppear="NO" id="7bK-jq-Zjz" customClass="MasterFeedViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController storyboardIdentifier="FeedViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" clearsSelectionOnViewWillAppear="NO" id="7bK-jq-Zjz" customClass="FeedViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="r7i-6Z-zg0">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" id="zNG-5C-pQm" customClass="MasterFeedTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" id="zNG-5C-pQm" customClass="FeedTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="55.5" width="414" height="43.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="zNG-5C-pQm" id="5gB-Jr-qIo">
@@ -247,7 +246,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RmY-a3-hUg">
-                                <rect key="frame" x="362" y="44" width="44" height="44"/>
+                                <rect key="frame" x="362" y="48" width="44" height="44"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="44" id="56o-Zr-T0w"/>
                                     <constraint firstAttribute="height" constant="44" id="lBg-Wy-k9P"/>
@@ -259,7 +258,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" clipsSubviews="YES" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cXR-ll-xBx">
-                                <rect key="frame" x="8" y="44" width="44" height="44"/>
+                                <rect key="frame" x="8" y="48" width="44" height="44"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="44" id="6kc-Gw-KbZ"/>
                                     <constraint firstAttribute="width" constant="44" id="cBq-gs-WzN"/>
@@ -329,7 +328,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Article Title" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iFp-rn-HhQ">
-                                <rect key="frame" x="20" y="74.5" width="135.5" height="33.5"/>
+                                <rect key="frame" x="20" y="74.5" width="136" height="33.5"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -397,16 +396,16 @@
         </scene>
     </scenes>
     <resources>
-        <image name="chevron.down" catalog="system" width="128" height="72"/>
-        <image name="chevron.down.circle" catalog="system" width="128" height="121"/>
-        <image name="chevron.up" catalog="system" width="128" height="72"/>
-        <image name="circle" catalog="system" width="128" height="121"/>
-        <image name="gear" catalog="system" width="128" height="119"/>
-        <image name="line.3.horizontal.decrease.circle" catalog="system" width="128" height="121"/>
+        <image name="chevron.down" catalog="system" width="128" height="70"/>
+        <image name="chevron.down.circle" catalog="system" width="128" height="123"/>
+        <image name="chevron.up" catalog="system" width="128" height="70"/>
+        <image name="circle" catalog="system" width="128" height="123"/>
+        <image name="gear" catalog="system" width="128" height="122"/>
+        <image name="line.3.horizontal.decrease.circle" catalog="system" width="128" height="123"/>
         <image name="markAllAsRead" width="13" height="20"/>
-        <image name="multiply.circle.fill" catalog="system" width="128" height="121"/>
-        <image name="square.and.arrow.up" catalog="system" width="115" height="128"/>
-        <image name="square.and.arrow.up.fill" catalog="system" width="115" height="128"/>
+        <image name="multiply.circle.fill" catalog="system" width="128" height="123"/>
+        <image name="square.and.arrow.up" catalog="system" width="110" height="128"/>
+        <image name="square.and.arrow.up.fill" catalog="system" width="117" height="128"/>
         <image name="star" catalog="system" width="128" height="116"/>
         <namedColor name="barBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/iOS/MasterFeed/Cell/MasterFeedRowIdentifier.swift b/iOS/Feed/Cell/FeedRowIdentifier.swift
similarity index 78%
rename from iOS/MasterFeed/Cell/MasterFeedRowIdentifier.swift
rename to iOS/Feed/Cell/FeedRowIdentifier.swift
index 8737decf3..22eab8f51 100644
--- a/iOS/MasterFeed/Cell/MasterFeedRowIdentifier.swift
+++ b/iOS/Feed/Cell/FeedRowIdentifier.swift
@@ -1,5 +1,5 @@
 //
-//  MasterFeedRowIdentifier.swift
+//  FeedRowIdentifier.swift
 //  NetNewsWire-iOS
 //
 //  Created by Maurice Parker on 10/20/21.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-class MasterFeedRowIdentifier: NSObject, NSCopying {
+class FeedRowIdentifier: NSObject, NSCopying {
 
 	var indexPath: IndexPath
 	
diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift b/iOS/Feed/Cell/FeedTableViewCell.swift
similarity index 82%
rename from iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
rename to iOS/Feed/Cell/FeedTableViewCell.swift
index bf9c5a8da..b9db02931 100644
--- a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
+++ b/iOS/Feed/Cell/FeedTableViewCell.swift
@@ -1,5 +1,5 @@
 //
-//  MasterTableViewCell.swift
+//  FeedTableViewCell.swift
 //  NetNewsWire
 //
 //  Created by Brent Simmons on 8/1/15.
@@ -11,13 +11,13 @@ import RSCore
 import Account
 import RSTree
 
-protocol MasterFeedTableViewCellDelegate: AnyObject {
-	func masterFeedTableViewCellDisclosureDidToggle(_ sender: MasterFeedTableViewCell, expanding: Bool)
+protocol FeedTableViewCellDelegate: AnyObject {
+	func feedTableViewCellDisclosureDidToggle(_ sender: FeedTableViewCell, expanding: Bool)
 }
 
-class MasterFeedTableViewCell : VibrantTableViewCell {
+class FeedTableViewCell : VibrantTableViewCell {
 
-	weak var delegate: MasterFeedTableViewCellDelegate?
+	weak var delegate: FeedTableViewCellDelegate?
 
 	override var accessibilityLabel: String? {
 		set {}
@@ -103,7 +103,7 @@ class MasterFeedTableViewCell : VibrantTableViewCell {
 	
 	private var isDisclosureExpanded = false
 	private var disclosureButton: UIButton?
-	private var unreadCountView = MasterFeedUnreadCountView(frame: CGRect.zero)
+	private var unreadCountView = FeedUnreadCountView(frame: CGRect.zero)
 	private var isShowingEditControl = false
 	
 	required init?(coder: NSCoder) {
@@ -136,20 +136,20 @@ class MasterFeedTableViewCell : VibrantTableViewCell {
 	}
 	
 	override func sizeThatFits(_ size: CGSize) -> CGSize {
-		let layout = MasterFeedTableViewCellLayout(cellWidth: bounds.size.width, insets: safeAreaInsets, label: titleView, unreadCountView: unreadCountView, showingEditingControl: isShowingEditControl, indent: indentationLevel == 1, shouldShowDisclosure: isDisclosureAvailable)
+		let layout = FeedTableViewCellLayout(cellWidth: bounds.size.width, insets: safeAreaInsets, label: titleView, unreadCountView: unreadCountView, showingEditingControl: isShowingEditControl, indent: indentationLevel == 1, shouldShowDisclosure: isDisclosureAvailable)
 		return CGSize(width: bounds.width, height: layout.height)
 	}
 	
 	override func layoutSubviews() {
 		super.layoutSubviews()
-		let layout = MasterFeedTableViewCellLayout(cellWidth: bounds.size.width, insets: safeAreaInsets, label: titleView, unreadCountView: unreadCountView, showingEditingControl: isShowingEditControl, indent: indentationLevel == 1, shouldShowDisclosure: isDisclosureAvailable)
+		let layout = FeedTableViewCellLayout(cellWidth: bounds.size.width, insets: safeAreaInsets, label: titleView, unreadCountView: unreadCountView, showingEditingControl: isShowingEditControl, indent: indentationLevel == 1, shouldShowDisclosure: isDisclosureAvailable)
 		layoutWith(layout)
 	}
 	
 	@objc func buttonPressed(_ sender: UIButton) {
 		if isDisclosureAvailable {
 			setDisclosure(isExpanded: !isDisclosureExpanded, animated: true)
-			delegate?.masterFeedTableViewCellDisclosureDidToggle(self, expanding: isDisclosureExpanded)
+			delegate?.feedTableViewCellDisclosureDidToggle(self, expanding: isDisclosureExpanded)
 		}
 	}
 	
@@ -180,7 +180,7 @@ class MasterFeedTableViewCell : VibrantTableViewCell {
 	
 }
 
-private extension MasterFeedTableViewCell {
+private extension FeedTableViewCell {
 
 	func commonInit() {
 		addSubviewAtInit(unreadCountView)
@@ -206,7 +206,7 @@ private extension MasterFeedTableViewCell {
 		view.translatesAutoresizingMaskIntoConstraints = false
 	}
 
-	func layoutWith(_ layout: MasterFeedTableViewCellLayout) {
+	func layoutWith(_ layout: FeedTableViewCellLayout) {
 		iconView.setFrameIfNotEqual(layout.faviconRect)
 		titleView.setFrameIfNotEqual(layout.titleRect)
 		unreadCountView.setFrameIfNotEqual(layout.unreadCountRect)
diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift b/iOS/Feed/Cell/FeedTableViewCellLayout.swift
similarity index 59%
rename from iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift
rename to iOS/Feed/Cell/FeedTableViewCellLayout.swift
index 4ff894978..6ecb4d8a6 100644
--- a/iOS/MasterFeed/Cell/MasterFeedTableViewCellLayout.swift
+++ b/iOS/Feed/Cell/FeedTableViewCellLayout.swift
@@ -1,5 +1,5 @@
 //
-//  MasterTableViewCellLayout.swift
+//  TableViewCellLayout.swift
 //  NetNewsWire
 //
 //  Created by Brent Simmons on 11/24/17.
@@ -9,7 +9,7 @@
 import UIKit
 import RSCore
 
-struct MasterFeedTableViewCellLayout {
+struct FeedTableViewCellLayout {
 
 	private static let indentWidth = CGFloat(integerLiteral: 42)
 	private static let editingControlIndent = CGFloat(integerLiteral: 40)
@@ -32,18 +32,18 @@ struct MasterFeedTableViewCellLayout {
 	
 	let height: CGFloat
 	
-	init(cellWidth: CGFloat, insets: UIEdgeInsets, label: UILabel, unreadCountView: MasterFeedUnreadCountView, showingEditingControl: Bool, indent: Bool, shouldShowDisclosure: Bool) {
+	init(cellWidth: CGFloat, insets: UIEdgeInsets, label: UILabel, unreadCountView: FeedUnreadCountView, showingEditingControl: Bool, indent: Bool, shouldShowDisclosure: Bool) {
 
 		var initialIndent = insets.left
 		if indent {
-			initialIndent += MasterFeedTableViewCellLayout.indentWidth
+			initialIndent += FeedTableViewCellLayout.indentWidth
 		}
 		let bounds = CGRect(x: initialIndent, y: 0.0, width: floor(cellWidth - initialIndent - insets.right), height: 0.0)
 		
 		// Disclosure Button
 		var rDisclosure = CGRect.zero
 		if shouldShowDisclosure {
-			rDisclosure.size = MasterFeedTableViewCellLayout.disclosureButtonSize
+			rDisclosure.size = FeedTableViewCellLayout.disclosureButtonSize
 			rDisclosure.origin.x = bounds.origin.x
 		}
 
@@ -51,10 +51,10 @@ struct MasterFeedTableViewCellLayout {
 		var rFavicon = CGRect.zero
 		if !shouldShowDisclosure {
 			let x = bounds.origin.x
-			let y = UIFontMetrics.default.scaledValue(for: MasterFeedTableViewCellLayout.verticalPadding) +
+			let y = UIFontMetrics.default.scaledValue(for: FeedTableViewCellLayout.verticalPadding) +
 				label.font.lineHeight / 2.0 -
-				MasterFeedTableViewCellLayout.imageSize.height / 2.0
-			rFavicon = CGRect(x: x, y: y, width: MasterFeedTableViewCellLayout.imageSize.width, height: MasterFeedTableViewCellLayout.imageSize.height)
+				FeedTableViewCellLayout.imageSize.height / 2.0
+			rFavicon = CGRect(x: x, y: y, width: FeedTableViewCellLayout.imageSize.width, height: FeedTableViewCellLayout.imageSize.height)
 		}
 
 		// Unread Count
@@ -64,21 +64,21 @@ struct MasterFeedTableViewCellLayout {
 		var rUnread = CGRect.zero
 		if !unreadCountIsHidden {
 			rUnread.size = unreadCountSize
-			rUnread.origin.x = bounds.maxX - (MasterFeedTableViewCellLayout.unreadCountMarginRight + unreadCountSize.width)
+			rUnread.origin.x = bounds.maxX - (FeedTableViewCellLayout.unreadCountMarginRight + unreadCountSize.width)
 		}
 		
 		// Title
-		var rLabelx = insets.left + MasterFeedTableViewCellLayout.disclosureButtonSize.width
+		var rLabelx = insets.left + FeedTableViewCellLayout.disclosureButtonSize.width
 		if !shouldShowDisclosure {
-			rLabelx = rLabelx + MasterFeedTableViewCellLayout.imageSize.width + MasterFeedTableViewCellLayout.imageMarginRight
+			rLabelx = rLabelx + FeedTableViewCellLayout.imageSize.width + FeedTableViewCellLayout.imageMarginRight
 		}
-		let rLabely = UIFontMetrics.default.scaledValue(for: MasterFeedTableViewCellLayout.verticalPadding)
+		let rLabely = UIFontMetrics.default.scaledValue(for: FeedTableViewCellLayout.verticalPadding)
 		
 		var labelWidth = CGFloat.zero
 		if !unreadCountIsHidden {
-			labelWidth = cellWidth - (rLabelx + MasterFeedTableViewCellLayout.labelMarginRight + (cellWidth - rUnread.minX))
+			labelWidth = cellWidth - (rLabelx + FeedTableViewCellLayout.labelMarginRight + (cellWidth - rUnread.minX))
 		} else {
-			labelWidth = cellWidth - (rLabelx + MasterFeedTableViewCellLayout.labelMarginRight)
+			labelWidth = cellWidth - (rLabelx + FeedTableViewCellLayout.labelMarginRight)
 		}
 		
 		let labelSizeInfo = MultilineUILabelSizer.size(for: label.text ?? "", font: label.font, numberOfLines: 0, width: Int(floor(labelWidth)))
@@ -87,44 +87,44 @@ struct MasterFeedTableViewCellLayout {
 		// We do this because we don't want the row height to change when the editing controls are brought out.  We will
 		// handle the missing space, but removing it from the label and truncating.
 		if showingEditingControl {
-			rDisclosure.origin.x += MasterFeedTableViewCellLayout.editingControlIndent
-			rFavicon.origin.x += MasterFeedTableViewCellLayout.editingControlIndent
-			rLabelx += MasterFeedTableViewCellLayout.editingControlIndent
+			rDisclosure.origin.x += FeedTableViewCellLayout.editingControlIndent
+			rFavicon.origin.x += FeedTableViewCellLayout.editingControlIndent
+			rLabelx += FeedTableViewCellLayout.editingControlIndent
 			if !unreadCountIsHidden {
-				rUnread.origin.x -= MasterFeedTableViewCellLayout.editingControlIndent
-				labelWidth = cellWidth - (rLabelx + MasterFeedTableViewCellLayout.labelMarginRight + (cellWidth - rUnread.minX))
+				rUnread.origin.x -= FeedTableViewCellLayout.editingControlIndent
+				labelWidth = cellWidth - (rLabelx + FeedTableViewCellLayout.labelMarginRight + (cellWidth - rUnread.minX))
 			} else {
-				labelWidth = cellWidth - (rLabelx + MasterFeedTableViewCellLayout.labelMarginRight + MasterFeedTableViewCellLayout.editingControlIndent)
+				labelWidth = cellWidth - (rLabelx + FeedTableViewCellLayout.labelMarginRight + FeedTableViewCellLayout.editingControlIndent)
 			}
 		}
 
 		var rLabel = CGRect(x: rLabelx, y: rLabely, width: labelWidth, height: labelSizeInfo.size.height)
 		
 		// Determine cell height
-		let paddedLabelHeight = rLabel.maxY + UIFontMetrics.default.scaledValue(for: MasterFeedTableViewCellLayout.verticalPadding)
+		let paddedLabelHeight = rLabel.maxY + UIFontMetrics.default.scaledValue(for: FeedTableViewCellLayout.verticalPadding)
 		let maxGraphicsHeight = [rFavicon, rUnread, rDisclosure].maxY()
 		var cellHeight = max(paddedLabelHeight, maxGraphicsHeight)
-		if cellHeight < MasterFeedTableViewCellLayout.minRowHeight {
-			cellHeight = MasterFeedTableViewCellLayout.minRowHeight
+		if cellHeight < FeedTableViewCellLayout.minRowHeight {
+			cellHeight = FeedTableViewCellLayout.minRowHeight
 		}
 		
 		// Center in Cell
 		let newBounds = CGRect(x: bounds.origin.x, y: bounds.origin.y, width: bounds.width, height: cellHeight)
 		if !unreadCountIsHidden {
-			rUnread = MasterFeedTableViewCellLayout.centerVertically(rUnread, newBounds)
+			rUnread = FeedTableViewCellLayout.centerVertically(rUnread, newBounds)
 		}
 		if shouldShowDisclosure {
-			rDisclosure = MasterFeedTableViewCellLayout.centerVertically(rDisclosure, newBounds)
+			rDisclosure = FeedTableViewCellLayout.centerVertically(rDisclosure, newBounds)
 		}
 
 		// Small fonts and the Favicon need centered if we hit the minimum row height
-		if cellHeight == MasterFeedTableViewCellLayout.minRowHeight {
-			rLabel = MasterFeedTableViewCellLayout.centerVertically(rLabel, newBounds)
-			rFavicon = MasterFeedTableViewCellLayout.centerVertically(rFavicon, newBounds)
+		if cellHeight == FeedTableViewCellLayout.minRowHeight {
+			rLabel = FeedTableViewCellLayout.centerVertically(rLabel, newBounds)
+			rFavicon = FeedTableViewCellLayout.centerVertically(rFavicon, newBounds)
 		}
 
 		//  Separator Insets
-		let separatorInset = MasterFeedTableViewCellLayout.disclosureButtonSize.width
+		let separatorInset = FeedTableViewCellLayout.disclosureButtonSize.width
 		separatorRect = CGRect(x: separatorInset, y: cellHeight - 0.5, width: cellWidth - separatorInset, height: 0.5)
 		
 		//  Assign the properties
diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift b/iOS/Feed/Cell/FeedTableViewSectionHeader.swift
similarity index 85%
rename from iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift
rename to iOS/Feed/Cell/FeedTableViewSectionHeader.swift
index ee9cc296b..e4a71147d 100644
--- a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift
+++ b/iOS/Feed/Cell/FeedTableViewSectionHeader.swift
@@ -1,5 +1,5 @@
 //
-//  MasterTableViewSectionHeader.swift
+//  TableViewSectionHeader.swift
 //  NetNewsWire
 //
 //  Created by Maurice Parker on 4/18/19.
@@ -8,13 +8,13 @@
 
 import UIKit
 
-protocol MasterFeedTableViewSectionHeaderDelegate {
-	func masterFeedTableViewSectionHeaderDisclosureDidToggle(_ sender: MasterFeedTableViewSectionHeader)
+protocol FeedTableViewSectionHeaderDelegate {
+	func feedTableViewSectionHeaderDisclosureDidToggle(_ sender: FeedTableViewSectionHeader)
 }
 
-class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView {
+class FeedTableViewSectionHeader: UITableViewHeaderFooterView {
 	
-	var delegate: MasterFeedTableViewSectionHeaderDelegate?
+	var delegate: FeedTableViewSectionHeaderDelegate?
 	
 	override var accessibilityLabel: String? {
 		set {}
@@ -81,7 +81,7 @@ class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 		return label
 	}()
 	
-	private let unreadCountView = MasterFeedUnreadCountView(frame: CGRect.zero)
+	private let unreadCountView = FeedUnreadCountView(frame: CGRect.zero)
 
 	private lazy var disclosureButton: UIButton = {
 		let button = NonIntrinsicButton()
@@ -116,14 +116,14 @@ class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 	}
 	
 	override func sizeThatFits(_ size: CGSize) -> CGSize {
-		let layout = MasterFeedTableViewSectionHeaderLayout(cellWidth: size.width, insets: safeAreaInsets, label: titleView, unreadCountView: unreadCountView)
+		let layout = FeedTableViewSectionHeaderLayout(cellWidth: size.width, insets: safeAreaInsets, label: titleView, unreadCountView: unreadCountView)
 		return CGSize(width: bounds.width, height: layout.height)
 		
 	}
 
 	override func layoutSubviews() {
 		super.layoutSubviews()
-		let layout = MasterFeedTableViewSectionHeaderLayout(cellWidth: contentView.bounds.size.width,
+		let layout = FeedTableViewSectionHeaderLayout(cellWidth: contentView.bounds.size.width,
 															insets: contentView.safeAreaInsets,
 															label: titleView,
 															unreadCountView: unreadCountView)
@@ -132,10 +132,10 @@ class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 
 }
 
-private extension MasterFeedTableViewSectionHeader {
+private extension FeedTableViewSectionHeader {
 	
 	@objc func toggleDisclosure() {
-		delegate?.masterFeedTableViewSectionHeaderDisclosureDidToggle(self)
+		delegate?.feedTableViewSectionHeaderDisclosureDidToggle(self)
 	}
 	
 	func commonInit() {
@@ -187,7 +187,7 @@ private extension MasterFeedTableViewSectionHeader {
 		view.translatesAutoresizingMaskIntoConstraints = false
 	}
 	
-	func layoutWith(_ layout: MasterFeedTableViewSectionHeaderLayout) {
+	func layoutWith(_ layout: FeedTableViewSectionHeaderLayout) {
 		titleView.setFrameIfNotEqual(layout.titleRect)
 		unreadCountView.setFrameIfNotEqual(layout.unreadCountRect)
 		disclosureButton.setFrameIfNotEqual(layout.disclosureButtonRect)
diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeaderLayout.swift b/iOS/Feed/Cell/FeedTableViewSectionHeaderLayout.swift
similarity index 62%
rename from iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeaderLayout.swift
rename to iOS/Feed/Cell/FeedTableViewSectionHeaderLayout.swift
index 1421e16f0..6cdefefb4 100644
--- a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeaderLayout.swift
+++ b/iOS/Feed/Cell/FeedTableViewSectionHeaderLayout.swift
@@ -1,5 +1,5 @@
 //
-//  MasterFeedTableViewSectionHeaderLayout.swift
+//  FeedTableViewSectionHeaderLayout.swift
 //  NetNewsWire-iOS
 //
 //  Created by Maurice Parker on 11/5/19.
@@ -9,7 +9,7 @@
 import UIKit
 import RSCore
 
-struct MasterFeedTableViewSectionHeaderLayout {
+struct FeedTableViewSectionHeaderLayout {
 
 	private static let labelMarginRight = CGFloat(integerLiteral: 8)
 	private static let unreadCountMarginRight = CGFloat(integerLiteral: 16)
@@ -24,13 +24,13 @@ struct MasterFeedTableViewSectionHeaderLayout {
 	
 	let height: CGFloat
 	
-	init(cellWidth: CGFloat, insets: UIEdgeInsets, label: UILabel, unreadCountView: MasterFeedUnreadCountView) {
+	init(cellWidth: CGFloat, insets: UIEdgeInsets, label: UILabel, unreadCountView: FeedUnreadCountView) {
 
 		let bounds = CGRect(x: insets.left, y: 0.0, width: floor(cellWidth - insets.right), height: 0.0)
 		
 		// Disclosure Button
 		var rDisclosure = CGRect.zero
-		rDisclosure.size = MasterFeedTableViewSectionHeaderLayout.disclosureButtonSize
+		rDisclosure.size = FeedTableViewSectionHeaderLayout.disclosureButtonSize
 		rDisclosure.origin.x = bounds.origin.x
 
 		// Unread Count
@@ -40,43 +40,43 @@ struct MasterFeedTableViewSectionHeaderLayout {
 		var rUnread = CGRect.zero
 		if !unreadCountIsHidden {
 			rUnread.size = unreadCountSize
-			rUnread.origin.x = bounds.maxX - (MasterFeedTableViewSectionHeaderLayout.unreadCountMarginRight + unreadCountSize.width)
+			rUnread.origin.x = bounds.maxX - (FeedTableViewSectionHeaderLayout.unreadCountMarginRight + unreadCountSize.width)
 		}
 		
 		// Max Unread Count
 		// We can't reload Section Headers so we don't let the title extend into the (probably) worse case Unread Count area.
-		let maxUnreadCountView = MasterFeedUnreadCountView(frame: CGRect.zero)
+		let maxUnreadCountView = FeedUnreadCountView(frame: CGRect.zero)
 		maxUnreadCountView.unreadCount = 888
 		let maxUnreadCountSize = maxUnreadCountView.contentSize
 
 		// Title
-		let rLabelx = insets.left + MasterFeedTableViewSectionHeaderLayout.disclosureButtonSize.width
-		let rLabely = UIFontMetrics.default.scaledValue(for: MasterFeedTableViewSectionHeaderLayout.verticalPadding)
+		let rLabelx = insets.left + FeedTableViewSectionHeaderLayout.disclosureButtonSize.width
+		let rLabely = UIFontMetrics.default.scaledValue(for: FeedTableViewSectionHeaderLayout.verticalPadding)
 		
 		var labelWidth = CGFloat.zero
-		labelWidth = cellWidth - (rLabelx + MasterFeedTableViewSectionHeaderLayout.labelMarginRight + maxUnreadCountSize.width + MasterFeedTableViewSectionHeaderLayout.unreadCountMarginRight)
+		labelWidth = cellWidth - (rLabelx + FeedTableViewSectionHeaderLayout.labelMarginRight + maxUnreadCountSize.width + FeedTableViewSectionHeaderLayout.unreadCountMarginRight)
 		
 		let labelSizeInfo = MultilineUILabelSizer.size(for: label.text ?? "", font: label.font, numberOfLines: 0, width: Int(floor(labelWidth)))
 		var rLabel = CGRect(x: rLabelx, y: rLabely, width: labelWidth, height: labelSizeInfo.size.height)
 		
 		// Determine cell height
-		let paddedLabelHeight = rLabel.maxY + UIFontMetrics.default.scaledValue(for: MasterFeedTableViewSectionHeaderLayout.verticalPadding)
+		let paddedLabelHeight = rLabel.maxY + UIFontMetrics.default.scaledValue(for: FeedTableViewSectionHeaderLayout.verticalPadding)
 		let maxGraphicsHeight = [rUnread, rDisclosure].maxY()
 		var cellHeight = max(paddedLabelHeight, maxGraphicsHeight)
-		if cellHeight < MasterFeedTableViewSectionHeaderLayout.minRowHeight {
-			cellHeight = MasterFeedTableViewSectionHeaderLayout.minRowHeight
+		if cellHeight < FeedTableViewSectionHeaderLayout.minRowHeight {
+			cellHeight = FeedTableViewSectionHeaderLayout.minRowHeight
 		}
 		
 		// Center in Cell
 		let newBounds = CGRect(x: bounds.origin.x, y: bounds.origin.y, width: bounds.width, height: cellHeight)
 		if !unreadCountIsHidden {
-			rUnread = MasterFeedTableViewCellLayout.centerVertically(rUnread, newBounds)
+			rUnread = FeedTableViewCellLayout.centerVertically(rUnread, newBounds)
 		}
-		rDisclosure = MasterFeedTableViewCellLayout.centerVertically(rDisclosure, newBounds)
+		rDisclosure = FeedTableViewCellLayout.centerVertically(rDisclosure, newBounds)
 
 		// Small fonts need centered if we hit the minimum row height
-		if cellHeight == MasterFeedTableViewSectionHeaderLayout.minRowHeight {
-			rLabel = MasterFeedTableViewCellLayout.centerVertically(rLabel, newBounds)
+		if cellHeight == FeedTableViewSectionHeaderLayout.minRowHeight {
+			rLabel = FeedTableViewCellLayout.centerVertically(rLabel, newBounds)
 		}
 		
 		//  Assign the properties
diff --git a/iOS/MasterFeed/Cell/MasterFeedUnreadCountView.swift b/iOS/Feed/Cell/FeedUnreadCountView.swift
similarity index 97%
rename from iOS/MasterFeed/Cell/MasterFeedUnreadCountView.swift
rename to iOS/Feed/Cell/FeedUnreadCountView.swift
index e084036b9..6e6b6e4c9 100644
--- a/iOS/MasterFeed/Cell/MasterFeedUnreadCountView.swift
+++ b/iOS/Feed/Cell/FeedUnreadCountView.swift
@@ -1,5 +1,5 @@
 //
-//  MasterUnreadCountView.swift
+//  UnreadCountView.swift
 //  NetNewsWire
 //
 //  Created by Brent Simmons on 11/22/15.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class MasterFeedUnreadCountView : UIView {
+class FeedUnreadCountView : UIView {
 	
 	var padding: UIEdgeInsets {
 		return UIEdgeInsets(top: 1.0, left: 9.0, bottom: 1.0, right: 9.0)
diff --git a/iOS/MasterFeed/MasterFeedViewController+Drag.swift b/iOS/Feed/FeedViewController+Drag.swift
similarity index 89%
rename from iOS/MasterFeed/MasterFeedViewController+Drag.swift
rename to iOS/Feed/FeedViewController+Drag.swift
index edd63ac34..14c778057 100644
--- a/iOS/MasterFeed/MasterFeedViewController+Drag.swift
+++ b/iOS/Feed/FeedViewController+Drag.swift
@@ -1,5 +1,5 @@
 //
-//  MasterFeedViewController+Drag.swift
+//  FeedViewController+Drag.swift
 //  NetNewsWire-iOS
 //
 //  Created by Maurice Parker on 11/20/19.
@@ -11,7 +11,7 @@ import MobileCoreServices
 import Account
 import UniformTypeIdentifiers
 
-extension MasterFeedViewController: UITableViewDragDelegate {
+extension FeedViewController: UITableViewDragDelegate {
 	
 	func tableView(_ tableView: UITableView, itemsForBeginning session: UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
 		guard let node = coordinator.nodeFor(indexPath), let feed = node.representedObject as? Feed else {
diff --git a/iOS/MasterFeed/MasterFeedViewController+Drop.swift b/iOS/Feed/FeedViewController+Drop.swift
similarity index 98%
rename from iOS/MasterFeed/MasterFeedViewController+Drop.swift
rename to iOS/Feed/FeedViewController+Drop.swift
index 1249d5db7..677565816 100644
--- a/iOS/MasterFeed/MasterFeedViewController+Drop.swift
+++ b/iOS/Feed/FeedViewController+Drop.swift
@@ -1,5 +1,5 @@
 //
-//  MasterFeedViewController+Drop.swift
+//  FeedViewController+Drop.swift
 //  NetNewsWire-iOS
 //
 //  Created by Maurice Parker on 11/20/19.
@@ -11,7 +11,7 @@ import RSCore
 import Account
 import RSTree
 
-extension MasterFeedViewController: UITableViewDropDelegate {
+extension FeedViewController: UITableViewDropDelegate {
 	
 	func tableView(_ tableView: UITableView, canHandle session: UIDropSession) -> Bool {
 		return session.localDragSession != nil
diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/Feed/FeedViewController.swift
similarity index 93%
rename from iOS/MasterFeed/MasterFeedViewController.swift
rename to iOS/Feed/FeedViewController.swift
index 2f26ceda9..0c53df066 100644
--- a/iOS/MasterFeed/MasterFeedViewController.swift
+++ b/iOS/Feed/FeedViewController.swift
@@ -1,5 +1,5 @@
 //
-//  MasterViewController.swift
+//  FeedViewController.swift
 //  NetNewsWire
 //
 //  Created by Maurice Parker on 4/8/19.
@@ -13,7 +13,7 @@ import RSCore
 import RSTree
 import SafariServices
 
-class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
+class FeedViewController: UITableViewController, UndoableCommandRunner {
 
 	@IBOutlet weak var filterButton: UIBarButtonItem!
 	private var refreshProgressView: RefreshProgressView?
@@ -55,7 +55,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 		frame.size.height = .leastNormalMagnitude
 		tableView.tableHeaderView = UIView(frame: frame)
 		
-		tableView.register(MasterFeedTableViewSectionHeader.self, forHeaderFooterViewReuseIdentifier: "SectionHeader")
+		tableView.register(FeedTableViewSectionHeader.self, forHeaderFooterViewReuseIdentifier: "SectionHeader")
 		tableView.dragDelegate = self
 		tableView.dropDelegate = self
 		tableView.dragInteractionEnabled = true
@@ -100,7 +100,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 		if let account = unreadCountProvider as? Account {
 			if let node = coordinator.rootNode.childNodeRepresentingObject(account) {
 				let sectionIndex = coordinator.rootNode.indexOfChild(node)!
-				if let headerView = tableView.headerView(forSection: sectionIndex) as? MasterFeedTableViewSectionHeader {
+				if let headerView = tableView.headerView(forSection: sectionIndex) as? FeedTableViewSectionHeader {
 					headerView.unreadCount = account.unreadCount
 				}
 			}
@@ -115,7 +115,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 		}
 
 		guard let unreadCountNode = node, let indexPath = coordinator.indexPathFor(unreadCountNode) else { return }
-		if let cell = tableView.cellForRow(at: indexPath) as? MasterFeedTableViewCell {
+		if let cell = tableView.cellForRow(at: indexPath) as? FeedTableViewCell {
 			cell.unreadCount = unreadCountProvider.unreadCount
 		}
 	}
@@ -160,7 +160,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 	}
 	
 	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-		let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as! MasterFeedTableViewCell
+		let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as! FeedTableViewCell
 		configure(cell, indexPath)
 		return cell
 	}
@@ -179,7 +179,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 			return 44
 		}
 		
-		let headerView = MasterFeedTableViewSectionHeader()
+		let headerView = FeedTableViewSectionHeader()
 		headerView.name = nameProvider.nameForDisplay
 
 		let size = headerView.sizeThatFits(CGSize(width: tableView.bounds.width, height: 0.0))
@@ -193,7 +193,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 			return nil
 		}
 		
-		let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! MasterFeedTableViewSectionHeader
+		let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! FeedTableViewSectionHeader
 		headerView.delegate = self
 		headerView.name = nameProvider.nameForDisplay
 		
@@ -330,7 +330,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 	}
 	
 	override func tableView(_ tableView: UITableView, previewForHighlightingContextMenuWithConfiguration configuration: UIContextMenuConfiguration) -> UITargetedPreview? {
-		guard let identifier = configuration.identifier as? MasterFeedRowIdentifier,
+		guard let identifier = configuration.identifier as? FeedRowIdentifier,
 			  let cell = tableView.cellForRow(at: identifier.indexPath) else {
 				  return nil
 			  }
@@ -427,7 +427,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 	}
 	
 	@objc func toggleSectionHeader(_ sender: UITapGestureRecognizer) {
-		guard let headerView = sender.view as? MasterFeedTableViewSectionHeader else {
+		guard let headerView = sender.view as? FeedTableViewSectionHeader else {
 			return
 		}
 		toggle(headerView)
@@ -512,7 +512,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 	// MARK: API
 	
 	func restoreSelectionIfNecessary(adjustScroll: Bool) {
-		if let indexPath = coordinator.masterFeedIndexPathForCurrentTimeline() {
+		if let indexPath = coordinator.feedIndexPathForCurrentTimeline() {
 			if adjustScroll {
 				tableView.selectRowAndScrollIfNotVisible(at: indexPath, animations: [])
 			} else {
@@ -644,7 +644,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 
 // MARK: UIContextMenuInteractionDelegate
 
-extension MasterFeedViewController: UIContextMenuInteractionDelegate {
+extension FeedViewController: UIContextMenuInteractionDelegate {
     func contextMenuInteraction(_ interaction: UIContextMenuInteraction, configurationForMenuAtLocation location: CGPoint) -> UIContextMenuConfiguration? {
 
 		guard let sectionIndex = interaction.view?.tag,
@@ -680,21 +680,21 @@ extension MasterFeedViewController: UIContextMenuInteractionDelegate {
 	}
 }
 
-// MARK: MasterFeedTableViewSectionHeaderDelegate
+// MARK: FeedTableViewSectionHeaderDelegate
 
-extension MasterFeedViewController: MasterFeedTableViewSectionHeaderDelegate {
+extension FeedViewController: FeedTableViewSectionHeaderDelegate {
 	
-	func masterFeedTableViewSectionHeaderDisclosureDidToggle(_ sender: MasterFeedTableViewSectionHeader) {
+	func feedTableViewSectionHeaderDisclosureDidToggle(_ sender: FeedTableViewSectionHeader) {
 		toggle(sender)
 	}
 	
 }
 
-// MARK: MasterTableViewCellDelegate
+// MARK: FeedTableViewCellDelegate
 
-extension MasterFeedViewController: MasterFeedTableViewCellDelegate {
+extension FeedViewController: FeedTableViewCellDelegate {
 	
-	func masterFeedTableViewCellDisclosureDidToggle(_ sender: MasterFeedTableViewCell, expanding: Bool) {
+	func feedTableViewCellDisclosureDidToggle(_ sender: FeedTableViewCell, expanding: Bool) {
 		if expanding {
 			expand(sender)
 		} else {
@@ -706,7 +706,7 @@ extension MasterFeedViewController: MasterFeedTableViewCellDelegate {
 
 // MARK: Private
 
-private extension MasterFeedViewController {
+private extension FeedViewController {
 	
 	func configureToolbar() {
 		guard let refreshProgressView = Bundle.main.loadNibNamed("RefreshProgressView", owner: self, options: nil)?[0] as? RefreshProgressView else {
@@ -732,14 +732,14 @@ private extension MasterFeedViewController {
 		let titleLabel = NonIntrinsicLabel()
 		titleLabel.text = "But I must explain"
 		
-		let unreadCountView = MasterFeedUnreadCountView()
+		let unreadCountView = FeedUnreadCountView()
 		unreadCountView.unreadCount = 10
 		
-		let layout = MasterFeedTableViewCellLayout(cellWidth: tableView.bounds.size.width, insets: tableView.safeAreaInsets, label: titleLabel, unreadCountView: unreadCountView, showingEditingControl: false, indent: false, shouldShowDisclosure: false)
+		let layout = FeedTableViewCellLayout(cellWidth: tableView.bounds.size.width, insets: tableView.safeAreaInsets, label: titleLabel, unreadCountView: unreadCountView, showingEditingControl: false, indent: false, shouldShowDisclosure: false)
 		tableView.estimatedRowHeight = layout.height
 	}
 	
-	func configure(_ cell: MasterFeedTableViewCell, _ indexPath: IndexPath) {
+	func configure(_ cell: FeedTableViewCell, _ indexPath: IndexPath) {
 		guard let node = coordinator.nodeFor(indexPath) else { return }
 
 		cell.delegate = self
@@ -772,7 +772,7 @@ private extension MasterFeedViewController {
 		
 	}
 	
-	func configureIcon(_ cell: MasterFeedTableViewCell, _ indexPath: IndexPath) {
+	func configureIcon(_ cell: FeedTableViewCell, _ indexPath: IndexPath) {
 		guard let node = coordinator.nodeFor(indexPath), let feed = node.representedObject as? SidebarItem, let feedID = feed.sidebarItemID else {
 			return
 		}
@@ -790,7 +790,7 @@ private extension MasterFeedViewController {
 		applyToCellsForRepresentedObject(representedObject, configure)
 	}
 
-	func applyToCellsForRepresentedObject(_ representedObject: AnyObject, _ completion: (MasterFeedTableViewCell, IndexPath) -> Void) {
+	func applyToCellsForRepresentedObject(_ representedObject: AnyObject, _ completion: (FeedTableViewCell, IndexPath) -> Void) {
 		applyToAvailableCells { (cell, indexPath) in
 			if let node = coordinator.nodeFor(indexPath),
 			   let representedFeed = representedObject as? SidebarItem,
@@ -801,12 +801,12 @@ private extension MasterFeedViewController {
 		}
 	}
 	
-	func applyToAvailableCells(_ completion: (MasterFeedTableViewCell, IndexPath) -> Void) {
+	func applyToAvailableCells(_ completion: (FeedTableViewCell, IndexPath) -> Void) {
 		tableView.visibleCells.forEach { cell in
 			guard let indexPath = tableView.indexPath(for: cell) else {
 				return
 			}
-			completion(cell as! MasterFeedTableViewCell, indexPath)
+			completion(cell as! FeedTableViewCell, indexPath)
 		}
 	}
 
@@ -829,7 +829,7 @@ private extension MasterFeedViewController {
 		return nil
 	}
 
-	func toggle(_ headerView: MasterFeedTableViewSectionHeader) {
+	func toggle(_ headerView: FeedTableViewSectionHeader) {
 		guard let sectionNode = coordinator.rootNode.childAtIndex(headerView.tag) else {
 			return
 		}
@@ -843,14 +843,14 @@ private extension MasterFeedViewController {
 		}
 	}
 
-	func expand(_ cell: MasterFeedTableViewCell) {
+	func expand(_ cell: FeedTableViewCell) {
 		guard let indexPath = tableView.indexPath(for: cell), let node = coordinator.nodeFor(indexPath) else {
 			return
 		}
 		coordinator.expand(node)
 	}
 
-	func collapse(_ cell: MasterFeedTableViewCell) {
+	func collapse(_ cell: FeedTableViewCell) {
 		guard let indexPath = tableView.indexPath(for: cell), let node = coordinator.nodeFor(indexPath) else {
 			return
 		}
@@ -858,7 +858,7 @@ private extension MasterFeedViewController {
 	}
 
 	func makeFeedContextMenu(indexPath: IndexPath, includeDeleteRename: Bool) -> UIContextMenuConfiguration {
-		return UIContextMenuConfiguration(identifier: MasterFeedRowIdentifier(indexPath: indexPath), previewProvider: nil, actionProvider: { [ weak self] suggestedActions in
+		return UIContextMenuConfiguration(identifier: FeedRowIdentifier(indexPath: indexPath), previewProvider: nil, actionProvider: { [ weak self] suggestedActions in
 			
 			guard let self = self else { return nil }
 			
@@ -903,7 +903,7 @@ private extension MasterFeedViewController {
 	}
 	
 	func makeFolderContextMenu(indexPath: IndexPath) -> UIContextMenuConfiguration {
-		return UIContextMenuConfiguration(identifier: MasterFeedRowIdentifier(indexPath: indexPath), previewProvider: nil, actionProvider: { [weak self] suggestedActions in
+		return UIContextMenuConfiguration(identifier: FeedRowIdentifier(indexPath: indexPath), previewProvider: nil, actionProvider: { [weak self] suggestedActions in
 
 			guard let self = self else { return nil }
 			
@@ -930,7 +930,7 @@ private extension MasterFeedViewController {
 			return nil
 		}
 
-		return UIContextMenuConfiguration(identifier: MasterFeedRowIdentifier(indexPath: indexPath), previewProvider: nil, actionProvider: { suggestedActions in
+		return UIContextMenuConfiguration(identifier: FeedRowIdentifier(indexPath: indexPath), previewProvider: nil, actionProvider: { suggestedActions in
 			return UIMenu(title: "", children: [markAllAction])
 		})
 	}
@@ -1246,7 +1246,7 @@ private extension MasterFeedViewController {
 	
 }
 
-extension MasterFeedViewController: UIGestureRecognizerDelegate {
+extension FeedViewController: UIGestureRecognizerDelegate {
 	func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
 		guard let gestureRecognizer = gestureRecognizer as? UIPanGestureRecognizer else {
 			return false
diff --git a/iOS/MasterFeed/RefreshProgressView.swift b/iOS/Feed/RefreshProgressView.swift
similarity index 100%
rename from iOS/MasterFeed/RefreshProgressView.swift
rename to iOS/Feed/RefreshProgressView.swift
diff --git a/iOS/MasterFeed/RefreshProgressView.xib b/iOS/Feed/RefreshProgressView.xib
similarity index 100%
rename from iOS/MasterFeed/RefreshProgressView.xib
rename to iOS/Feed/RefreshProgressView.xib
diff --git a/iOS/MasterFeed/ShadowTableChanges.swift b/iOS/Feed/ShadowTableChanges.swift
similarity index 100%
rename from iOS/MasterFeed/ShadowTableChanges.swift
rename to iOS/Feed/ShadowTableChanges.swift
diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift
index 273668f0b..1d8049b7d 100644
--- a/iOS/SceneCoordinator.swift
+++ b/iOS/SceneCoordinator.swift
@@ -60,8 +60,8 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
 	
 	private var rootSplitViewController: RootSplitViewController!
 	private var navigationController: UINavigationController!
-	private var feedViewController: MasterFeedViewController!
-	private var timelineViewController: MasterTimelineViewController?
+	private var feedViewController: FeedViewController!
+	private var timelineViewController: TimelineViewController?
 	private var subSplitViewController: UISplitViewController?
 	
 	private var articleViewController: ArticleViewController? {
@@ -339,7 +339,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
 		navigationController = (rootSplitViewController.viewControllers.first as! UINavigationController)
 		navigationController.delegate = self
 		
-		feedViewController = UIStoryboard.main.instantiateController(ofType: MasterFeedViewController.self)
+		feedViewController = UIStoryboard.main.instantiateController(ofType: FeedViewController.self)
 		feedViewController.coordinator = self
 		navigationController.pushViewController(feedViewController, animated: false)
 		
@@ -776,7 +776,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
 		clearTimelineIfNoLongerAvailable()
 	}
 	
-	func masterFeedIndexPathForCurrentTimeline() -> IndexPath? {
+	func feedIndexPathForCurrentTimeline() -> IndexPath? {
 		guard let node = treeController.rootNode.descendantNodeRepresentingObject(timelineFeed as AnyObject) else {
 			return nil
 		}
@@ -825,7 +825,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner {
 					self.rebuildBackingStores()
 				}
 				self.activityManager.invalidateSelecting()
-				if self.rootSplitViewController.isCollapsed && self.navControllerForTimeline().viewControllers.last is MasterTimelineViewController {
+				if self.rootSplitViewController.isCollapsed && self.navControllerForTimeline().viewControllers.last is TimelineViewController {
 					self.navControllerForTimeline().popViewController(animated: animations.contains(.navigation))
 				}
 				completion?()
@@ -2099,9 +2099,9 @@ private extension SceneCoordinator {
 	// MARK: Three Panel Mode
 	
 	func installTimelineControllerIfNecessary(animated: Bool) {
-		if navControllerForTimeline().viewControllers.filter({ $0 is MasterTimelineViewController }).count < 1 {
+		if navControllerForTimeline().viewControllers.filter({ $0 is TimelineViewController }).count < 1 {
 			isTimelineViewControllerPending = true
-			timelineViewController = UIStoryboard.main.instantiateController(ofType: MasterTimelineViewController.self)
+			timelineViewController = UIStoryboard.main.instantiateController(ofType: TimelineViewController.self)
 			timelineViewController!.coordinator = self
 			navControllerForTimeline().pushViewController(timelineViewController!, animated: animated)
 		}
@@ -2216,7 +2216,7 @@ private extension SceneCoordinator {
 		}
 			
 		if currentFeedIndexPath != nil {
-			timelineViewController = UIStoryboard.main.instantiateController(ofType: MasterTimelineViewController.self)
+			timelineViewController = UIStoryboard.main.instantiateController(ofType: TimelineViewController.self)
 			timelineViewController!.coordinator = self
 			navigationController.pushViewController(timelineViewController!, animated: false)
 		}
diff --git a/iOS/Settings/Settings.storyboard b/iOS/Settings/Settings.storyboard
index 20ec99942..5fcaf65da 100644
--- a/iOS/Settings/Settings.storyboard
+++ b/iOS/Settings/Settings.storyboard
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="9cW-lu-HoC">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="9cW-lu-HoC">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -343,26 +342,26 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="WR6-xo-ty2" customClass="VibrantTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="806" width="374" height="84"/>
+                                        <rect key="frame" x="20" y="806" width="374" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="WR6-xo-ty2" id="zX8-l2-bVH">
-                                            <rect key="frame" x="0.0" y="0.0" width="374" height="84"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="374" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="751" ambiguous="YES" text="Enable Full Screen Articles" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="79e-5s-vd0">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="751" text="Enable Full Screen Articles" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="79e-5s-vd0">
                                                     <rect key="frame" x="20" y="11" width="202" height="15.5"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="2Md-2E-7Z4">
-                                                    <rect key="frame" x="307" y="6" width="51" height="31"/>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="2Md-2E-7Z4">
+                                                    <rect key="frame" x="307" y="6" width="51" height="25.5"/>
                                                     <color key="onTintColor" name="primaryAccentColor"/>
                                                     <connections>
                                                         <action selector="switchFullscreenArticles:" destination="a0p-rk-skQ" eventType="valueChanged" id="5fa-Ad-e0j"/>
                                                     </connections>
                                                 </switch>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" ambiguous="YES" text="Tap the article top bar to enter Full Screen. Tap the top or bottom to exit." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a30-nc-ZS4">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Tap the article top bar to enter Full Screen. Tap the top or bottom to exit." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a30-nc-ZS4">
                                                     <rect key="frame" x="20" y="33" width="262.5" height="0.0"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
                                                     <nil key="textColor"/>
@@ -388,10 +387,10 @@
                             <tableViewSection headerTitle="Appearance" id="TkH-4v-yhk">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" id="EvG-yE-gDF" customClass="VibrantBasicTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="946" width="374" height="43.5"/>
+                                        <rect key="frame" x="20" y="906" width="374" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="EvG-yE-gDF" id="wBN-zJ-6pN">
-                                            <rect key="frame" x="0.0" y="0.0" width="343.5" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="343.5" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Color Palette" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Fp-li-dGP">
@@ -425,7 +424,7 @@
                             <tableViewSection headerTitle="Help" id="CS8-fJ-ghn">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="uGk-2d-oFc" style="IBUITableViewCellStyleDefault" id="Tle-IV-D40" customClass="VibrantTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="1045.5" width="374" height="43.5"/>
+                                        <rect key="frame" x="20" y="1006" width="374" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Tle-IV-D40" id="IJD-ZB-8Wm">
                                             <rect key="frame" x="0.0" y="0.0" width="374" height="43.5"/>
@@ -442,7 +441,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="6G3-yV-Eyh" style="IBUITableViewCellStyleDefault" id="Tbf-fE-nfx" customClass="VibrantTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="1089" width="374" height="43.5"/>
+                                        <rect key="frame" x="20" y="1049.5" width="374" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Tbf-fE-nfx" id="beV-vI-g3r">
                                             <rect key="frame" x="0.0" y="0.0" width="374" height="43.5"/>
@@ -459,7 +458,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="NeD-y8-KrM" style="IBUITableViewCellStyleDefault" id="TIX-yK-rC6" customClass="VibrantTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="1132.5" width="374" height="43.5"/>
+                                        <rect key="frame" x="20" y="1093" width="374" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="TIX-yK-rC6" id="qr8-EN-Ofg">
                                             <rect key="frame" x="0.0" y="0.0" width="374" height="43.5"/>
@@ -476,7 +475,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="lfL-bQ-sOp" style="IBUITableViewCellStyleDefault" id="mFn-fE-zqa" customClass="VibrantTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="1176" width="374" height="43.5"/>
+                                        <rect key="frame" x="20" y="1136.5" width="374" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="mFn-fE-zqa" id="jTe-mf-MRj">
                                             <rect key="frame" x="0.0" y="0.0" width="374" height="43.5"/>
@@ -493,7 +492,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="DDJ-8P-3YY" style="IBUITableViewCellStyleDefault" id="iGs-ze-4gQ" customClass="VibrantTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="1219.5" width="374" height="43.5"/>
+                                        <rect key="frame" x="20" y="1180" width="374" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="iGs-ze-4gQ" id="EqZ-rF-N0l">
                                             <rect key="frame" x="0.0" y="0.0" width="374" height="43.5"/>
@@ -510,7 +509,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="DsV-Qv-X4K" style="IBUITableViewCellStyleDefault" id="taJ-sg-wnU" customClass="VibrantTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="1263" width="374" height="44"/>
+                                        <rect key="frame" x="20" y="1223.5" width="374" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="taJ-sg-wnU" id="axB-si-1KM">
                                             <rect key="frame" x="0.0" y="0.0" width="374" height="44"/>
@@ -527,7 +526,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="zMz-hU-UYU" style="IBUITableViewCellStyleDefault" id="OXi-cg-ab9" customClass="VibrantTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="1307" width="374" height="44"/>
+                                        <rect key="frame" x="20" y="1267.5" width="374" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="OXi-cg-ab9" id="npR-a0-9wv">
                                             <rect key="frame" x="0.0" y="0.0" width="374" height="44"/>
@@ -544,7 +543,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="T7x-zl-6Yf" style="IBUITableViewCellStyleDefault" id="VpI-0o-3Px" customClass="VibrantTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="1351" width="374" height="44"/>
+                                        <rect key="frame" x="20" y="1311.5" width="374" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VpI-0o-3Px" id="xRH-i4-vne">
                                             <rect key="frame" x="0.0" y="0.0" width="374" height="44"/>
@@ -561,7 +560,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="76A-Ng-kfs" style="IBUITableViewCellStyleDefault" id="jK8-tv-hBD" customClass="VibrantTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="1395" width="374" height="44"/>
+                                        <rect key="frame" x="20" y="1355.5" width="374" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="jK8-tv-hBD" id="I7Q-GQ-u8Y">
                                             <rect key="frame" x="0.0" y="0.0" width="355.5" height="44"/>
@@ -669,7 +668,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="AboutViewController" title="About" id="K5w-58-sQW" customClass="AboutViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="ybg-ki-AbJ">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="804"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <sections>
                             <tableViewSection id="apW-l0-gWz">
@@ -821,7 +820,7 @@
             <objects>
                 <viewController storyboardIdentifier="TimelineCustomizerViewController" title="Timeline Layout" id="amD-xZ-U3A" customClass="TimelineCustomizerViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="2Fb-t4-5QE">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="804"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q4t-3M-goU">
@@ -947,7 +946,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="300" height="128"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" id="Zaq-yo-L5h" customClass="MasterTimelineTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" id="Zaq-yo-L5h" customClass="TimelineTableViewCell" customModule="NetNewsWire" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="50" width="300" height="43.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Zaq-yo-L5h" id="fD5-nw-z0z">
@@ -980,7 +979,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="ArticleThemesTableViewController" title="Article Themes" id="fO4-og-e41" customClass="ArticleThemesTableViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="I8p-P9-C8h">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="804"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <prototypes>
@@ -1019,7 +1018,7 @@
             <objects>
                 <tableViewController storyboardIdentifier="ColorPaletteTableViewController" title="Color Palette" id="4je-jl-or5" customClass="ColorPaletteTableViewController" customModule="NetNewsWire" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="nt4-zl-48k">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="804"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
                         <prototypes>
@@ -1063,10 +1062,10 @@
             <color red="0.031372549019607843" green="0.41568627450980394" blue="0.93333333333333335" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <systemColor name="groupTableViewBackgroundColor">
-            <color red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="labelColor">
-            <color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="secondaryLabelColor">
             <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/iOS/Settings/TimelinePreviewTableViewController.swift b/iOS/Settings/TimelinePreviewTableViewController.swift
index 7ac3152b0..1247e4393 100644
--- a/iOS/Settings/TimelinePreviewTableViewController.swift
+++ b/iOS/Settings/TimelinePreviewTableViewController.swift
@@ -42,7 +42,7 @@ class TimelinePreviewTableViewController: UIViewController, UITableViewDelegate,
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-		let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as! MasterTimelineTableViewCell
+		let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as! TimelineTableViewCell
 		cell.cellData = prototypeCellData
 		return cell
 	}
@@ -62,7 +62,7 @@ class TimelinePreviewTableViewController: UIViewController, UITableViewDelegate,
 
 private extension TimelinePreviewTableViewController {
 
-	var prototypeCellData: MasterTimelineCellData {
+	var prototypeCellData: TimelineCellData {
 		let longTitle = "Enim ut tellus elementum sagittis vitae et. Nibh praesent tristique magna sit amet purus gravida quis blandit. Neque volutpat ac tincidunt vitae semper quis lectus nulla. Massa id neque aliquam vestibulum morbi blandit. Ultrices vitae auctor eu augue. Enim eu turpis egestas pretium aenean pharetra magna. Eget gravida cum sociis natoque. Sit amet consectetur adipiscing elit. Auctor eu augue ut lectus arcu bibendum. Maecenas volutpat blandit aliquam etiam erat velit. Ut pharetra sit amet aliquam id diam maecenas ultricies. In hac habitasse platea dictumst quisque sagittis purus sit amet."
 		
 		let prototypeID = "prototype"
@@ -71,7 +71,7 @@ private extension TimelinePreviewTableViewController {
 		
 		let iconImage = IconImage(AppAssets.faviconTemplateImage.withTintColor(AppAssets.secondaryAccentColor))
 		
-		return MasterTimelineCellData(article: prototypeArticle, showFeedName: .feed, feedName: "Feed Name", byline: nil, iconImage: iconImage, showIcon: true, featuredImage: nil, numberOfLines: AppDefaults.shared.timelineNumberOfLines, iconSize: AppDefaults.shared.timelineIconSize)
+		return TimelineCellData(article: prototypeArticle, showFeedName: .feed, feedName: "Feed Name", byline: nil, iconImage: iconImage, showIcon: true, featuredImage: nil, numberOfLines: AppDefaults.shared.timelineNumberOfLines, iconSize: AppDefaults.shared.timelineIconSize)
 	}
 		
 }
diff --git a/iOS/MasterTimeline/Cell/MultilineUILabelSizer.swift b/iOS/Timeline/Cell/MultilineUILabelSizer.swift
similarity index 100%
rename from iOS/MasterTimeline/Cell/MultilineUILabelSizer.swift
rename to iOS/Timeline/Cell/MultilineUILabelSizer.swift
diff --git a/iOS/MasterTimeline/Cell/SingleLineUILabelSizer.swift b/iOS/Timeline/Cell/SingleLineUILabelSizer.swift
similarity index 100%
rename from iOS/MasterTimeline/Cell/SingleLineUILabelSizer.swift
rename to iOS/Timeline/Cell/SingleLineUILabelSizer.swift
diff --git a/iOS/MasterTimeline/Cell/TimelineAccessibilityCellLayout.swift b/iOS/Timeline/Cell/TimelineAccessibilityCellLayout.swift
similarity index 93%
rename from iOS/MasterTimeline/Cell/TimelineAccessibilityCellLayout.swift
rename to iOS/Timeline/Cell/TimelineAccessibilityCellLayout.swift
index 923ec2311..d7048db5d 100644
--- a/iOS/MasterTimeline/Cell/TimelineAccessibilityCellLayout.swift
+++ b/iOS/Timeline/Cell/TimelineAccessibilityCellLayout.swift
@@ -20,7 +20,7 @@ struct TimelineAccessibilityCellLayout: TimelineCellLayout {
 	let feedNameRect: CGRect
 	let dateRect: CGRect
 	
-	init(width: CGFloat, insets: UIEdgeInsets, cellData: MasterTimelineCellData) {
+	init(width: CGFloat, insets: UIEdgeInsets, cellData: TimelineCellData) {
 		
 		var currentPoint = CGPoint.zero
 		currentPoint.x = TimelineDefaultCellLayout.cellPadding.left + insets.left + TimelineDefaultCellLayout.unreadCircleMarginLeft
@@ -75,7 +75,7 @@ struct TimelineAccessibilityCellLayout: TimelineCellLayout {
 
 private extension TimelineAccessibilityCellLayout {
 	
-	static func rectForDate(_ cellData: MasterTimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
+	static func rectForDate(_ cellData: TimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
 		
 		var r = CGRect.zero
 		
diff --git a/iOS/MasterTimeline/Cell/MasterTimelineCellData.swift b/iOS/Timeline/Cell/TimelineCellData.swift
similarity index 97%
rename from iOS/MasterTimeline/Cell/MasterTimelineCellData.swift
rename to iOS/Timeline/Cell/TimelineCellData.swift
index 2c3c8b822..e778ffdd7 100644
--- a/iOS/MasterTimeline/Cell/MasterTimelineCellData.swift
+++ b/iOS/Timeline/Cell/TimelineCellData.swift
@@ -1,5 +1,5 @@
 //
-//  MasterTimelineCellData.swift
+//  TimelineCellData.swift
 //  NetNewsWire
 //
 //  Created by Brent Simmons on 2/6/16.
@@ -9,7 +9,7 @@
 import UIKit
 import Articles
 
-struct MasterTimelineCellData {
+struct TimelineCellData {
 
 	private static let noText = NSLocalizedString("(No Text)", comment: "No Text")
 	
diff --git a/iOS/MasterTimeline/Cell/TimelineCellLayout.swift b/iOS/Timeline/Cell/TimelineCellLayout.swift
similarity index 87%
rename from iOS/MasterTimeline/Cell/TimelineCellLayout.swift
rename to iOS/Timeline/Cell/TimelineCellLayout.swift
index d92818d43..e86c673df 100644
--- a/iOS/MasterTimeline/Cell/TimelineCellLayout.swift
+++ b/iOS/Timeline/Cell/TimelineCellLayout.swift
@@ -49,7 +49,7 @@ extension TimelineCellLayout {
 		return r
 	}
 	
-	static func rectForTitle(_ cellData: MasterTimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> (CGRect, Int) {
+	static func rectForTitle(_ cellData: TimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> (CGRect, Int) {
 		
 		var r = CGRect.zero
 		if cellData.title.isEmpty {
@@ -70,7 +70,7 @@ extension TimelineCellLayout {
 		
 	}
 	
-	static func rectForSummary(_ cellData: MasterTimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat, _ linesUsed: Int) -> CGRect {
+	static func rectForSummary(_ cellData: TimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat, _ linesUsed: Int) -> CGRect {
 		
 		let linesLeft = cellData.numberOfLines - linesUsed
 		
@@ -93,7 +93,7 @@ extension TimelineCellLayout {
 		
 	}
 
-	static func rectForFeedName(_ cellData: MasterTimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
+	static func rectForFeedName(_ cellData: TimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
 		
 		var r = CGRect.zero
 		r.origin = point
diff --git a/iOS/MasterTimeline/Cell/TimelineDefaultCellLayout.swift b/iOS/Timeline/Cell/TimelineDefaultCellLayout.swift
similarity index 95%
rename from iOS/MasterTimeline/Cell/TimelineDefaultCellLayout.swift
rename to iOS/Timeline/Cell/TimelineDefaultCellLayout.swift
index 4e80c5545..1752bed81 100644
--- a/iOS/MasterTimeline/Cell/TimelineDefaultCellLayout.swift
+++ b/iOS/Timeline/Cell/TimelineDefaultCellLayout.swift
@@ -52,7 +52,7 @@ struct TimelineDefaultCellLayout: TimelineCellLayout {
 	let feedNameRect: CGRect
 	let dateRect: CGRect
 
-	init(width: CGFloat, insets: UIEdgeInsets, cellData: MasterTimelineCellData) {
+	init(width: CGFloat, insets: UIEdgeInsets, cellData: TimelineCellData) {
 
 		var currentPoint = CGPoint.zero
 		currentPoint.x = TimelineDefaultCellLayout.cellPadding.left + insets.left + TimelineDefaultCellLayout.unreadCircleMarginLeft
@@ -110,7 +110,7 @@ struct TimelineDefaultCellLayout: TimelineCellLayout {
 
 extension TimelineDefaultCellLayout {
 
-	static func rectForDate(_ cellData: MasterTimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
+	static func rectForDate(_ cellData: TimelineCellData, _ point: CGPoint, _ textAreaWidth: CGFloat) -> CGRect {
 		
 		var r = CGRect.zero
 		
diff --git a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift b/iOS/Timeline/Cell/TimelineTableViewCell.swift
similarity index 93%
rename from iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift
rename to iOS/Timeline/Cell/TimelineTableViewCell.swift
index 12043cc8c..51ac893b6 100644
--- a/iOS/MasterTimeline/Cell/MasterTimelineTableViewCell.swift
+++ b/iOS/Timeline/Cell/TimelineTableViewCell.swift
@@ -1,5 +1,5 @@
 //
-//  MasterTimelineTableViewCell.swift
+//  TimelineTableViewCell.swift
 //  NetNewsWire
 //
 //  Created by Brent Simmons on 8/31/15.
@@ -9,13 +9,13 @@
 import UIKit
 import RSCore
 
-class MasterTimelineTableViewCell: VibrantTableViewCell {
+class TimelineTableViewCell: VibrantTableViewCell {
 	
-	private let titleView = MasterTimelineTableViewCell.multiLineUILabel()
-	private let summaryView = MasterTimelineTableViewCell.multiLineUILabel()
-	private let unreadIndicatorView = MasterUnreadIndicatorView(frame: CGRect.zero)
-	private let dateView = MasterTimelineTableViewCell.singleLineUILabel()
-	private let feedNameView = MasterTimelineTableViewCell.singleLineUILabel()
+	private let titleView = TimelineTableViewCell.multiLineUILabel()
+	private let summaryView = TimelineTableViewCell.multiLineUILabel()
+	private let unreadIndicatorView = UnreadIndicatorView(frame: CGRect.zero)
+	private let dateView = TimelineTableViewCell.singleLineUILabel()
+	private let feedNameView = TimelineTableViewCell.singleLineUILabel()
 	
 	private lazy var iconView = IconView()
 	
@@ -26,7 +26,7 @@ class MasterTimelineTableViewCell: VibrantTableViewCell {
 	private var unreadIndicatorPropertyAnimator: UIViewPropertyAnimator?
 	private var starViewPropertyAnimator: UIViewPropertyAnimator?
 
-	var cellData: MasterTimelineCellData! {
+	var cellData: TimelineCellData! {
 		didSet {
 			updateSubviews()
 		}
@@ -106,7 +106,7 @@ class MasterTimelineTableViewCell: VibrantTableViewCell {
 
 // MARK: - Private
 
-private extension MasterTimelineTableViewCell {
+private extension TimelineTableViewCell {
 	
 	static func singleLineUILabel() -> UILabel {
 		let label = NonIntrinsicLabel()
diff --git a/iOS/MasterTimeline/Cell/MasterUnreadIndicatorView.swift b/iOS/Timeline/Cell/UnreadIndicatorView.swift
similarity index 78%
rename from iOS/MasterTimeline/Cell/MasterUnreadIndicatorView.swift
rename to iOS/Timeline/Cell/UnreadIndicatorView.swift
index 32205f0f9..94ef0da73 100644
--- a/iOS/MasterTimeline/Cell/MasterUnreadIndicatorView.swift
+++ b/iOS/Timeline/Cell/UnreadIndicatorView.swift
@@ -1,5 +1,5 @@
 //
-//  MasterUnreadIndicatorView.swift
+//  UnreadIndicatorView.swift
 //  NetNewsWire
 //
 //  Created by Brent Simmons on 2/16/16.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class MasterUnreadIndicatorView: UIView {
+class UnreadIndicatorView: UIView {
 
 	override func layoutSubviews() {
 		super.layoutSubviews()
diff --git a/iOS/MasterTimeline/MarkAsReadAlertController.swift b/iOS/Timeline/MarkAsReadAlertController.swift
similarity index 100%
rename from iOS/MasterTimeline/MarkAsReadAlertController.swift
rename to iOS/Timeline/MarkAsReadAlertController.swift
diff --git a/iOS/MasterTimeline/MasterTimelineTitleView.swift b/iOS/Timeline/MasterTimelineTitleView.swift
similarity index 100%
rename from iOS/MasterTimeline/MasterTimelineTitleView.swift
rename to iOS/Timeline/MasterTimelineTitleView.swift
diff --git a/iOS/MasterTimeline/MasterTimelineTitleView.xib b/iOS/Timeline/MasterTimelineTitleView.xib
similarity index 100%
rename from iOS/MasterTimeline/MasterTimelineTitleView.xib
rename to iOS/Timeline/MasterTimelineTitleView.xib
diff --git a/iOS/MasterTimeline/MasterTimelineUnreadCountView.swift b/iOS/Timeline/MasterTimelineUnreadCountView.swift
similarity index 93%
rename from iOS/MasterTimeline/MasterTimelineUnreadCountView.swift
rename to iOS/Timeline/MasterTimelineUnreadCountView.swift
index 66a7a4b26..a4674a2ce 100644
--- a/iOS/MasterTimeline/MasterTimelineUnreadCountView.swift
+++ b/iOS/Timeline/MasterTimelineUnreadCountView.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class MasterTimelineUnreadCountView: MasterFeedUnreadCountView {
+class MasterTimelineUnreadCountView: FeedUnreadCountView {
 
 	override var padding: UIEdgeInsets {
 		return UIEdgeInsets(top: 2.0, left: 9.0, bottom: 2.0, right: 9.0)
diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/Timeline/MasterTimelineViewController.swift
similarity index 96%
rename from iOS/MasterTimeline/MasterTimelineViewController.swift
rename to iOS/Timeline/MasterTimelineViewController.swift
index 7f618cdb3..2d597ebd6 100644
--- a/iOS/MasterTimeline/MasterTimelineViewController.swift
+++ b/iOS/Timeline/MasterTimelineViewController.swift
@@ -1,5 +1,5 @@
 //
-//  MasterTimelineViewController.swift
+//  TimelineViewController.swift
 //  NetNewsWire
 //
 //  Created by Maurice Parker on 4/8/19.
@@ -11,7 +11,7 @@ import RSCore
 import Account
 import Articles
 
-class MasterTimelineViewController: UITableViewController, UndoableCommandRunner {
+class TimelineViewController: UITableViewController, UndoableCommandRunner {
 
 	private var numberOfTextLines = 0
 	private var iconSize = IconSize.medium
@@ -436,7 +436,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 
 		for article in visibleUpdatedArticles {
 			if let indexPath = dataSource.indexPath(for: article) {
-				if let cell = tableView.cellForRow(at: indexPath) as? MasterTimelineTableViewCell {
+				if let cell = tableView.cellForRow(at: indexPath) as? TimelineTableViewCell {
 					configure(cell, article: article)
 				}
 			}
@@ -456,7 +456,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 			guard let article = dataSource.itemIdentifier(for: indexPath) else {
 				return
 			}
-			if article.feed == feed, let cell = tableView.cellForRow(at: indexPath) as? MasterTimelineTableViewCell, let image = iconImageFor(article) {
+			if article.feed == feed, let cell = tableView.cellForRow(at: indexPath) as? TimelineTableViewCell, let image = iconImageFor(article) {
 				cell.setIconImage(image)
 			}
 		}
@@ -471,7 +471,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 				return
 			}
 			for author in authors {
-				if author.avatarURL == avatarURL, let cell = tableView.cellForRow(at: indexPath) as? MasterTimelineTableViewCell, let image = iconImageFor(article) {
+				if author.avatarURL == avatarURL, let cell = tableView.cellForRow(at: indexPath) as? TimelineTableViewCell, let image = iconImageFor(article) {
 					cell.setIconImage(image)
 				}
 			}
@@ -544,7 +544,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 		let status = ArticleStatus(articleID: prototypeID, read: false, starred: false, dateArrived: Date())
 		let prototypeArticle = Article(accountID: prototypeID, articleID: prototypeID, feedID: prototypeID, uniqueID: prototypeID, title: Constants.prototypeText, contentHTML: nil, contentText: nil, url: nil, externalURL: nil, summary: nil, imageURL: nil, datePublished: nil, dateModified: nil, authors: nil, status: status)
 
-		let prototypeCellData = MasterTimelineCellData(article: prototypeArticle, showFeedName: .feed, feedName: "Prototype Feed Name", byline: nil, iconImage: nil, showIcon: false, featuredImage: nil, numberOfLines: numberOfTextLines, iconSize: iconSize)
+		let prototypeCellData = TimelineCellData(article: prototypeArticle, showFeedName: .feed, feedName: "Prototype Feed Name", byline: nil, iconImage: nil, showIcon: false, featuredImage: nil, numberOfLines: numberOfTextLines, iconSize: iconSize)
 		
 		if UIApplication.shared.preferredContentSizeCategory.isAccessibilityCategory {
 			let layout = TimelineAccessibilityCellLayout(width: tableView.bounds.width, insets: tableView.safeAreaInsets, cellData: prototypeCellData)
@@ -560,7 +560,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
 
 // MARK: Searching
 
-extension MasterTimelineViewController: UISearchControllerDelegate {
+extension TimelineViewController: UISearchControllerDelegate {
 
 	func willPresentSearchController(_ searchController: UISearchController) {
 		coordinator.beginSearching()
@@ -574,7 +574,7 @@ extension MasterTimelineViewController: UISearchControllerDelegate {
 
 }
 
-extension MasterTimelineViewController: UISearchResultsUpdating {
+extension TimelineViewController: UISearchResultsUpdating {
 
 	func updateSearchResults(for searchController: UISearchController) {
 		let searchScope = SearchScope(rawValue: searchController.searchBar.selectedScopeButtonIndex)!
@@ -583,7 +583,7 @@ extension MasterTimelineViewController: UISearchResultsUpdating {
 
 }
 
-extension MasterTimelineViewController: UISearchBarDelegate {
+extension TimelineViewController: UISearchBarDelegate {
 	func searchBar(_ searchBar: UISearchBar, selectedScopeButtonIndexDidChange selectedScope: Int) {
 		let searchScope = SearchScope(rawValue: selectedScope)!
 		coordinator.searchArticles(searchBar.text!, searchScope)
@@ -592,7 +592,7 @@ extension MasterTimelineViewController: UISearchBarDelegate {
 
 // MARK: Private
 
-private extension MasterTimelineViewController {
+private extension TimelineViewController {
 
 	func configureToolbar() {
 		
@@ -708,8 +708,8 @@ private extension MasterTimelineViewController {
 	
 	func makeDataSource() -> UITableViewDiffableDataSource<Int, Article> {
 		let dataSource: UITableViewDiffableDataSource<Int, Article> =
-			MasterTimelineDataSource(tableView: tableView, cellProvider: { [weak self] tableView, indexPath, article in
-				let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as! MasterTimelineTableViewCell
+			TimelineDataSource(tableView: tableView, cellProvider: { [weak self] tableView, indexPath, article in
+				let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as! TimelineTableViewCell
 				self?.configure(cell, article: article)
 				return cell
 			})
@@ -717,14 +717,14 @@ private extension MasterTimelineViewController {
 		return dataSource
     }
 	
-	func configure(_ cell: MasterTimelineTableViewCell, article: Article) {
+	func configure(_ cell: TimelineTableViewCell, article: Article) {
 		
 		let iconImage = iconImageFor(article)
 		let featuredImage = featuredImageFor(article)
 		
 		let showFeedNames = coordinator.showFeedNames
 		let showIcon = coordinator.showIcons && iconImage != nil
-		cell.cellData = MasterTimelineCellData(article: article, showFeedName: showFeedNames, feedName: article.feed?.nameForDisplay, byline: article.byline(), iconImage: iconImage, showIcon: showIcon, featuredImage: featuredImage, numberOfLines: numberOfTextLines, iconSize: iconSize)
+		cell.cellData = TimelineCellData(article: article, showFeedName: showFeedNames, feedName: article.feed?.nameForDisplay, byline: article.byline(), iconImage: iconImage, showIcon: showIcon, featuredImage: featuredImage, numberOfLines: numberOfTextLines, iconSize: iconSize)
 		
 	}
 	
diff --git a/iOS/MasterTimeline/MasterTimelineDataSource.swift b/iOS/Timeline/TimelineDataSource.swift
similarity index 51%
rename from iOS/MasterTimeline/MasterTimelineDataSource.swift
rename to iOS/Timeline/TimelineDataSource.swift
index 3647a93ae..687e0a82b 100644
--- a/iOS/MasterTimeline/MasterTimelineDataSource.swift
+++ b/iOS/Timeline/TimelineDataSource.swift
@@ -1,5 +1,5 @@
 //
-//  MasterTimelineDataSource.swift
+//  TimelineDataSource.swift
 //  NetNewsWire-iOS
 //
 //  Created by Maurice Parker on 8/30/19.
@@ -8,7 +8,7 @@
 
 import UIKit
 
-class MasterTimelineDataSource<SectionIdentifierType, ItemIdentifierType>: UITableViewDiffableDataSource<SectionIdentifierType, ItemIdentifierType> where SectionIdentifierType : Hashable, ItemIdentifierType : Hashable {
+class TimelineDataSource<SectionIdentifierType, ItemIdentifierType>: UITableViewDiffableDataSource<SectionIdentifierType, ItemIdentifierType> where SectionIdentifierType : Hashable, ItemIdentifierType : Hashable {
 	
 	override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
 		return true