diff --git a/iOS/Add/Add.storyboard b/iOS/MainWindow/Add/Add.storyboard
similarity index 100%
rename from iOS/Add/Add.storyboard
rename to iOS/MainWindow/Add/Add.storyboard
diff --git a/iOS/Add/AddComboTableViewCell.swift b/iOS/MainWindow/Add/AddComboTableViewCell.swift
similarity index 100%
rename from iOS/Add/AddComboTableViewCell.swift
rename to iOS/MainWindow/Add/AddComboTableViewCell.swift
diff --git a/iOS/Add/AddFeedFolderViewController.swift b/iOS/MainWindow/Add/AddFeedFolderViewController.swift
similarity index 100%
rename from iOS/Add/AddFeedFolderViewController.swift
rename to iOS/MainWindow/Add/AddFeedFolderViewController.swift
diff --git a/iOS/Add/AddFeedSelectFolderTableViewCell.swift b/iOS/MainWindow/Add/AddFeedSelectFolderTableViewCell.swift
similarity index 100%
rename from iOS/Add/AddFeedSelectFolderTableViewCell.swift
rename to iOS/MainWindow/Add/AddFeedSelectFolderTableViewCell.swift
diff --git a/iOS/Add/AddFeedSelectFolderTableViewCell.xib b/iOS/MainWindow/Add/AddFeedSelectFolderTableViewCell.xib
similarity index 100%
rename from iOS/Add/AddFeedSelectFolderTableViewCell.xib
rename to iOS/MainWindow/Add/AddFeedSelectFolderTableViewCell.xib
diff --git a/iOS/Add/AddFeedViewController.swift b/iOS/MainWindow/Add/AddFeedViewController.swift
similarity index 100%
rename from iOS/Add/AddFeedViewController.swift
rename to iOS/MainWindow/Add/AddFeedViewController.swift
diff --git a/iOS/Add/AddFolderViewController.swift b/iOS/MainWindow/Add/AddFolderViewController.swift
similarity index 100%
rename from iOS/Add/AddFolderViewController.swift
rename to iOS/MainWindow/Add/AddFolderViewController.swift
diff --git a/iOS/Add/SelectComboTableViewCell.swift b/iOS/MainWindow/Add/SelectComboTableViewCell.swift
similarity index 100%
rename from iOS/Add/SelectComboTableViewCell.swift
rename to iOS/MainWindow/Add/SelectComboTableViewCell.swift
diff --git a/iOS/Article/ArticleExtractorButton.swift b/iOS/MainWindow/Article/ArticleExtractorButton.swift
similarity index 100%
rename from iOS/Article/ArticleExtractorButton.swift
rename to iOS/MainWindow/Article/ArticleExtractorButton.swift
diff --git a/iOS/Article/ArticleSearchBar.swift b/iOS/MainWindow/Article/ArticleSearchBar.swift
similarity index 100%
rename from iOS/Article/ArticleSearchBar.swift
rename to iOS/MainWindow/Article/ArticleSearchBar.swift
diff --git a/iOS/Article/ArticleViewController.swift b/iOS/MainWindow/Article/ArticleViewController.swift
similarity index 100%
rename from iOS/Article/ArticleViewController.swift
rename to iOS/MainWindow/Article/ArticleViewController.swift
diff --git a/iOS/Article/ContextMenuPreviewViewController.swift b/iOS/MainWindow/Article/ContextMenuPreviewViewController.swift
similarity index 100%
rename from iOS/Article/ContextMenuPreviewViewController.swift
rename to iOS/MainWindow/Article/ContextMenuPreviewViewController.swift
diff --git a/iOS/Article/ContextMenuPreviewViewController.xib b/iOS/MainWindow/Article/ContextMenuPreviewViewController.xib
similarity index 100%
rename from iOS/Article/ContextMenuPreviewViewController.xib
rename to iOS/MainWindow/Article/ContextMenuPreviewViewController.xib
diff --git a/iOS/Article/FindInArticleActivity.swift b/iOS/MainWindow/Article/FindInArticleActivity.swift
similarity index 100%
rename from iOS/Article/FindInArticleActivity.swift
rename to iOS/MainWindow/Article/FindInArticleActivity.swift
diff --git a/iOS/Article/ImageScrollView.swift b/iOS/MainWindow/Article/ImageScrollView.swift
similarity index 100%
rename from iOS/Article/ImageScrollView.swift
rename to iOS/MainWindow/Article/ImageScrollView.swift
diff --git a/iOS/Article/ImageTransition.swift b/iOS/MainWindow/Article/ImageTransition.swift
similarity index 100%
rename from iOS/Article/ImageTransition.swift
rename to iOS/MainWindow/Article/ImageTransition.swift
diff --git a/iOS/Article/ImageViewController.swift b/iOS/MainWindow/Article/ImageViewController.swift
similarity index 100%
rename from iOS/Article/ImageViewController.swift
rename to iOS/MainWindow/Article/ImageViewController.swift
diff --git a/iOS/Article/ImageViewController.xib b/iOS/MainWindow/Article/ImageViewController.xib
similarity index 100%
rename from iOS/Article/ImageViewController.xib
rename to iOS/MainWindow/Article/ImageViewController.xib
diff --git a/iOS/Article/OpenInSafariActivity.swift b/iOS/MainWindow/Article/OpenInSafariActivity.swift
similarity index 100%
rename from iOS/Article/OpenInSafariActivity.swift
rename to iOS/MainWindow/Article/OpenInSafariActivity.swift
diff --git a/iOS/Article/WebViewController.swift b/iOS/MainWindow/Article/WebViewController.swift
similarity index 100%
rename from iOS/Article/WebViewController.swift
rename to iOS/MainWindow/Article/WebViewController.swift
diff --git a/iOS/Article/WrapperScriptMessageHandler.swift b/iOS/MainWindow/Article/WrapperScriptMessageHandler.swift
similarity index 100%
rename from iOS/Article/WrapperScriptMessageHandler.swift
rename to iOS/MainWindow/Article/WrapperScriptMessageHandler.swift
diff --git a/iOS/MainFeed/Cell/MainFeedRowIdentifier.swift b/iOS/MainWindow/MainFeed/Cell/MainFeedRowIdentifier.swift
similarity index 100%
rename from iOS/MainFeed/Cell/MainFeedRowIdentifier.swift
rename to iOS/MainWindow/MainFeed/Cell/MainFeedRowIdentifier.swift
diff --git a/iOS/MainFeed/Cell/MainFeedTableViewCell.swift b/iOS/MainWindow/MainFeed/Cell/MainFeedTableViewCell.swift
similarity index 100%
rename from iOS/MainFeed/Cell/MainFeedTableViewCell.swift
rename to iOS/MainWindow/MainFeed/Cell/MainFeedTableViewCell.swift
diff --git a/iOS/MainFeed/Cell/MainFeedTableViewCellLayout.swift b/iOS/MainWindow/MainFeed/Cell/MainFeedTableViewCellLayout.swift
similarity index 100%
rename from iOS/MainFeed/Cell/MainFeedTableViewCellLayout.swift
rename to iOS/MainWindow/MainFeed/Cell/MainFeedTableViewCellLayout.swift
diff --git a/iOS/MainFeed/Cell/MainFeedTableViewSectionHeader.swift b/iOS/MainWindow/MainFeed/Cell/MainFeedTableViewSectionHeader.swift
similarity index 100%
rename from iOS/MainFeed/Cell/MainFeedTableViewSectionHeader.swift
rename to iOS/MainWindow/MainFeed/Cell/MainFeedTableViewSectionHeader.swift
diff --git a/iOS/MainFeed/Cell/MainFeedTableViewSectionHeaderLayout.swift b/iOS/MainWindow/MainFeed/Cell/MainFeedTableViewSectionHeaderLayout.swift
similarity index 100%
rename from iOS/MainFeed/Cell/MainFeedTableViewSectionHeaderLayout.swift
rename to iOS/MainWindow/MainFeed/Cell/MainFeedTableViewSectionHeaderLayout.swift
diff --git a/iOS/MainFeed/Cell/MainFeedUnreadCountView.swift b/iOS/MainWindow/MainFeed/Cell/MainFeedUnreadCountView.swift
similarity index 100%
rename from iOS/MainFeed/Cell/MainFeedUnreadCountView.swift
rename to iOS/MainWindow/MainFeed/Cell/MainFeedUnreadCountView.swift
diff --git a/iOS/MainFeed/MainFeedViewController+Drag.swift b/iOS/MainWindow/MainFeed/MainFeedViewController+Drag.swift
similarity index 100%
rename from iOS/MainFeed/MainFeedViewController+Drag.swift
rename to iOS/MainWindow/MainFeed/MainFeedViewController+Drag.swift
diff --git a/iOS/MainFeed/MainFeedViewController+Drop.swift b/iOS/MainWindow/MainFeed/MainFeedViewController+Drop.swift
similarity index 100%
rename from iOS/MainFeed/MainFeedViewController+Drop.swift
rename to iOS/MainWindow/MainFeed/MainFeedViewController+Drop.swift
diff --git a/iOS/MainFeed/MainFeedViewController.swift b/iOS/MainWindow/MainFeed/MainFeedViewController.swift
similarity index 100%
rename from iOS/MainFeed/MainFeedViewController.swift
rename to iOS/MainWindow/MainFeed/MainFeedViewController.swift
diff --git a/iOS/MainFeed/RefreshProgressView.swift b/iOS/MainWindow/MainFeed/RefreshProgressView.swift
similarity index 100%
rename from iOS/MainFeed/RefreshProgressView.swift
rename to iOS/MainWindow/MainFeed/RefreshProgressView.swift
diff --git a/iOS/MainFeed/RefreshProgressView.xib b/iOS/MainWindow/MainFeed/RefreshProgressView.xib
similarity index 100%
rename from iOS/MainFeed/RefreshProgressView.xib
rename to iOS/MainWindow/MainFeed/RefreshProgressView.xib
diff --git a/iOS/MainFeed/ShadowTableChanges.swift b/iOS/MainWindow/MainFeed/ShadowTableChanges.swift
similarity index 100%
rename from iOS/MainFeed/ShadowTableChanges.swift
rename to iOS/MainWindow/MainFeed/ShadowTableChanges.swift
diff --git a/iOS/MainTimeline/Cell/MainTimelineAccessibilityCellLayout.swift b/iOS/MainWindow/MainTimeline/Cell/MainTimelineAccessibilityCellLayout.swift
similarity index 100%
rename from iOS/MainTimeline/Cell/MainTimelineAccessibilityCellLayout.swift
rename to iOS/MainWindow/MainTimeline/Cell/MainTimelineAccessibilityCellLayout.swift
diff --git a/iOS/MainTimeline/Cell/MainTimelineCellData.swift b/iOS/MainWindow/MainTimeline/Cell/MainTimelineCellData.swift
similarity index 100%
rename from iOS/MainTimeline/Cell/MainTimelineCellData.swift
rename to iOS/MainWindow/MainTimeline/Cell/MainTimelineCellData.swift
diff --git a/iOS/MainTimeline/Cell/MainTimelineCellLayout.swift b/iOS/MainWindow/MainTimeline/Cell/MainTimelineCellLayout.swift
similarity index 100%
rename from iOS/MainTimeline/Cell/MainTimelineCellLayout.swift
rename to iOS/MainWindow/MainTimeline/Cell/MainTimelineCellLayout.swift
diff --git a/iOS/MainTimeline/Cell/MainTimelineDefaultCellLayout.swift b/iOS/MainWindow/MainTimeline/Cell/MainTimelineDefaultCellLayout.swift
similarity index 100%
rename from iOS/MainTimeline/Cell/MainTimelineDefaultCellLayout.swift
rename to iOS/MainWindow/MainTimeline/Cell/MainTimelineDefaultCellLayout.swift
diff --git a/iOS/MainTimeline/Cell/MainTimelineTableViewCell.swift b/iOS/MainWindow/MainTimeline/Cell/MainTimelineTableViewCell.swift
similarity index 100%
rename from iOS/MainTimeline/Cell/MainTimelineTableViewCell.swift
rename to iOS/MainWindow/MainTimeline/Cell/MainTimelineTableViewCell.swift
diff --git a/iOS/MainTimeline/Cell/MainUnreadIndicatorView.swift b/iOS/MainWindow/MainTimeline/Cell/MainUnreadIndicatorView.swift
similarity index 100%
rename from iOS/MainTimeline/Cell/MainUnreadIndicatorView.swift
rename to iOS/MainWindow/MainTimeline/Cell/MainUnreadIndicatorView.swift
diff --git a/iOS/MainTimeline/Cell/MultilineUILabelSizer.swift b/iOS/MainWindow/MainTimeline/Cell/MultilineUILabelSizer.swift
similarity index 100%
rename from iOS/MainTimeline/Cell/MultilineUILabelSizer.swift
rename to iOS/MainWindow/MainTimeline/Cell/MultilineUILabelSizer.swift
diff --git a/iOS/MainTimeline/Cell/SingleLineUILabelSizer.swift b/iOS/MainWindow/MainTimeline/Cell/SingleLineUILabelSizer.swift
similarity index 100%
rename from iOS/MainTimeline/Cell/SingleLineUILabelSizer.swift
rename to iOS/MainWindow/MainTimeline/Cell/SingleLineUILabelSizer.swift
diff --git a/iOS/MainTimeline/MainTimelineDataSource.swift b/iOS/MainWindow/MainTimeline/MainTimelineDataSource.swift
similarity index 100%
rename from iOS/MainTimeline/MainTimelineDataSource.swift
rename to iOS/MainWindow/MainTimeline/MainTimelineDataSource.swift
diff --git a/iOS/MainTimeline/MainTimelineTitleView.swift b/iOS/MainWindow/MainTimeline/MainTimelineTitleView.swift
similarity index 100%
rename from iOS/MainTimeline/MainTimelineTitleView.swift
rename to iOS/MainWindow/MainTimeline/MainTimelineTitleView.swift
diff --git a/iOS/MainTimeline/MainTimelineTitleView.xib b/iOS/MainWindow/MainTimeline/MainTimelineTitleView.xib
similarity index 100%
rename from iOS/MainTimeline/MainTimelineTitleView.xib
rename to iOS/MainWindow/MainTimeline/MainTimelineTitleView.xib
diff --git a/iOS/MainTimeline/MainTimelineUnreadCountView.swift b/iOS/MainWindow/MainTimeline/MainTimelineUnreadCountView.swift
similarity index 100%
rename from iOS/MainTimeline/MainTimelineUnreadCountView.swift
rename to iOS/MainWindow/MainTimeline/MainTimelineUnreadCountView.swift
diff --git a/iOS/MainTimeline/MarkAsReadAlertController.swift b/iOS/MainWindow/MainTimeline/MarkAsReadAlertController.swift
similarity index 100%
rename from iOS/MainTimeline/MarkAsReadAlertController.swift
rename to iOS/MainWindow/MainTimeline/MarkAsReadAlertController.swift
diff --git a/iOS/MainTimeline/TimelineViewController.swift b/iOS/MainWindow/MainTimeline/TimelineViewController.swift
similarity index 100%
rename from iOS/MainTimeline/TimelineViewController.swift
rename to iOS/MainWindow/MainTimeline/TimelineViewController.swift