diff --git a/iOS/MainWindow/MainFeed/Cell/MainFeedRowIdentifier.swift b/iOS/MainWindow/Sidebar/Cell/MainFeedRowIdentifier.swift
similarity index 100%
rename from iOS/MainWindow/MainFeed/Cell/MainFeedRowIdentifier.swift
rename to iOS/MainWindow/Sidebar/Cell/MainFeedRowIdentifier.swift
diff --git a/iOS/MainWindow/MainFeed/Cell/MainFeedTableViewCell.swift b/iOS/MainWindow/Sidebar/Cell/MainFeedTableViewCell.swift
similarity index 100%
rename from iOS/MainWindow/MainFeed/Cell/MainFeedTableViewCell.swift
rename to iOS/MainWindow/Sidebar/Cell/MainFeedTableViewCell.swift
diff --git a/iOS/MainWindow/MainFeed/Cell/MainFeedTableViewCellLayout.swift b/iOS/MainWindow/Sidebar/Cell/MainFeedTableViewCellLayout.swift
similarity index 100%
rename from iOS/MainWindow/MainFeed/Cell/MainFeedTableViewCellLayout.swift
rename to iOS/MainWindow/Sidebar/Cell/MainFeedTableViewCellLayout.swift
diff --git a/iOS/MainWindow/MainFeed/Cell/MainFeedTableViewSectionHeader.swift b/iOS/MainWindow/Sidebar/Cell/MainFeedTableViewSectionHeader.swift
similarity index 100%
rename from iOS/MainWindow/MainFeed/Cell/MainFeedTableViewSectionHeader.swift
rename to iOS/MainWindow/Sidebar/Cell/MainFeedTableViewSectionHeader.swift
diff --git a/iOS/MainWindow/MainFeed/Cell/MainFeedTableViewSectionHeaderLayout.swift b/iOS/MainWindow/Sidebar/Cell/MainFeedTableViewSectionHeaderLayout.swift
similarity index 100%
rename from iOS/MainWindow/MainFeed/Cell/MainFeedTableViewSectionHeaderLayout.swift
rename to iOS/MainWindow/Sidebar/Cell/MainFeedTableViewSectionHeaderLayout.swift
diff --git a/iOS/MainWindow/MainFeed/Cell/MainFeedUnreadCountView.swift b/iOS/MainWindow/Sidebar/Cell/MainFeedUnreadCountView.swift
similarity index 100%
rename from iOS/MainWindow/MainFeed/Cell/MainFeedUnreadCountView.swift
rename to iOS/MainWindow/Sidebar/Cell/MainFeedUnreadCountView.swift
diff --git a/iOS/MainWindow/MainFeed/MainFeedViewController+Drag.swift b/iOS/MainWindow/Sidebar/MainFeedViewController+Drag.swift
similarity index 100%
rename from iOS/MainWindow/MainFeed/MainFeedViewController+Drag.swift
rename to iOS/MainWindow/Sidebar/MainFeedViewController+Drag.swift
diff --git a/iOS/MainWindow/MainFeed/MainFeedViewController+Drop.swift b/iOS/MainWindow/Sidebar/MainFeedViewController+Drop.swift
similarity index 100%
rename from iOS/MainWindow/MainFeed/MainFeedViewController+Drop.swift
rename to iOS/MainWindow/Sidebar/MainFeedViewController+Drop.swift
diff --git a/iOS/MainWindow/MainFeed/MainFeedViewController.swift b/iOS/MainWindow/Sidebar/MainFeedViewController.swift
similarity index 100%
rename from iOS/MainWindow/MainFeed/MainFeedViewController.swift
rename to iOS/MainWindow/Sidebar/MainFeedViewController.swift
diff --git a/iOS/MainWindow/MainFeed/RefreshProgressView.swift b/iOS/MainWindow/Sidebar/RefreshProgressView.swift
similarity index 100%
rename from iOS/MainWindow/MainFeed/RefreshProgressView.swift
rename to iOS/MainWindow/Sidebar/RefreshProgressView.swift
diff --git a/iOS/MainWindow/MainFeed/RefreshProgressView.xib b/iOS/MainWindow/Sidebar/RefreshProgressView.xib
similarity index 100%
rename from iOS/MainWindow/MainFeed/RefreshProgressView.xib
rename to iOS/MainWindow/Sidebar/RefreshProgressView.xib
diff --git a/iOS/MainWindow/MainFeed/ShadowTableChanges.swift b/iOS/MainWindow/Sidebar/ShadowTableChanges.swift
similarity index 100%
rename from iOS/MainWindow/MainFeed/ShadowTableChanges.swift
rename to iOS/MainWindow/Sidebar/ShadowTableChanges.swift
diff --git a/iOS/MainWindow/MainTimeline/Cell/MainTimelineAccessibilityCellLayout.swift b/iOS/MainWindow/Timeline/Cell/MainTimelineAccessibilityCellLayout.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/Cell/MainTimelineAccessibilityCellLayout.swift
rename to iOS/MainWindow/Timeline/Cell/MainTimelineAccessibilityCellLayout.swift
diff --git a/iOS/MainWindow/MainTimeline/Cell/MainTimelineCellData.swift b/iOS/MainWindow/Timeline/Cell/MainTimelineCellData.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/Cell/MainTimelineCellData.swift
rename to iOS/MainWindow/Timeline/Cell/MainTimelineCellData.swift
diff --git a/iOS/MainWindow/MainTimeline/Cell/MainTimelineCellLayout.swift b/iOS/MainWindow/Timeline/Cell/MainTimelineCellLayout.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/Cell/MainTimelineCellLayout.swift
rename to iOS/MainWindow/Timeline/Cell/MainTimelineCellLayout.swift
diff --git a/iOS/MainWindow/MainTimeline/Cell/MainTimelineDefaultCellLayout.swift b/iOS/MainWindow/Timeline/Cell/MainTimelineDefaultCellLayout.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/Cell/MainTimelineDefaultCellLayout.swift
rename to iOS/MainWindow/Timeline/Cell/MainTimelineDefaultCellLayout.swift
diff --git a/iOS/MainWindow/MainTimeline/Cell/MainTimelineTableViewCell.swift b/iOS/MainWindow/Timeline/Cell/MainTimelineTableViewCell.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/Cell/MainTimelineTableViewCell.swift
rename to iOS/MainWindow/Timeline/Cell/MainTimelineTableViewCell.swift
diff --git a/iOS/MainWindow/MainTimeline/Cell/MainUnreadIndicatorView.swift b/iOS/MainWindow/Timeline/Cell/MainUnreadIndicatorView.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/Cell/MainUnreadIndicatorView.swift
rename to iOS/MainWindow/Timeline/Cell/MainUnreadIndicatorView.swift
diff --git a/iOS/MainWindow/MainTimeline/Cell/MultilineUILabelSizer.swift b/iOS/MainWindow/Timeline/Cell/MultilineUILabelSizer.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/Cell/MultilineUILabelSizer.swift
rename to iOS/MainWindow/Timeline/Cell/MultilineUILabelSizer.swift
diff --git a/iOS/MainWindow/MainTimeline/Cell/SingleLineUILabelSizer.swift b/iOS/MainWindow/Timeline/Cell/SingleLineUILabelSizer.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/Cell/SingleLineUILabelSizer.swift
rename to iOS/MainWindow/Timeline/Cell/SingleLineUILabelSizer.swift
diff --git a/iOS/MainWindow/MainTimeline/MainTimelineDataSource.swift b/iOS/MainWindow/Timeline/MainTimelineDataSource.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/MainTimelineDataSource.swift
rename to iOS/MainWindow/Timeline/MainTimelineDataSource.swift
diff --git a/iOS/MainWindow/MainTimeline/MainTimelineTitleView.swift b/iOS/MainWindow/Timeline/MainTimelineTitleView.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/MainTimelineTitleView.swift
rename to iOS/MainWindow/Timeline/MainTimelineTitleView.swift
diff --git a/iOS/MainWindow/MainTimeline/MainTimelineTitleView.xib b/iOS/MainWindow/Timeline/MainTimelineTitleView.xib
similarity index 100%
rename from iOS/MainWindow/MainTimeline/MainTimelineTitleView.xib
rename to iOS/MainWindow/Timeline/MainTimelineTitleView.xib
diff --git a/iOS/MainWindow/MainTimeline/MainTimelineUnreadCountView.swift b/iOS/MainWindow/Timeline/MainTimelineUnreadCountView.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/MainTimelineUnreadCountView.swift
rename to iOS/MainWindow/Timeline/MainTimelineUnreadCountView.swift
diff --git a/iOS/MainWindow/MainTimeline/MarkAsReadAlertController.swift b/iOS/MainWindow/Timeline/MarkAsReadAlertController.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/MarkAsReadAlertController.swift
rename to iOS/MainWindow/Timeline/MarkAsReadAlertController.swift
diff --git a/iOS/MainWindow/MainTimeline/TimelineViewController.swift b/iOS/MainWindow/Timeline/TimelineViewController.swift
similarity index 100%
rename from iOS/MainWindow/MainTimeline/TimelineViewController.swift
rename to iOS/MainWindow/Timeline/TimelineViewController.swift