diff --git a/AsyncDisplayKit-iOS/AsyncDisplayKit.h b/AsyncDisplayKit-iOS/AsyncDisplayKit.h
deleted file mode 100644
index ab5540f549..0000000000
--- a/AsyncDisplayKit-iOS/AsyncDisplayKit.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for AsyncDisplayKit-iOS.
-FOUNDATION_EXPORT double AsyncDisplayKit_iOSVersionNumber;
-
-//! Project version string for AsyncDisplayKit-iOS.
-FOUNDATION_EXPORT const unsigned char AsyncDisplayKit_iOSVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <AsyncDisplayKit_iOS/PublicHeader.h>
-
-#import <AsyncDisplayKit/ASDisplayNode.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-
-#import <AsyncDisplayKit/ASControlNode.h>
-#import <AsyncDisplayKit/ASImageNode.h>
-#import <AsyncDisplayKit/ASTextNode.h>
-
-#import <AsyncDisplayKit/ASEditableTextNode.h>
-
-#import <AsyncDisplayKit/ASBasicImageDownloader.h>
-#import <AsyncDisplayKit/ASMultiplexImageNode.h>
-#import <AsyncDisplayKit/ASNetworkImageNode.h>
-
-#import <AsyncDisplayKit/ASTableView.h>
-#import <AsyncDisplayKit/ASCollectionView.h>
-#import <AsyncDisplayKit/ASCellNode.h>
-
-#import <AsyncDisplayKit/ASScrollNode.h>
-
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASLayoutable.h>
-#import <AsyncDisplayKit/ASLayoutSpec.h>
-#import <AsyncDisplayKit/ASBackgroundLayoutSpec.h>
-#import <AsyncDisplayKit/ASCenterLayoutSpec.h>
-#import <AsyncDisplayKit/ASInsetLayoutSpec.h>
-#import <AsyncDisplayKit/ASOverlayLayoutSpec.h>
-#import <AsyncDisplayKit/ASRatioLayoutSpec.h>
-#import <AsyncDisplayKit/ASStaticLayoutSpec.h>
-#import <AsyncDisplayKit/ASStackLayoutDefines.h>
-#import <AsyncDisplayKit/ASStackLayoutSpec.h>
-
-#import <AsyncDisplayKit/_ASAsyncTransaction.h>
-#import <AsyncDisplayKit/_ASAsyncTransactionContainer+Private.h>
-#import <AsyncDisplayKit/_ASAsyncTransactionGroup.h>
-#import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/_ASDisplayView.h>
-#import <AsyncDisplayKit/ASAvailability.h>
-#import <AsyncDisplayKit/ASBaselineLayoutSpec.h>
-//#import <AsyncDisplayKit/ASBaselinePositionedLayout.h>
-#import <AsyncDisplayKit/ASCollectionViewLayoutController.h>
-#import <AsyncDisplayKit/ASControlNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtraIvars.h>
-#import <AsyncDisplayKit/ASHighlightOverlayLayer.h>
-#import <AsyncDisplayKit/ASIndexPath.h>
-#import <AsyncDisplayKit/ASLog.h>
-#import <AsyncDisplayKit/ASMutableAttributedStringBuilder.h>
-#import <AsyncDisplayKit/ASRangeHandler.h>
-#import <AsyncDisplayKit/ASRangeHandlerPreload.h>
-#import <AsyncDisplayKit/ASRangeHandlerRender.h>
-//#import <AsyncDisplayKit/ASStackUnpositionedLayout.h>
-#import <AsyncDisplayKit/ASTextNodeCoreTextAdditions.h>
-#import <AsyncDisplayKit/ASTextNodeRenderer.h>
-#import <AsyncDisplayKit/ASTextNodeShadower.h>
-#import <AsyncDisplayKit/ASTextNodeTextKitHelpers.h>
-#import <AsyncDisplayKit/ASTextNodeTypes.h>
-#import <AsyncDisplayKit/ASTextNodeWordKerner.h>
-#import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/NSMutableAttributedString+TextKitAdditions.h>
-#import <AsyncDisplayKit/UIView+ASConvenience.h>
diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj
index f47119405d..ecace4fe53 100644
--- a/AsyncDisplayKit.xcodeproj/project.pbxproj
+++ b/AsyncDisplayKit.xcodeproj/project.pbxproj
@@ -166,6 +166,7 @@
 		299DA1A91A828D2900162D41 /* ASBatchContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 299DA1A71A828D2900162D41 /* ASBatchContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		299DA1AA1A828D2900162D41 /* ASBatchContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 299DA1A81A828D2900162D41 /* ASBatchContext.mm */; };
 		29CDC2E21AAE70D000833CA4 /* ASBasicImageDownloaderContextTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CDC2E11AAE70D000833CA4 /* ASBasicImageDownloaderContextTests.m */; };
+		2C107F5B1BA9F54500F13DE5 /* AsyncDisplayKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34EFC75B1B701BAF00AD841F /* ASDimension.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED071B17843500DA7C62 /* ASDimension.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34EFC75C1B701BD200AD841F /* ASDimension.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED081B17843500DA7C62 /* ASDimension.mm */; };
 		34EFC75D1B701BE900AD841F /* ASInternalHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED431B17847A00DA7C62 /* ASInternalHelpers.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -274,7 +275,6 @@
 		ACF6ED611B178DC700DA7C62 /* ASOverlayLayoutSpecSnapshotTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED591B178DC700DA7C62 /* ASOverlayLayoutSpecSnapshotTests.mm */; };
 		ACF6ED621B178DC700DA7C62 /* ASRatioLayoutSpecSnapshotTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED5A1B178DC700DA7C62 /* ASRatioLayoutSpecSnapshotTests.mm */; };
 		ACF6ED631B178DC700DA7C62 /* ASStackLayoutSpecSnapshotTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED5B1B178DC700DA7C62 /* ASStackLayoutSpecSnapshotTests.mm */; };
-		B35061DF1B010EDF0018CF92 /* AsyncDisplayKit.h in Headers */ = {isa = PBXBuildFile; fileRef = B35061DE1B010EDF0018CF92 /* AsyncDisplayKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B35061F31B010EFD0018CF92 /* ASCellNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 055F1A3A19ABD43F004DAFF1 /* ASCellNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B35061F51B010EFD0018CF92 /* ASCollectionView.h in Headers */ = {isa = PBXBuildFile; fileRef = AC3C4A4F1A1139C100143C57 /* ASCollectionView.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B35061F61B010EFD0018CF92 /* ASCollectionView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC3C4A501A1139C100143C57 /* ASCollectionView.mm */; };
@@ -620,7 +620,6 @@
 		ACF6ED5B1B178DC700DA7C62 /* ASStackLayoutSpecSnapshotTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASStackLayoutSpecSnapshotTests.mm; sourceTree = "<group>"; };
 		B35061DA1B010EDF0018CF92 /* AsyncDisplayKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AsyncDisplayKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B35061DD1B010EDF0018CF92 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = "../AsyncDisplayKit-iOS/Info.plist"; sourceTree = "<group>"; };
-		B35061DE1B010EDF0018CF92 /* AsyncDisplayKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AsyncDisplayKit.h; path = "../AsyncDisplayKit-iOS/AsyncDisplayKit.h"; sourceTree = "<group>"; };
 		D3779BCFF841AD3EB56537ED /* Pods-AsyncDisplayKitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AsyncDisplayKitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests.release.xcconfig"; sourceTree = "<group>"; };
 		D785F6601A74327E00291744 /* ASScrollNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASScrollNode.h; sourceTree = "<group>"; };
 		D785F6611A74327E00291744 /* ASScrollNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASScrollNode.m; sourceTree = "<group>"; };
@@ -996,7 +995,6 @@
 		B35061DB1B010EDF0018CF92 /* AsyncDisplayKit-iOS */ = {
 			isa = PBXGroup;
 			children = (
-				B35061DE1B010EDF0018CF92 /* AsyncDisplayKit.h */,
 				B35061DC1B010EDF0018CF92 /* Supporting Files */,
 			);
 			name = "AsyncDisplayKit-iOS";
@@ -1194,8 +1192,8 @@
 				34EFC7711B701CFF00AD841F /* ASStackLayoutSpec.h in Headers */,
 				B350625A1B010F070018CF92 /* ASDisplayNodeExtraIvars.h in Headers */,
 				B350621F1B010EFD0018CF92 /* ASImageProtocols.h in Headers */,
-				B35061DF1B010EDF0018CF92 /* AsyncDisplayKit.h in Headers */,
 				B350620A1B010EFD0018CF92 /* ASTableView.h in Headers */,
+				2C107F5B1BA9F54500F13DE5 /* AsyncDisplayKit.h in Headers */,
 				B35062451B010EFD0018CF92 /* ASBatchFetching.h in Headers */,
 				B350620C1B010EFD0018CF92 /* ASTableViewProtocols.h in Headers */,
 				B35062481B010EFD0018CF92 /* _AS-objc-internal.h in Headers */,
diff --git a/AsyncDisplayKit/AsyncDisplayKit.h b/AsyncDisplayKit/AsyncDisplayKit.h
index b65d144f69..2e00709122 100644
--- a/AsyncDisplayKit/AsyncDisplayKit.h
+++ b/AsyncDisplayKit/AsyncDisplayKit.h
@@ -37,3 +37,33 @@
 #import <AsyncDisplayKit/ASStaticLayoutSpec.h>
 #import <AsyncDisplayKit/ASStackLayoutDefines.h>
 #import <AsyncDisplayKit/ASStackLayoutSpec.h>
+
+#import <AsyncDisplayKit/_ASAsyncTransaction.h>
+#import <AsyncDisplayKit/_ASAsyncTransactionContainer+Private.h>
+#import <AsyncDisplayKit/_ASAsyncTransactionGroup.h>
+#import <AsyncDisplayKit/_ASDisplayLayer.h>
+#import <AsyncDisplayKit/_ASDisplayView.h>
+#import <AsyncDisplayKit/ASAvailability.h>
+#import <AsyncDisplayKit/ASBaselineLayoutSpec.h>
+//#import <AsyncDisplayKit/ASBaselinePositionedLayout.h>
+#import <AsyncDisplayKit/ASCollectionViewLayoutController.h>
+#import <AsyncDisplayKit/ASControlNode+Subclasses.h>
+#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
+#import <AsyncDisplayKit/ASDisplayNodeExtraIvars.h>
+#import <AsyncDisplayKit/ASHighlightOverlayLayer.h>
+#import <AsyncDisplayKit/ASIndexPath.h>
+#import <AsyncDisplayKit/ASLog.h>
+#import <AsyncDisplayKit/ASMutableAttributedStringBuilder.h>
+#import <AsyncDisplayKit/ASRangeHandler.h>
+#import <AsyncDisplayKit/ASRangeHandlerPreload.h>
+#import <AsyncDisplayKit/ASRangeHandlerRender.h>
+//#import <AsyncDisplayKit/ASStackUnpositionedLayout.h>
+#import <AsyncDisplayKit/ASTextNodeCoreTextAdditions.h>
+#import <AsyncDisplayKit/ASTextNodeRenderer.h>
+#import <AsyncDisplayKit/ASTextNodeShadower.h>
+#import <AsyncDisplayKit/ASTextNodeTextKitHelpers.h>
+#import <AsyncDisplayKit/ASTextNodeTypes.h>
+#import <AsyncDisplayKit/ASTextNodeWordKerner.h>
+#import <AsyncDisplayKit/ASThread.h>
+#import <AsyncDisplayKit/NSMutableAttributedString+TextKitAdditions.h>
+#import <AsyncDisplayKit/UIView+ASConvenience.h>