diff --git a/BUCK b/BUCK
index 3d6afcc743..fe788a304d 100644
--- a/BUCK
+++ b/BUCK
@@ -464,8 +464,8 @@ apple_binary(
         "-DTARGET_OS_WATCH=1",
     ],
     linker_flags = [
-        "-e",
-        "_NSExtensionMain",
+        #"-e",
+        #"_NSExtensionMain",
     ],
     configs = watch_extension_binary_configs(),
     frameworks = [
diff --git a/Wallet/Wallet.tulsiproj/Configs/Default.tulsigen b/Wallet/Wallet.tulsiproj/Configs/Default.tulsigen
index ab962d626b..5cb19fab09 100644
--- a/Wallet/Wallet.tulsiproj/Configs/Default.tulsigen
+++ b/Wallet/Wallet.tulsiproj/Configs/Default.tulsigen
@@ -9,7 +9,7 @@
   ],
   "optionSet" : {
     "BazelBuildOptionsDebug" : {
-      "p" : "$(inherited)"
+      "p" : "$(inherited) -j 1"
     },
     "BazelBuildOptionsRelease" : {
       "p" : "$(inherited)"
diff --git a/submodules/AsyncDisplayKit/BUILD b/submodules/AsyncDisplayKit/BUILD
index 8786111315..bd59107e16 100644
--- a/submodules/AsyncDisplayKit/BUILD
+++ b/submodules/AsyncDisplayKit/BUILD
@@ -1,30 +1,113 @@
 
-ASYNCDISPLAYKIT_EXPORTED_HEADERS = glob([
+public_header_names = [
+  "ASAvailability.h",
+  "ASBaseDefines.h",
+  "ASDisplayNode.h",
+  "ASDisplayNode+Ancestry.h",
+  "ASDisplayNode+Convenience.h",
+  "ASDisplayNodeExtras.h",
+  "ASConfiguration.h",
+  "ASConfigurationDelegate.h",
+  "ASConfigurationInternal.h",
+
+  "ASControlNode.h",
+  "ASImageNode.h",
+  "ASTextNode.h",
+  "ASTextNode2.h",
+  "ASEditableTextNode.h",
+  "ASButtonNode.h",
+
+  "ASImageProtocols.h",
+
+  "ASRangeManagingNode.h",
+  "ASSectionContext.h",
+
+  "ASElementMap.h",
+
+  "ASSupplementaryNodeSource.h",
+
+  "ASScrollNode.h",
+
+  "ASNodeController+Beta.h",
+  "ASViewController.h",
+  "ASNavigationController.h",
+  "ASTabBarController.h",
+  "ASRangeControllerUpdateRangeProtocol+Beta.h",
+
+  "ASLayout.h",
+  "ASDimension.h",
+  "ASDimensionInternal.h",
+  "ASLayoutElement.h",
+  "ASLayoutSpec.h",
+  "ASBackgroundLayoutSpec.h",
+  "ASCenterLayoutSpec.h",
+  "ASCornerLayoutSpec.h",
+  "ASRelativeLayoutSpec.h",
+  "ASInsetLayoutSpec.h",
+  "ASOverlayLayoutSpec.h",
+  "ASRatioLayoutSpec.h",
+  "ASAbsoluteLayoutSpec.h",
+  "ASStackLayoutDefines.h",
+  "ASStackLayoutSpec.h",
+
+  "_ASAsyncTransaction.h",
+  "_ASAsyncTransactionGroup.h",
+  "_ASAsyncTransactionContainer.h",
+  "ASCollections.h",
+  "_ASDisplayLayer.h",
+  "_ASDisplayView.h",
+  "ASDisplayNode+Beta.h",
+  "ASTextNode+Beta.h",
+  "ASTextNodeTypes.h",
+  "ASBlockTypes.h",
+  "ASContextTransitioning.h",
+  "ASControlNode+Subclasses.h",
+  "ASDisplayNode+Subclasses.h",
+  "ASEqualityHelpers.h",
+  "ASEventLog.h",
+  "ASHashing.h",
+  "ASHighlightOverlayLayer.h",
+  "ASImageContainerProtocolCategories.h",
+  "ASLocking.h",
+  "ASLog.h",
+  "ASMainThreadDeallocation.h",
+  "ASMutableAttributedStringBuilder.h",
+  "ASRunLoopQueue.h",
+  "ASTextKitComponents.h",
+  "ASThread.h",
+  "ASTraitCollection.h",
+  "ASVisibilityProtocols.h",
+  "ASWeakSet.h",
+
+  "CoreGraphics+ASConvenience.h",
+  "NSMutableAttributedString+TextKitAdditions.h",
+  "UICollectionViewLayout+ASConvenience.h",
+  "UIView+ASConvenience.h",
+  "UIImage+ASConvenience.h",
+  "ASGraphicsContext.h",
+  "NSArray+Diffing.h",
+  "ASObjectDescriptionHelpers.h",
+  "UIResponder+AsyncDisplayKit.h",
+
+  "AsyncDisplayKit+Debug.h",
+
+  "ASExperimentalFeatures.h",
+  "ASAssert.h",
+]
+
+public_headers = ["Source/" + name for name in public_header_names]
+private_headers = glob([
   "Source/*.h",
-  "Source/Details/**/*.h",
-  "Source/Layout/*.h",
-  "Source/Base/*.h",
-  "Source/Debug/AsyncDisplayKit+Debug.h",
-  "Source/TextKit/ASTextNodeTypes.h",
-  "Source/TextKit/ASTextKitComponents.h",
-], exclude = ["_Source/AsyncDisplayKit.h"]
-)
-
-ASYNCDISPLAYKIT_PRIVATE_HEADERS = glob([
-    "Source/**/*.h"
-  ],
-  exclude = ASYNCDISPLAYKIT_EXPORTED_HEADERS + ["_Source/AsyncDisplayKit.h"],
-)
+], exclude = public_headers)
 
 exported_headers_rule_name = "AsyncDisplayKit_ExportedHeaders"
 exported_headers_path = "includedir"
 name = "AsyncDisplayKit"
-headers = ASYNCDISPLAYKIT_EXPORTED_HEADERS
 
 genrule(
   name = exported_headers_rule_name,
-  srcs = headers,
-  outs = [exported_headers_path + "/" + name + "/" + x.split('/')[::-1][0] for x in headers],
+  srcs = public_headers,
+  outs = [exported_headers_path + "/" + name + "/" + x.split('/')[::-1][0] for x in public_headers],
   cmd  = "cp $(SRCS) $(RULEDIR)" + "/" + exported_headers_path + "/" + name,
 )
 exported_headers = [":" + exported_headers_rule_name]
@@ -36,8 +119,7 @@ objc_library(
     srcs = glob([
         "Source/**/*.m",
         "Source/**/*.mm",
-        "Source/Base/*.m",
-    ]) + ASYNCDISPLAYKIT_EXPORTED_HEADERS + ASYNCDISPLAYKIT_PRIVATE_HEADERS,
+    ]) + private_headers,
     hdrs = exported_headers,
     defines = [
         "MINIMAL_ASDK",
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutElement.h b/submodules/AsyncDisplayKit/Source/ASAbsoluteLayoutElement.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutElement.h
rename to submodules/AsyncDisplayKit/Source/ASAbsoluteLayoutElement.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutSpec.h b/submodules/AsyncDisplayKit/Source/ASAbsoluteLayoutSpec.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutSpec.h
rename to submodules/AsyncDisplayKit/Source/ASAbsoluteLayoutSpec.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASAbsoluteLayoutSpec.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutSpec.mm
rename to submodules/AsyncDisplayKit/Source/ASAbsoluteLayoutSpec.mm
index 18a3a3a51c..781211ddd7 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASAbsoluteLayoutSpec.mm
+++ b/submodules/AsyncDisplayKit/Source/ASAbsoluteLayoutSpec.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASAbsoluteLayoutSpec.h>
+#import "ASAbsoluteLayoutSpec.h"
 
 #import <AsyncDisplayKit/ASCollections.h>
 #import <AsyncDisplayKit/ASLayout.h>
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASAbstractLayoutController+FrameworkPrivate.h b/submodules/AsyncDisplayKit/Source/ASAbstractLayoutController+FrameworkPrivate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASAbstractLayoutController+FrameworkPrivate.h
rename to submodules/AsyncDisplayKit/Source/ASAbstractLayoutController+FrameworkPrivate.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASAbstractLayoutController.h b/submodules/AsyncDisplayKit/Source/ASAbstractLayoutController.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASAbstractLayoutController.h
rename to submodules/AsyncDisplayKit/Source/ASAbstractLayoutController.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASAbstractLayoutController.mm b/submodules/AsyncDisplayKit/Source/ASAbstractLayoutController.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASAbstractLayoutController.mm
rename to submodules/AsyncDisplayKit/Source/ASAbstractLayoutController.mm
index 9d6b61f689..4fe2ad091b 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASAbstractLayoutController.mm
+++ b/submodules/AsyncDisplayKit/Source/ASAbstractLayoutController.mm
@@ -7,8 +7,8 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASAbstractLayoutController.h>
-#import <AsyncDisplayKit/ASAbstractLayoutController+FrameworkPrivate.h>
+#import "ASAbstractLayoutController.h"
+#import "Private/ASAbstractLayoutController+FrameworkPrivate.h"
 #import <AsyncDisplayKit/ASAssert.h>
 
 ASRangeTuningParameters const ASRangeTuningParametersZero = {};
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASAsciiArtBoxCreator.h b/submodules/AsyncDisplayKit/Source/ASAsciiArtBoxCreator.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASAsciiArtBoxCreator.h
rename to submodules/AsyncDisplayKit/Source/ASAsciiArtBoxCreator.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASAsciiArtBoxCreator.mm b/submodules/AsyncDisplayKit/Source/ASAsciiArtBoxCreator.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASAsciiArtBoxCreator.mm
rename to submodules/AsyncDisplayKit/Source/ASAsciiArtBoxCreator.mm
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASAssert.h b/submodules/AsyncDisplayKit/Source/ASAssert.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASAssert.h
rename to submodules/AsyncDisplayKit/Source/ASAssert.h
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASAssert.m.orig b/submodules/AsyncDisplayKit/Source/ASAssert.m.orig
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASAssert.m.orig
rename to submodules/AsyncDisplayKit/Source/ASAssert.m.orig
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASAssert.mm b/submodules/AsyncDisplayKit/Source/ASAssert.mm
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/Base/ASAssert.mm
rename to submodules/AsyncDisplayKit/Source/ASAssert.mm
index 6a78b06eaf..c63d92d822 100644
--- a/submodules/AsyncDisplayKit/Source/Base/ASAssert.mm
+++ b/submodules/AsyncDisplayKit/Source/ASAssert.mm
@@ -6,7 +6,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASAssert.h>
+#import "ASAssert.h"
 #import <AsyncDisplayKit/ASAvailability.h>
 
 #if AS_TLS_AVAILABLE
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASAvailability.h b/submodules/AsyncDisplayKit/Source/ASAvailability.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASAvailability.h
rename to submodules/AsyncDisplayKit/Source/ASAvailability.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASBackgroundLayoutSpec.h b/submodules/AsyncDisplayKit/Source/ASBackgroundLayoutSpec.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASBackgroundLayoutSpec.h
rename to submodules/AsyncDisplayKit/Source/ASBackgroundLayoutSpec.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASBackgroundLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASBackgroundLayoutSpec.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASBackgroundLayoutSpec.mm
rename to submodules/AsyncDisplayKit/Source/ASBackgroundLayoutSpec.mm
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASBaseDefines.h b/submodules/AsyncDisplayKit/Source/ASBaseDefines.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASBaseDefines.h
rename to submodules/AsyncDisplayKit/Source/ASBaseDefines.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASBasicImageDownloader.h b/submodules/AsyncDisplayKit/Source/ASBasicImageDownloader.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASBasicImageDownloader.h
rename to submodules/AsyncDisplayKit/Source/ASBasicImageDownloader.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASBasicImageDownloader.mm b/submodules/AsyncDisplayKit/Source/ASBasicImageDownloader.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASBasicImageDownloader.mm
rename to submodules/AsyncDisplayKit/Source/ASBasicImageDownloader.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASBasicImageDownloaderInternal.h b/submodules/AsyncDisplayKit/Source/ASBasicImageDownloaderInternal.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASBasicImageDownloaderInternal.h
rename to submodules/AsyncDisplayKit/Source/ASBasicImageDownloaderInternal.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASBatchContext.h b/submodules/AsyncDisplayKit/Source/ASBatchContext.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASBatchContext.h
rename to submodules/AsyncDisplayKit/Source/ASBatchContext.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASBatchContext.mm b/submodules/AsyncDisplayKit/Source/ASBatchContext.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASBatchContext.mm
rename to submodules/AsyncDisplayKit/Source/ASBatchContext.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASBatchFetching.h b/submodules/AsyncDisplayKit/Source/ASBatchFetching.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASBatchFetching.h
rename to submodules/AsyncDisplayKit/Source/ASBatchFetching.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASBatchFetching.mm b/submodules/AsyncDisplayKit/Source/ASBatchFetching.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASBatchFetching.mm
rename to submodules/AsyncDisplayKit/Source/ASBatchFetching.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASBatchFetchingDelegate.h b/submodules/AsyncDisplayKit/Source/ASBatchFetchingDelegate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASBatchFetchingDelegate.h
rename to submodules/AsyncDisplayKit/Source/ASBatchFetchingDelegate.h
diff --git a/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.mm b/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.mm
index 195e478c22..c6ed69ab26 100644
--- a/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.mm
+++ b/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.mm
@@ -98,7 +98,7 @@ static void ASButtonNodeResolveVerticalAlignmentForStyle(ASLayoutElementStyle *s
 
 #else
 
-#import <AsyncDisplayKit/ASButtonNode+Private.h>
+#import "ASButtonNode+Private.h"
 
 @implementation ASButtonNode (Yoga)
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCellNode+Internal.h b/submodules/AsyncDisplayKit/Source/ASCellNode+Internal.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASCellNode+Internal.h
rename to submodules/AsyncDisplayKit/Source/ASCellNode+Internal.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASCenterLayoutSpec.h b/submodules/AsyncDisplayKit/Source/ASCenterLayoutSpec.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASCenterLayoutSpec.h
rename to submodules/AsyncDisplayKit/Source/ASCenterLayoutSpec.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASCenterLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASCenterLayoutSpec.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASCenterLayoutSpec.mm
rename to submodules/AsyncDisplayKit/Source/ASCenterLayoutSpec.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionElement.h b/submodules/AsyncDisplayKit/Source/ASCollectionElement.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionElement.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionElement.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionElement.mm b/submodules/AsyncDisplayKit/Source/ASCollectionElement.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionElement.mm
rename to submodules/AsyncDisplayKit/Source/ASCollectionElement.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionFlowLayoutDelegate.h b/submodules/AsyncDisplayKit/Source/ASCollectionFlowLayoutDelegate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionFlowLayoutDelegate.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionFlowLayoutDelegate.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionFlowLayoutDelegate.mm b/submodules/AsyncDisplayKit/Source/ASCollectionFlowLayoutDelegate.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionFlowLayoutDelegate.mm
rename to submodules/AsyncDisplayKit/Source/ASCollectionFlowLayoutDelegate.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.h b/submodules/AsyncDisplayKit/Source/ASCollectionGalleryLayoutDelegate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionGalleryLayoutDelegate.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.m b/submodules/AsyncDisplayKit/Source/ASCollectionGalleryLayoutDelegate.m
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.m
rename to submodules/AsyncDisplayKit/Source/ASCollectionGalleryLayoutDelegate.m
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.mm b/submodules/AsyncDisplayKit/Source/ASCollectionGalleryLayoutDelegate.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionGalleryLayoutDelegate.mm
rename to submodules/AsyncDisplayKit/Source/ASCollectionGalleryLayoutDelegate.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionInternal.h b/submodules/AsyncDisplayKit/Source/ASCollectionInternal.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionInternal.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionInternal.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayout.h b/submodules/AsyncDisplayKit/Source/ASCollectionLayout.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASCollectionLayout.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayout.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayout.mm b/submodules/AsyncDisplayKit/Source/ASCollectionLayout.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASCollectionLayout.mm
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayout.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutCache.h b/submodules/AsyncDisplayKit/Source/ASCollectionLayoutCache.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutCache.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayoutCache.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutCache.mm b/submodules/AsyncDisplayKit/Source/ASCollectionLayoutCache.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutCache.mm
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayoutCache.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutContext+Private.h b/submodules/AsyncDisplayKit/Source/ASCollectionLayoutContext+Private.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutContext+Private.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayoutContext+Private.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutContext.h b/submodules/AsyncDisplayKit/Source/ASCollectionLayoutContext.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutContext.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayoutContext.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutContext.mm b/submodules/AsyncDisplayKit/Source/ASCollectionLayoutContext.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutContext.mm
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayoutContext.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutDefines.h b/submodules/AsyncDisplayKit/Source/ASCollectionLayoutDefines.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutDefines.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayoutDefines.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutDefines.mm b/submodules/AsyncDisplayKit/Source/ASCollectionLayoutDefines.mm
similarity index 93%
rename from submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutDefines.mm
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayoutDefines.mm
index e386575c5d..2071041edd 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutDefines.mm
+++ b/submodules/AsyncDisplayKit/Source/ASCollectionLayoutDefines.mm
@@ -6,7 +6,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASCollectionLayoutDefines.h>
+#import "ASCollectionLayoutDefines.h"
 
 ASSizeRange ASSizeRangeForCollectionLayoutThatFitsViewportSize(CGSize viewportSize, ASScrollDirection scrollableDirections)
 {
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutDelegate.h b/submodules/AsyncDisplayKit/Source/ASCollectionLayoutDelegate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutDelegate.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayoutDelegate.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutState+Private.h b/submodules/AsyncDisplayKit/Source/ASCollectionLayoutState+Private.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASCollectionLayoutState+Private.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayoutState+Private.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutState.h b/submodules/AsyncDisplayKit/Source/ASCollectionLayoutState.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutState.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayoutState.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutState.mm b/submodules/AsyncDisplayKit/Source/ASCollectionLayoutState.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionLayoutState.mm
rename to submodules/AsyncDisplayKit/Source/ASCollectionLayoutState.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionView+Undeprecated.h b/submodules/AsyncDisplayKit/Source/ASCollectionView+Undeprecated.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASCollectionView+Undeprecated.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionView+Undeprecated.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionViewFlowLayoutInspector.h b/submodules/AsyncDisplayKit/Source/ASCollectionViewFlowLayoutInspector.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASCollectionViewFlowLayoutInspector.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionViewFlowLayoutInspector.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASCollectionViewFlowLayoutInspector.mm b/submodules/AsyncDisplayKit/Source/ASCollectionViewFlowLayoutInspector.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASCollectionViewFlowLayoutInspector.mm
rename to submodules/AsyncDisplayKit/Source/ASCollectionViewFlowLayoutInspector.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutController.h b/submodules/AsyncDisplayKit/Source/ASCollectionViewLayoutController.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutController.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionViewLayoutController.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutController.mm b/submodules/AsyncDisplayKit/Source/ASCollectionViewLayoutController.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutController.mm
rename to submodules/AsyncDisplayKit/Source/ASCollectionViewLayoutController.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutInspector.h b/submodules/AsyncDisplayKit/Source/ASCollectionViewLayoutInspector.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutInspector.h
rename to submodules/AsyncDisplayKit/Source/ASCollectionViewLayoutInspector.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutInspector.mm b/submodules/AsyncDisplayKit/Source/ASCollectionViewLayoutInspector.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASCollectionViewLayoutInspector.mm
rename to submodules/AsyncDisplayKit/Source/ASCollectionViewLayoutInspector.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASControlNode+Private.h b/submodules/AsyncDisplayKit/Source/ASControlNode+Private.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASControlNode+Private.h
rename to submodules/AsyncDisplayKit/Source/ASControlNode+Private.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASControlTargetAction.h b/submodules/AsyncDisplayKit/Source/ASControlTargetAction.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASControlTargetAction.h
rename to submodules/AsyncDisplayKit/Source/ASControlTargetAction.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASControlTargetAction.mm b/submodules/AsyncDisplayKit/Source/ASControlTargetAction.mm
similarity index 96%
rename from submodules/AsyncDisplayKit/Source/Private/ASControlTargetAction.mm
rename to submodules/AsyncDisplayKit/Source/ASControlTargetAction.mm
index 41cc113314..49c2314fcc 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASControlTargetAction.mm
+++ b/submodules/AsyncDisplayKit/Source/ASControlTargetAction.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASControlTargetAction.h>
+#import "ASControlTargetAction.h"
 
 @implementation ASControlTargetAction
 {
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASCornerLayoutSpec.h b/submodules/AsyncDisplayKit/Source/ASCornerLayoutSpec.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASCornerLayoutSpec.h
rename to submodules/AsyncDisplayKit/Source/ASCornerLayoutSpec.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASCornerLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASCornerLayoutSpec.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASCornerLayoutSpec.mm
rename to submodules/AsyncDisplayKit/Source/ASCornerLayoutSpec.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASDataController.h b/submodules/AsyncDisplayKit/Source/ASDataController.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASDataController.h
rename to submodules/AsyncDisplayKit/Source/ASDataController.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASDataController.mm b/submodules/AsyncDisplayKit/Source/ASDataController.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASDataController.mm
rename to submodules/AsyncDisplayKit/Source/ASDataController.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlayButton.h b/submodules/AsyncDisplayKit/Source/ASDefaultPlayButton.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDefaultPlayButton.h
rename to submodules/AsyncDisplayKit/Source/ASDefaultPlayButton.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlayButton.mm b/submodules/AsyncDisplayKit/Source/ASDefaultPlayButton.mm
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/Private/ASDefaultPlayButton.mm
rename to submodules/AsyncDisplayKit/Source/ASDefaultPlayButton.mm
index 589bda90c2..3ece99407c 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlayButton.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDefaultPlayButton.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASDefaultPlayButton.h>
+#import "ASDefaultPlayButton.h"
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 
 @implementation ASDefaultPlayButton
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlaybackButton.h b/submodules/AsyncDisplayKit/Source/ASDefaultPlaybackButton.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDefaultPlaybackButton.h
rename to submodules/AsyncDisplayKit/Source/ASDefaultPlaybackButton.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlaybackButton.mm b/submodules/AsyncDisplayKit/Source/ASDefaultPlaybackButton.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Private/ASDefaultPlaybackButton.mm
rename to submodules/AsyncDisplayKit/Source/ASDefaultPlaybackButton.mm
index deda7e8716..38166a7c0e 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASDefaultPlaybackButton.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDefaultPlaybackButton.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASDefaultPlaybackButton.h>
+#import "ASDefaultPlaybackButton.h"
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 
 @interface ASDefaultPlaybackButton()
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASDelegateProxy.h b/submodules/AsyncDisplayKit/Source/ASDelegateProxy.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASDelegateProxy.h
rename to submodules/AsyncDisplayKit/Source/ASDelegateProxy.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASDelegateProxy.mm b/submodules/AsyncDisplayKit/Source/ASDelegateProxy.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASDelegateProxy.mm
rename to submodules/AsyncDisplayKit/Source/ASDelegateProxy.mm
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASDimension.h b/submodules/AsyncDisplayKit/Source/ASDimension.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASDimension.h
rename to submodules/AsyncDisplayKit/Source/ASDimension.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASDimension.mm b/submodules/AsyncDisplayKit/Source/ASDimension.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASDimension.mm
rename to submodules/AsyncDisplayKit/Source/ASDimension.mm
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASDimensionInternal.h b/submodules/AsyncDisplayKit/Source/ASDimensionInternal.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASDimensionInternal.h
rename to submodules/AsyncDisplayKit/Source/ASDimensionInternal.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASDimensionInternal.mm b/submodules/AsyncDisplayKit/Source/ASDimensionInternal.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASDimensionInternal.mm
rename to submodules/AsyncDisplayKit/Source/ASDimensionInternal.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDispatch.h b/submodules/AsyncDisplayKit/Source/ASDispatch.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDispatch.h
rename to submodules/AsyncDisplayKit/Source/ASDispatch.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDispatch.mm b/submodules/AsyncDisplayKit/Source/ASDispatch.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Private/ASDispatch.mm
rename to submodules/AsyncDisplayKit/Source/ASDispatch.mm
index 769a9185d4..edc2feba46 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASDispatch.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDispatch.mm
@@ -6,7 +6,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASDispatch.h>
+#import "ASDispatch.h"
 #import <AsyncDisplayKit/ASConfigurationInternal.h>
 
 
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASDisplayNode+Ancestry.h b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Ancestry.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASDisplayNode+Ancestry.h
rename to submodules/AsyncDisplayKit/Source/ASDisplayNode+Ancestry.h
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASDisplayNode+Ancestry.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+Ancestry.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASDisplayNode+Ancestry.mm
rename to submodules/AsyncDisplayKit/Source/ASDisplayNode+Ancestry.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+AsyncDisplay.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+AsyncDisplay.mm
rename to submodules/AsyncDisplayKit/Source/ASDisplayNode+AsyncDisplay.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+DebugTiming.h b/submodules/AsyncDisplayKit/Source/ASDisplayNode+DebugTiming.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+DebugTiming.h
rename to submodules/AsyncDisplayKit/Source/ASDisplayNode+DebugTiming.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+DebugTiming.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+DebugTiming.mm
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+DebugTiming.mm
rename to submodules/AsyncDisplayKit/Source/ASDisplayNode+DebugTiming.mm
index d9311a10d9..7433c2f9ac 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+DebugTiming.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+DebugTiming.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASDisplayNode+DebugTiming.h>
+#import "ASDisplayNode+DebugTiming.h"
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
 
 @implementation ASDisplayNode (DebugTiming)
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+FrameworkPrivate.h b/submodules/AsyncDisplayKit/Source/ASDisplayNode+FrameworkPrivate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+FrameworkPrivate.h
rename to submodules/AsyncDisplayKit/Source/ASDisplayNode+FrameworkPrivate.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+UIViewBridge.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode+UIViewBridge.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+UIViewBridge.mm
rename to submodules/AsyncDisplayKit/Source/ASDisplayNode+UIViewBridge.mm
index 294a5a1fe5..7868d87edc 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+UIViewBridge.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode+UIViewBridge.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
+#import "_ASCoreAnimationExtras.h"
 #import <AsyncDisplayKit/_ASPendingState.h>
 #import "Private/ASInternalHelpers.h"
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
diff --git a/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm
index ed63b73e4d..5d072338cb 100644
--- a/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm
+++ b/submodules/AsyncDisplayKit/Source/ASDisplayNode.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import "ASDisplayNodeInternal.h"
 
 #import <AsyncDisplayKit/ASDisplayNode+Ancestry.h>
 #import <AsyncDisplayKit/ASDisplayNode+Beta.h>
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeCornerLayerDelegate.h b/submodules/AsyncDisplayKit/Source/ASDisplayNodeCornerLayerDelegate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeCornerLayerDelegate.h
rename to submodules/AsyncDisplayKit/Source/ASDisplayNodeCornerLayerDelegate.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeCornerLayerDelegate.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNodeCornerLayerDelegate.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeCornerLayerDelegate.mm
rename to submodules/AsyncDisplayKit/Source/ASDisplayNodeCornerLayerDelegate.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeInternal.h b/submodules/AsyncDisplayKit/Source/ASDisplayNodeInternal.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeInternal.h
rename to submodules/AsyncDisplayKit/Source/ASDisplayNodeInternal.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeLayout.h b/submodules/AsyncDisplayKit/Source/ASDisplayNodeLayout.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeLayout.h
rename to submodules/AsyncDisplayKit/Source/ASDisplayNodeLayout.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeTipState.h b/submodules/AsyncDisplayKit/Source/ASDisplayNodeTipState.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeTipState.h
rename to submodules/AsyncDisplayKit/Source/ASDisplayNodeTipState.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeTipState.mm b/submodules/AsyncDisplayKit/Source/ASDisplayNodeTipState.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASDisplayNodeTipState.mm
rename to submodules/AsyncDisplayKit/Source/ASDisplayNodeTipState.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASElementMap.h b/submodules/AsyncDisplayKit/Source/ASElementMap.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASElementMap.h
rename to submodules/AsyncDisplayKit/Source/ASElementMap.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASElementMap.mm b/submodules/AsyncDisplayKit/Source/ASElementMap.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASElementMap.mm
rename to submodules/AsyncDisplayKit/Source/ASElementMap.mm
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASEqualityHelpers.h b/submodules/AsyncDisplayKit/Source/ASEqualityHelpers.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASEqualityHelpers.h
rename to submodules/AsyncDisplayKit/Source/ASEqualityHelpers.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASEventLog.h b/submodules/AsyncDisplayKit/Source/ASEventLog.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASEventLog.h
rename to submodules/AsyncDisplayKit/Source/ASEventLog.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASEventLog.mm b/submodules/AsyncDisplayKit/Source/ASEventLog.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASEventLog.mm
rename to submodules/AsyncDisplayKit/Source/ASEventLog.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.h b/submodules/AsyncDisplayKit/Source/ASGraphicsContext.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.h
rename to submodules/AsyncDisplayKit/Source/ASGraphicsContext.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.mm b/submodules/AsyncDisplayKit/Source/ASGraphicsContext.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASGraphicsContext.mm
rename to submodules/AsyncDisplayKit/Source/ASGraphicsContext.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASHashing.h b/submodules/AsyncDisplayKit/Source/ASHashing.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASHashing.h
rename to submodules/AsyncDisplayKit/Source/ASHashing.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASHashing.mm b/submodules/AsyncDisplayKit/Source/ASHashing.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASHashing.mm
rename to submodules/AsyncDisplayKit/Source/ASHashing.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.h b/submodules/AsyncDisplayKit/Source/ASHighlightOverlayLayer.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.h
rename to submodules/AsyncDisplayKit/Source/ASHighlightOverlayLayer.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.mm b/submodules/AsyncDisplayKit/Source/ASHighlightOverlayLayer.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASHighlightOverlayLayer.mm
rename to submodules/AsyncDisplayKit/Source/ASHighlightOverlayLayer.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASIGListAdapterBasedDataSource.h b/submodules/AsyncDisplayKit/Source/ASIGListAdapterBasedDataSource.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASIGListAdapterBasedDataSource.h
rename to submodules/AsyncDisplayKit/Source/ASIGListAdapterBasedDataSource.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASIGListAdapterBasedDataSource.mm b/submodules/AsyncDisplayKit/Source/ASIGListAdapterBasedDataSource.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASIGListAdapterBasedDataSource.mm
rename to submodules/AsyncDisplayKit/Source/ASIGListAdapterBasedDataSource.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASImageContainerProtocolCategories.h b/submodules/AsyncDisplayKit/Source/ASImageContainerProtocolCategories.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASImageContainerProtocolCategories.h
rename to submodules/AsyncDisplayKit/Source/ASImageContainerProtocolCategories.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASImageContainerProtocolCategories.mm b/submodules/AsyncDisplayKit/Source/ASImageContainerProtocolCategories.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASImageContainerProtocolCategories.mm
rename to submodules/AsyncDisplayKit/Source/ASImageContainerProtocolCategories.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+AnimatedImagePrivate.h b/submodules/AsyncDisplayKit/Source/ASImageNode+AnimatedImagePrivate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASImageNode+AnimatedImagePrivate.h
rename to submodules/AsyncDisplayKit/Source/ASImageNode+AnimatedImagePrivate.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+CGExtras.h b/submodules/AsyncDisplayKit/Source/ASImageNode+CGExtras.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASImageNode+CGExtras.h
rename to submodules/AsyncDisplayKit/Source/ASImageNode+CGExtras.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+CGExtras.mm b/submodules/AsyncDisplayKit/Source/ASImageNode+CGExtras.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/ASImageNode+CGExtras.mm
rename to submodules/AsyncDisplayKit/Source/ASImageNode+CGExtras.mm
index c4f9fdcbc9..40b331fb32 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+CGExtras.mm
+++ b/submodules/AsyncDisplayKit/Source/ASImageNode+CGExtras.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASImageNode+CGExtras.h>
+#import "ASImageNode+CGExtras.h"
 
 #import <cmath>
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASImageNode+Private.h b/submodules/AsyncDisplayKit/Source/ASImageNode+Private.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASImageNode+Private.h
rename to submodules/AsyncDisplayKit/Source/ASImageNode+Private.h
diff --git a/submodules/AsyncDisplayKit/Source/ASImageNode.mm b/submodules/AsyncDisplayKit/Source/ASImageNode.mm
index 75537dd974..8cc4037700 100644
--- a/submodules/AsyncDisplayKit/Source/ASImageNode.mm
+++ b/submodules/AsyncDisplayKit/Source/ASImageNode.mm
@@ -7,14 +7,14 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASImageNode.h>
+#import "ASImageNode.h"
 
 #import <tgmath.h>
 
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
+#import "Private/ASDisplayNode+FrameworkPrivate.h"
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 #import <AsyncDisplayKit/ASGraphicsContext.h>
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASImageProtocols.h b/submodules/AsyncDisplayKit/Source/ASImageProtocols.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASImageProtocols.h
rename to submodules/AsyncDisplayKit/Source/ASImageProtocols.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.h b/submodules/AsyncDisplayKit/Source/ASInsetLayoutSpec.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.h
rename to submodules/AsyncDisplayKit/Source/ASInsetLayoutSpec.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASInsetLayoutSpec.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASInsetLayoutSpec.mm
rename to submodules/AsyncDisplayKit/Source/ASInsetLayoutSpec.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASIntegerMap.h b/submodules/AsyncDisplayKit/Source/ASIntegerMap.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASIntegerMap.h
rename to submodules/AsyncDisplayKit/Source/ASIntegerMap.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASIntegerMap.mm b/submodules/AsyncDisplayKit/Source/ASIntegerMap.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASIntegerMap.mm
rename to submodules/AsyncDisplayKit/Source/ASIntegerMap.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.h b/submodules/AsyncDisplayKit/Source/ASInternalHelpers.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.h
rename to submodules/AsyncDisplayKit/Source/ASInternalHelpers.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.mm b/submodules/AsyncDisplayKit/Source/ASInternalHelpers.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.mm
rename to submodules/AsyncDisplayKit/Source/ASInternalHelpers.mm
index ac4ee50166..d3dd743b7c 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASInternalHelpers.mm
+++ b/submodules/AsyncDisplayKit/Source/ASInternalHelpers.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "Private/ASInternalHelpers.h"
+#import "ASInternalHelpers.h"
 
 #import <UIKit/UIKit.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASLayerBackingTipProvider.h b/submodules/AsyncDisplayKit/Source/ASLayerBackingTipProvider.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASLayerBackingTipProvider.h
rename to submodules/AsyncDisplayKit/Source/ASLayerBackingTipProvider.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASLayerBackingTipProvider.mm b/submodules/AsyncDisplayKit/Source/ASLayerBackingTipProvider.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASLayerBackingTipProvider.mm
rename to submodules/AsyncDisplayKit/Source/ASLayerBackingTipProvider.mm
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayout+IGListKit.h b/submodules/AsyncDisplayKit/Source/ASLayout+IGListKit.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayout+IGListKit.h
rename to submodules/AsyncDisplayKit/Source/ASLayout+IGListKit.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayout+IGListKit.mm b/submodules/AsyncDisplayKit/Source/ASLayout+IGListKit.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayout+IGListKit.mm
rename to submodules/AsyncDisplayKit/Source/ASLayout+IGListKit.mm
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayout.h b/submodules/AsyncDisplayKit/Source/ASLayout.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayout.h
rename to submodules/AsyncDisplayKit/Source/ASLayout.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayout.mm b/submodules/AsyncDisplayKit/Source/ASLayout.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayout.mm
rename to submodules/AsyncDisplayKit/Source/ASLayout.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASLayoutController.h b/submodules/AsyncDisplayKit/Source/ASLayoutController.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASLayoutController.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutController.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.h b/submodules/AsyncDisplayKit/Source/ASLayoutElement.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutElement.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm b/submodules/AsyncDisplayKit/Source/ASLayoutElement.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm
rename to submodules/AsyncDisplayKit/Source/ASLayoutElement.mm
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm.orig b/submodules/AsyncDisplayKit/Source/ASLayoutElement.mm.orig
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutElement.mm.orig
rename to submodules/AsyncDisplayKit/Source/ASLayoutElement.mm.orig
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElementExtensibility.h b/submodules/AsyncDisplayKit/Source/ASLayoutElementExtensibility.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutElementExtensibility.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutElementExtensibility.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutElementPrivate.h b/submodules/AsyncDisplayKit/Source/ASLayoutElementPrivate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutElementPrivate.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutElementPrivate.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutElementStylePrivate.h b/submodules/AsyncDisplayKit/Source/ASLayoutElementStylePrivate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutElementStylePrivate.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutElementStylePrivate.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASLayoutManager.h b/submodules/AsyncDisplayKit/Source/ASLayoutManager.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASLayoutManager.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutManager.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASLayoutManager.mm b/submodules/AsyncDisplayKit/Source/ASLayoutManager.mm
similarity index 96%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASLayoutManager.mm
rename to submodules/AsyncDisplayKit/Source/ASLayoutManager.mm
index fbb3b49ea4..9eca28e489 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASLayoutManager.mm
+++ b/submodules/AsyncDisplayKit/Source/ASLayoutManager.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASLayoutManager.h>
+#import "ASLayoutManager.h"
 
 @implementation ASLayoutManager
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASLayoutRangeType.h b/submodules/AsyncDisplayKit/Source/ASLayoutRangeType.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASLayoutRangeType.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutRangeType.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.h b/submodules/AsyncDisplayKit/Source/ASLayoutSpec+Subclasses.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutSpec+Subclasses.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.mm b/submodules/AsyncDisplayKit/Source/ASLayoutSpec+Subclasses.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec+Subclasses.mm
rename to submodules/AsyncDisplayKit/Source/ASLayoutSpec+Subclasses.mm
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.h b/submodules/AsyncDisplayKit/Source/ASLayoutSpec.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutSpec.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASLayoutSpec.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.mm
rename to submodules/AsyncDisplayKit/Source/ASLayoutSpec.mm
index dde5521eba..fda39c118f 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASLayoutSpec.mm
+++ b/submodules/AsyncDisplayKit/Source/ASLayoutSpec.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASLayoutSpec.h>
+#import "ASLayoutSpec.h"
 #import "Private/ASLayoutSpecPrivate.h"
 
 #import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutSpecPrivate.h b/submodules/AsyncDisplayKit/Source/ASLayoutSpecPrivate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutSpecPrivate.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutSpecPrivate.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutSpecUtilities.h b/submodules/AsyncDisplayKit/Source/ASLayoutSpecUtilities.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/Layout/ASLayoutSpecUtilities.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutSpecUtilities.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASLayoutTransition.h b/submodules/AsyncDisplayKit/Source/ASLayoutTransition.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASLayoutTransition.h
rename to submodules/AsyncDisplayKit/Source/ASLayoutTransition.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASLayoutTransition.mm b/submodules/AsyncDisplayKit/Source/ASLayoutTransition.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/ASLayoutTransition.mm
rename to submodules/AsyncDisplayKit/Source/ASLayoutTransition.mm
index 2fea2b8ad0..5366f9582c 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASLayoutTransition.mm
+++ b/submodules/AsyncDisplayKit/Source/ASLayoutTransition.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASLayoutTransition.h>
+#import "ASLayoutTransition.h"
 
 #import <AsyncDisplayKit/NSArray+Diffing.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASLog.h b/submodules/AsyncDisplayKit/Source/ASLog.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASLog.h
rename to submodules/AsyncDisplayKit/Source/ASLog.h
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASLog.mm b/submodules/AsyncDisplayKit/Source/ASLog.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASLog.mm
rename to submodules/AsyncDisplayKit/Source/ASLog.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.h b/submodules/AsyncDisplayKit/Source/ASMainSerialQueue.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.h
rename to submodules/AsyncDisplayKit/Source/ASMainSerialQueue.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.mm b/submodules/AsyncDisplayKit/Source/ASMainSerialQueue.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASMainSerialQueue.mm
rename to submodules/AsyncDisplayKit/Source/ASMainSerialQueue.mm
diff --git a/submodules/AsyncDisplayKit/Source/ASMapNode.mm b/submodules/AsyncDisplayKit/Source/ASMapNode.mm
index c23ecd20dd..2c5a580b4b 100644
--- a/submodules/AsyncDisplayKit/Source/ASMapNode.mm
+++ b/submodules/AsyncDisplayKit/Source/ASMapNode.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASMapNode.h>
+#import "ASMapNode.h"
 
 #if TARGET_OS_IOS && AS_USE_MAPKIT
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASMutableAttributedStringBuilder.h b/submodules/AsyncDisplayKit/Source/ASMutableAttributedStringBuilder.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASMutableAttributedStringBuilder.h
rename to submodules/AsyncDisplayKit/Source/ASMutableAttributedStringBuilder.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASMutableAttributedStringBuilder.mm b/submodules/AsyncDisplayKit/Source/ASMutableAttributedStringBuilder.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASMutableAttributedStringBuilder.mm
rename to submodules/AsyncDisplayKit/Source/ASMutableAttributedStringBuilder.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASMutableElementMap.h b/submodules/AsyncDisplayKit/Source/ASMutableElementMap.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASMutableElementMap.h
rename to submodules/AsyncDisplayKit/Source/ASMutableElementMap.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASMutableElementMap.mm b/submodules/AsyncDisplayKit/Source/ASMutableElementMap.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASMutableElementMap.mm
rename to submodules/AsyncDisplayKit/Source/ASMutableElementMap.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASNetworkImageLoadInfo+Private.h b/submodules/AsyncDisplayKit/Source/ASNetworkImageLoadInfo+Private.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASNetworkImageLoadInfo+Private.h
rename to submodules/AsyncDisplayKit/Source/ASNetworkImageLoadInfo+Private.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASObjectDescriptionHelpers.h b/submodules/AsyncDisplayKit/Source/ASObjectDescriptionHelpers.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASObjectDescriptionHelpers.h
rename to submodules/AsyncDisplayKit/Source/ASObjectDescriptionHelpers.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASObjectDescriptionHelpers.mm b/submodules/AsyncDisplayKit/Source/ASObjectDescriptionHelpers.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASObjectDescriptionHelpers.mm
rename to submodules/AsyncDisplayKit/Source/ASObjectDescriptionHelpers.mm
index cbd6be0963..2b5d94492c 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASObjectDescriptionHelpers.mm
+++ b/submodules/AsyncDisplayKit/Source/ASObjectDescriptionHelpers.mm
@@ -11,7 +11,7 @@
 
 #import <UIKit/UIGeometry.h>
 
-#import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
+#import "NSIndexSet+ASHelpers.h"
 
 NSString *ASGetDescriptionValueString(id object)
 {
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASOverlayLayoutSpec.h b/submodules/AsyncDisplayKit/Source/ASOverlayLayoutSpec.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASOverlayLayoutSpec.h
rename to submodules/AsyncDisplayKit/Source/ASOverlayLayoutSpec.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASOverlayLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASOverlayLayoutSpec.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASOverlayLayoutSpec.mm
rename to submodules/AsyncDisplayKit/Source/ASOverlayLayoutSpec.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPINRemoteImageDownloader.h b/submodules/AsyncDisplayKit/Source/ASPINRemoteImageDownloader.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASPINRemoteImageDownloader.h
rename to submodules/AsyncDisplayKit/Source/ASPINRemoteImageDownloader.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPINRemoteImageDownloader.mm b/submodules/AsyncDisplayKit/Source/ASPINRemoteImageDownloader.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASPINRemoteImageDownloader.mm
rename to submodules/AsyncDisplayKit/Source/ASPINRemoteImageDownloader.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPageTable.h b/submodules/AsyncDisplayKit/Source/ASPageTable.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASPageTable.h
rename to submodules/AsyncDisplayKit/Source/ASPageTable.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPageTable.mm b/submodules/AsyncDisplayKit/Source/ASPageTable.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASPageTable.mm
rename to submodules/AsyncDisplayKit/Source/ASPageTable.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASPendingStateController.h b/submodules/AsyncDisplayKit/Source/ASPendingStateController.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASPendingStateController.h
rename to submodules/AsyncDisplayKit/Source/ASPendingStateController.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASPendingStateController.mm b/submodules/AsyncDisplayKit/Source/ASPendingStateController.mm
similarity index 91%
rename from submodules/AsyncDisplayKit/Source/Private/ASPendingStateController.mm
rename to submodules/AsyncDisplayKit/Source/ASPendingStateController.mm
index 269b37e948..e7ca4a71de 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASPendingStateController.mm
+++ b/submodules/AsyncDisplayKit/Source/ASPendingStateController.mm
@@ -7,10 +7,10 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASPendingStateController.h>
+#import "ASPendingStateController.h"
 #import <AsyncDisplayKit/ASThread.h>
 #import <AsyncDisplayKit/ASWeakSet.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h> // Required for -applyPendingViewState; consider moving this to +FrameworkPrivate
+#import "ASDisplayNodeInternal.h" // Required for -applyPendingViewState; consider moving this to +FrameworkPrivate
 
 @interface ASPendingStateController()
 {
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.h b/submodules/AsyncDisplayKit/Source/ASPhotosFrameworkImageRequest.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.h
rename to submodules/AsyncDisplayKit/Source/ASPhotosFrameworkImageRequest.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.h.orig b/submodules/AsyncDisplayKit/Source/ASPhotosFrameworkImageRequest.h.orig
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.h.orig
rename to submodules/AsyncDisplayKit/Source/ASPhotosFrameworkImageRequest.h.orig
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.m.orig b/submodules/AsyncDisplayKit/Source/ASPhotosFrameworkImageRequest.m.orig
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.m.orig
rename to submodules/AsyncDisplayKit/Source/ASPhotosFrameworkImageRequest.m.orig
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.mm b/submodules/AsyncDisplayKit/Source/ASPhotosFrameworkImageRequest.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASPhotosFrameworkImageRequest.mm
rename to submodules/AsyncDisplayKit/Source/ASPhotosFrameworkImageRequest.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASRangeController.h b/submodules/AsyncDisplayKit/Source/ASRangeController.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASRangeController.h
rename to submodules/AsyncDisplayKit/Source/ASRangeController.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASRangeController.mm b/submodules/AsyncDisplayKit/Source/ASRangeController.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASRangeController.mm
rename to submodules/AsyncDisplayKit/Source/ASRangeController.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASRangeControllerUpdateRangeProtocol+Beta.h b/submodules/AsyncDisplayKit/Source/ASRangeControllerUpdateRangeProtocol+Beta.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASRangeControllerUpdateRangeProtocol+Beta.h
rename to submodules/AsyncDisplayKit/Source/ASRangeControllerUpdateRangeProtocol+Beta.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.h b/submodules/AsyncDisplayKit/Source/ASRatioLayoutSpec.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.h
rename to submodules/AsyncDisplayKit/Source/ASRatioLayoutSpec.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASRatioLayoutSpec.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASRatioLayoutSpec.mm
rename to submodules/AsyncDisplayKit/Source/ASRatioLayoutSpec.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASRecursiveUnfairLock.h b/submodules/AsyncDisplayKit/Source/ASRecursiveUnfairLock.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASRecursiveUnfairLock.h
rename to submodules/AsyncDisplayKit/Source/ASRecursiveUnfairLock.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASRecursiveUnfairLock.mm b/submodules/AsyncDisplayKit/Source/ASRecursiveUnfairLock.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASRecursiveUnfairLock.mm
rename to submodules/AsyncDisplayKit/Source/ASRecursiveUnfairLock.mm
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.h b/submodules/AsyncDisplayKit/Source/ASRelativeLayoutSpec.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.h
rename to submodules/AsyncDisplayKit/Source/ASRelativeLayoutSpec.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASRelativeLayoutSpec.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.mm
rename to submodules/AsyncDisplayKit/Source/ASRelativeLayoutSpec.mm
index e980161ea6..d76ccac4f1 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASRelativeLayoutSpec.mm
+++ b/submodules/AsyncDisplayKit/Source/ASRelativeLayoutSpec.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASRelativeLayoutSpec.h>
+#import "ASRelativeLayoutSpec.h"
 
 #import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.h b/submodules/AsyncDisplayKit/Source/ASResponderChainEnumerator.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.h
rename to submodules/AsyncDisplayKit/Source/ASResponderChainEnumerator.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.mm b/submodules/AsyncDisplayKit/Source/ASResponderChainEnumerator.mm
similarity index 95%
rename from submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.mm
rename to submodules/AsyncDisplayKit/Source/ASResponderChainEnumerator.mm
index a9392086a2..2d94c99945 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASResponderChainEnumerator.mm
+++ b/submodules/AsyncDisplayKit/Source/ASResponderChainEnumerator.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "Private/ASResponderChainEnumerator.h"
+#import "ASResponderChainEnumerator.h"
 #import <AsyncDisplayKit/ASAssert.h>
 
 @implementation ASResponderChainEnumerator {
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASScrollDirection.h b/submodules/AsyncDisplayKit/Source/ASScrollDirection.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASScrollDirection.h
rename to submodules/AsyncDisplayKit/Source/ASScrollDirection.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASScrollDirection.mm b/submodules/AsyncDisplayKit/Source/ASScrollDirection.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASScrollDirection.mm
rename to submodules/AsyncDisplayKit/Source/ASScrollDirection.mm
index 3dff6ba9b8..ed0a6b7900 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASScrollDirection.mm
+++ b/submodules/AsyncDisplayKit/Source/ASScrollDirection.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASScrollDirection.h>
+#import "ASScrollDirection.h"
 
 const ASScrollDirection ASScrollDirectionHorizontalDirections = ASScrollDirectionLeft | ASScrollDirectionRight;
 const ASScrollDirection ASScrollDirectionVerticalDirections = ASScrollDirectionUp | ASScrollDirectionDown;
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASSection.h b/submodules/AsyncDisplayKit/Source/ASSection.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASSection.h
rename to submodules/AsyncDisplayKit/Source/ASSection.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASSection.mm b/submodules/AsyncDisplayKit/Source/ASSection.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASSection.mm
rename to submodules/AsyncDisplayKit/Source/ASSection.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASSectionContext.h b/submodules/AsyncDisplayKit/Source/ASSectionContext.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASSectionContext.h
rename to submodules/AsyncDisplayKit/Source/ASSectionContext.h
diff --git a/submodules/AsyncDisplayKit/Source/Base/ASSignpost.h b/submodules/AsyncDisplayKit/Source/ASSignpost.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Base/ASSignpost.h
rename to submodules/AsyncDisplayKit/Source/ASSignpost.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutDefines.h b/submodules/AsyncDisplayKit/Source/ASStackLayoutDefines.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutDefines.h
rename to submodules/AsyncDisplayKit/Source/ASStackLayoutDefines.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutElement.h b/submodules/AsyncDisplayKit/Source/ASStackLayoutElement.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutElement.h
rename to submodules/AsyncDisplayKit/Source/ASStackLayoutElement.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutSpec.h b/submodules/AsyncDisplayKit/Source/ASStackLayoutSpec.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutSpec.h
rename to submodules/AsyncDisplayKit/Source/ASStackLayoutSpec.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutSpec.mm b/submodules/AsyncDisplayKit/Source/ASStackLayoutSpec.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASStackLayoutSpec.mm
rename to submodules/AsyncDisplayKit/Source/ASStackLayoutSpec.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackLayoutSpecUtilities.h b/submodules/AsyncDisplayKit/Source/ASStackLayoutSpecUtilities.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/Layout/ASStackLayoutSpecUtilities.h
rename to submodules/AsyncDisplayKit/Source/ASStackLayoutSpecUtilities.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.h b/submodules/AsyncDisplayKit/Source/ASStackPositionedLayout.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.h
rename to submodules/AsyncDisplayKit/Source/ASStackPositionedLayout.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.mm b/submodules/AsyncDisplayKit/Source/ASStackPositionedLayout.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.mm
rename to submodules/AsyncDisplayKit/Source/ASStackPositionedLayout.mm
index ef7152642b..14a59b04ae 100644
--- a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackPositionedLayout.mm
+++ b/submodules/AsyncDisplayKit/Source/ASStackPositionedLayout.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASStackPositionedLayout.h>
+#import "ASStackPositionedLayout.h"
 
 #import <tgmath.h>
 #import <numeric>
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackUnpositionedLayout.h b/submodules/AsyncDisplayKit/Source/ASStackUnpositionedLayout.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/Layout/ASStackUnpositionedLayout.h
rename to submodules/AsyncDisplayKit/Source/ASStackUnpositionedLayout.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackUnpositionedLayout.mm b/submodules/AsyncDisplayKit/Source/ASStackUnpositionedLayout.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/Layout/ASStackUnpositionedLayout.mm
rename to submodules/AsyncDisplayKit/Source/ASStackUnpositionedLayout.mm
index 47141a7f7b..b24b092cf7 100644
--- a/submodules/AsyncDisplayKit/Source/Private/Layout/ASStackUnpositionedLayout.mm
+++ b/submodules/AsyncDisplayKit/Source/ASStackUnpositionedLayout.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASStackUnpositionedLayout.h>
+#import "ASStackUnpositionedLayout.h"
 
 #import <tgmath.h>
 #import <numeric>
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTableLayoutController.h b/submodules/AsyncDisplayKit/Source/ASTableLayoutController.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASTableLayoutController.h
rename to submodules/AsyncDisplayKit/Source/ASTableLayoutController.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTableLayoutController.mm b/submodules/AsyncDisplayKit/Source/ASTableLayoutController.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASTableLayoutController.mm
rename to submodules/AsyncDisplayKit/Source/ASTableLayoutController.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTableView+Undeprecated.h b/submodules/AsyncDisplayKit/Source/ASTableView+Undeprecated.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASTableView+Undeprecated.h
rename to submodules/AsyncDisplayKit/Source/ASTableView+Undeprecated.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextAttribute.h b/submodules/AsyncDisplayKit/Source/ASTextAttribute.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextAttribute.h
rename to submodules/AsyncDisplayKit/Source/ASTextAttribute.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextAttribute.mm b/submodules/AsyncDisplayKit/Source/ASTextAttribute.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextAttribute.mm
rename to submodules/AsyncDisplayKit/Source/ASTextAttribute.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextDebugOption.h b/submodules/AsyncDisplayKit/Source/ASTextDebugOption.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextDebugOption.h
rename to submodules/AsyncDisplayKit/Source/ASTextDebugOption.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextDebugOption.mm b/submodules/AsyncDisplayKit/Source/ASTextDebugOption.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextDebugOption.mm
rename to submodules/AsyncDisplayKit/Source/ASTextDebugOption.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextInput.h b/submodules/AsyncDisplayKit/Source/ASTextInput.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextInput.h
rename to submodules/AsyncDisplayKit/Source/ASTextInput.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextInput.mm b/submodules/AsyncDisplayKit/Source/ASTextInput.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextInput.mm
rename to submodules/AsyncDisplayKit/Source/ASTextInput.mm
index 1cdfe73858..b71562ef1c 100644
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextInput.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextInput.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTextInput.h>
+#import "ASTextInput.h"
 #import <AsyncDisplayKit/ASTextUtilities.h>
 
 
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitAttributes.h b/submodules/AsyncDisplayKit/Source/ASTextKitAttributes.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitAttributes.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitAttributes.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitAttributes.mm b/submodules/AsyncDisplayKit/Source/ASTextKitAttributes.mm
similarity index 96%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitAttributes.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitAttributes.mm
index 400ef437bb..d2dd4969bb 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitAttributes.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextKitAttributes.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTextKitAttributes.h>
+#import "ASTextKitAttributes.h"
 
 #if AS_ENABLE_TEXTNODE
 
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitComponents.h b/submodules/AsyncDisplayKit/Source/ASTextKitComponents.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitComponents.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitComponents.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitComponents.mm b/submodules/AsyncDisplayKit/Source/ASTextKitComponents.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitComponents.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitComponents.mm
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.h b/submodules/AsyncDisplayKit/Source/ASTextKitContext.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitContext.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.mm b/submodules/AsyncDisplayKit/Source/ASTextKitContext.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitContext.mm
index 89aed4b525..42f4a1a45c 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitContext.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextKitContext.mm
@@ -11,7 +11,7 @@
 
 #if AS_ENABLE_TEXTNODE
 
-#import <AsyncDisplayKit/ASLayoutManager.h>
+#import "ASLayoutManager.h"
 #import <AsyncDisplayKit/ASThread.h>
 
 #include <memory>
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitCoreTextAdditions.h b/submodules/AsyncDisplayKit/Source/ASTextKitCoreTextAdditions.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitCoreTextAdditions.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitCoreTextAdditions.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitCoreTextAdditions.mm b/submodules/AsyncDisplayKit/Source/ASTextKitCoreTextAdditions.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitCoreTextAdditions.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitCoreTextAdditions.mm
index 8ae370de14..342a14da38 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitCoreTextAdditions.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextKitCoreTextAdditions.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTextKitCoreTextAdditions.h>
+#import "ASTextKitCoreTextAdditions.h"
 
 #if AS_ENABLE_TEXTNODE
 
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitEntityAttribute.h b/submodules/AsyncDisplayKit/Source/ASTextKitEntityAttribute.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitEntityAttribute.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitEntityAttribute.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitEntityAttribute.mm b/submodules/AsyncDisplayKit/Source/ASTextKitEntityAttribute.mm
similarity index 93%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitEntityAttribute.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitEntityAttribute.mm
index fb87e9bd3a..2992107b67 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitEntityAttribute.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextKitEntityAttribute.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTextKitEntityAttribute.h>
+#import "ASTextKitEntityAttribute.h"
 
 #if AS_ENABLE_TEXTNODE
 
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitFontSizeAdjuster.h b/submodules/AsyncDisplayKit/Source/ASTextKitFontSizeAdjuster.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitFontSizeAdjuster.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitFontSizeAdjuster.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitFontSizeAdjuster.mm b/submodules/AsyncDisplayKit/Source/ASTextKitFontSizeAdjuster.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitFontSizeAdjuster.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitFontSizeAdjuster.mm
index aeea44d7cc..4deab16afe 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitFontSizeAdjuster.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextKitFontSizeAdjuster.mm
@@ -8,7 +8,7 @@
 //
 
 
-#import <AsyncDisplayKit/ASTextKitFontSizeAdjuster.h>
+#import "ASTextKitFontSizeAdjuster.h"
 
 #if AS_ENABLE_TEXTNODE
 
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.h b/submodules/AsyncDisplayKit/Source/ASTextKitRenderer+Positioning.h
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitRenderer+Positioning.h
index c887282568..82d206c78b 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.h
+++ b/submodules/AsyncDisplayKit/Source/ASTextKitRenderer+Positioning.h
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTextKitRenderer.h>
+#import "ASTextKitRenderer.h"
 
 #if AS_ENABLE_TEXTNODE
 
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.mm b/submodules/AsyncDisplayKit/Source/ASTextKitRenderer+Positioning.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+Positioning.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitRenderer+Positioning.mm
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+TextChecking.h b/submodules/AsyncDisplayKit/Source/ASTextKitRenderer+TextChecking.h
similarity index 95%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+TextChecking.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitRenderer+TextChecking.h
index d4ba74fd32..b5ea9fca06 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+TextChecking.h
+++ b/submodules/AsyncDisplayKit/Source/ASTextKitRenderer+TextChecking.h
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTextKitRenderer.h>
+#import "ASTextKitRenderer.h"
 
 #if AS_ENABLE_TEXTNODE
 
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+TextChecking.mm b/submodules/AsyncDisplayKit/Source/ASTextKitRenderer+TextChecking.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+TextChecking.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitRenderer+TextChecking.mm
index e556393572..205330aee6 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer+TextChecking.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextKitRenderer+TextChecking.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTextKitRenderer+TextChecking.h>
+#import "ASTextKitRenderer+TextChecking.h"
 
 #if AS_ENABLE_TEXTNODE
 
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.h b/submodules/AsyncDisplayKit/Source/ASTextKitRenderer.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitRenderer.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.mm b/submodules/AsyncDisplayKit/Source/ASTextKitRenderer.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitRenderer.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitRenderer.mm
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.h b/submodules/AsyncDisplayKit/Source/ASTextKitShadower.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitShadower.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.mm b/submodules/AsyncDisplayKit/Source/ASTextKitShadower.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitShadower.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitShadower.mm
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.h b/submodules/AsyncDisplayKit/Source/ASTextKitTailTruncater.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitTailTruncater.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.mm b/submodules/AsyncDisplayKit/Source/ASTextKitTailTruncater.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTailTruncater.mm
rename to submodules/AsyncDisplayKit/Source/ASTextKitTailTruncater.mm
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTruncating.h b/submodules/AsyncDisplayKit/Source/ASTextKitTruncating.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextKitTruncating.h
rename to submodules/AsyncDisplayKit/Source/ASTextKitTruncating.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.h b/submodules/AsyncDisplayKit/Source/ASTextLayout.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.h
rename to submodules/AsyncDisplayKit/Source/ASTextLayout.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.mm b/submodules/AsyncDisplayKit/Source/ASTextLayout.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLayout.mm
rename to submodules/AsyncDisplayKit/Source/ASTextLayout.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLine.h b/submodules/AsyncDisplayKit/Source/ASTextLine.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLine.h
rename to submodules/AsyncDisplayKit/Source/ASTextLine.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLine.mm b/submodules/AsyncDisplayKit/Source/ASTextLine.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLine.mm
rename to submodules/AsyncDisplayKit/Source/ASTextLine.mm
index a01311d83c..1a23e623a5 100644
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Component/ASTextLine.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextLine.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTextLine.h>
+#import "ASTextLine.h"
 #import <AsyncDisplayKit/ASTextUtilities.h>
 
 @implementation ASTextLine {
diff --git a/submodules/AsyncDisplayKit/Source/ASTextNode.mm b/submodules/AsyncDisplayKit/Source/ASTextNode.mm
index cb71774b67..52eb89979e 100644
--- a/submodules/AsyncDisplayKit/Source/ASTextNode.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextNode.mm
@@ -20,7 +20,7 @@
 
 #import <AsyncDisplayKit/ASAvailability.h>
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
+#import "Private/ASDisplayNode+FrameworkPrivate.h"
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
diff --git a/submodules/AsyncDisplayKit/Source/ASTextNode2.mm b/submodules/AsyncDisplayKit/Source/ASTextNode2.mm
index 916ebaf672..adb914ff5a 100644
--- a/submodules/AsyncDisplayKit/Source/ASTextNode2.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextNode2.mm
@@ -16,7 +16,7 @@
 #import "Private/ASDisplayNode+FrameworkPrivate.h"
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import "Private/ASDisplayNodeInternal.h"
 #import <AsyncDisplayKit/ASHighlightOverlayLayer.h>
 
 #import <AsyncDisplayKit/ASTextKitRenderer+Positioning.h>
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeTypes.h b/submodules/AsyncDisplayKit/Source/ASTextNodeTypes.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeTypes.h
rename to submodules/AsyncDisplayKit/Source/ASTextNodeTypes.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeWordKerner.h b/submodules/AsyncDisplayKit/Source/ASTextNodeWordKerner.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeWordKerner.h
rename to submodules/AsyncDisplayKit/Source/ASTextNodeWordKerner.h
diff --git a/submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeWordKerner.mm b/submodules/AsyncDisplayKit/Source/ASTextNodeWordKerner.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeWordKerner.mm
rename to submodules/AsyncDisplayKit/Source/ASTextNodeWordKerner.mm
index 67e640557c..e1d0c73c0e 100644
--- a/submodules/AsyncDisplayKit/Source/TextKit/ASTextNodeWordKerner.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextNodeWordKerner.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTextNodeWordKerner.h>
+#import "ASTextNodeWordKerner.h"
 
 #import <UIKit/UIKit.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextRunDelegate.h b/submodules/AsyncDisplayKit/Source/ASTextRunDelegate.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextRunDelegate.h
rename to submodules/AsyncDisplayKit/Source/ASTextRunDelegate.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextRunDelegate.mm b/submodules/AsyncDisplayKit/Source/ASTextRunDelegate.mm
similarity index 97%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextRunDelegate.mm
rename to submodules/AsyncDisplayKit/Source/ASTextRunDelegate.mm
index 1c179b1fea..f1b1f0106e 100644
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/String/ASTextRunDelegate.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTextRunDelegate.mm
@@ -6,7 +6,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTextRunDelegate.h>
+#import "ASTextRunDelegate.h"
 
 static void DeallocCallback(void *ref) {
   ASTextRunDelegate *self = (__bridge_transfer ASTextRunDelegate *)(ref);
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.h b/submodules/AsyncDisplayKit/Source/ASTextUtilities.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.h
rename to submodules/AsyncDisplayKit/Source/ASTextUtilities.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.mm b/submodules/AsyncDisplayKit/Source/ASTextUtilities.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/ASTextUtilities.mm
rename to submodules/AsyncDisplayKit/Source/ASTextUtilities.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASThread.h b/submodules/AsyncDisplayKit/Source/ASThread.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASThread.h
rename to submodules/AsyncDisplayKit/Source/ASThread.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTip.h b/submodules/AsyncDisplayKit/Source/ASTip.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASTip.h
rename to submodules/AsyncDisplayKit/Source/ASTip.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTip.mm b/submodules/AsyncDisplayKit/Source/ASTip.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASTip.mm
rename to submodules/AsyncDisplayKit/Source/ASTip.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipNode.h b/submodules/AsyncDisplayKit/Source/ASTipNode.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASTipNode.h
rename to submodules/AsyncDisplayKit/Source/ASTipNode.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipNode.mm b/submodules/AsyncDisplayKit/Source/ASTipNode.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASTipNode.mm
rename to submodules/AsyncDisplayKit/Source/ASTipNode.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipProvider.h b/submodules/AsyncDisplayKit/Source/ASTipProvider.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASTipProvider.h
rename to submodules/AsyncDisplayKit/Source/ASTipProvider.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipProvider.mm b/submodules/AsyncDisplayKit/Source/ASTipProvider.mm
similarity index 95%
rename from submodules/AsyncDisplayKit/Source/Private/ASTipProvider.mm
rename to submodules/AsyncDisplayKit/Source/ASTipProvider.mm
index 237e83cda0..f0dfcbf4cd 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASTipProvider.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTipProvider.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTipProvider.h>
+#import "ASTipProvider.h"
 
 #if AS_ENABLE_TIPS
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipsController.h b/submodules/AsyncDisplayKit/Source/ASTipsController.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASTipsController.h
rename to submodules/AsyncDisplayKit/Source/ASTipsController.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipsController.mm b/submodules/AsyncDisplayKit/Source/ASTipsController.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/ASTipsController.mm
rename to submodules/AsyncDisplayKit/Source/ASTipsController.mm
index acc592130c..344b0b1f8e 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASTipsController.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTipsController.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTipsController.h>
+#import "ASTipsController.h"
 
 #if AS_ENABLE_TIPS
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipsWindow.h b/submodules/AsyncDisplayKit/Source/ASTipsWindow.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASTipsWindow.h
rename to submodules/AsyncDisplayKit/Source/ASTipsWindow.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTipsWindow.mm b/submodules/AsyncDisplayKit/Source/ASTipsWindow.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Private/ASTipsWindow.mm
rename to submodules/AsyncDisplayKit/Source/ASTipsWindow.mm
index 010932613a..a5d8a56453 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASTipsWindow.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTipsWindow.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTipsWindow.h>
+#import "ASTipsWindow.h"
 #if AS_ENABLE_TIPS
 
 #import <AsyncDisplayKit/ASDisplayNodeTipState.h>
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTraceEvent.h b/submodules/AsyncDisplayKit/Source/ASTraceEvent.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASTraceEvent.h
rename to submodules/AsyncDisplayKit/Source/ASTraceEvent.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTraceEvent.mm b/submodules/AsyncDisplayKit/Source/ASTraceEvent.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASTraceEvent.mm
rename to submodules/AsyncDisplayKit/Source/ASTraceEvent.mm
index c809865591..b530624fc0 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASTraceEvent.mm
+++ b/submodules/AsyncDisplayKit/Source/ASTraceEvent.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASTraceEvent.h>
+#import "ASTraceEvent.h"
 #import <QuartzCore/QuartzCore.h>
 
 static NSString *const ASTraceEventThreadDescriptionKey = @"ASThreadTraceEventDescription";
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTraitCollection.h b/submodules/AsyncDisplayKit/Source/ASTraitCollection.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASTraitCollection.h
rename to submodules/AsyncDisplayKit/Source/ASTraitCollection.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTraitCollection.mm b/submodules/AsyncDisplayKit/Source/ASTraitCollection.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASTraitCollection.mm
rename to submodules/AsyncDisplayKit/Source/ASTraitCollection.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.h b/submodules/AsyncDisplayKit/Source/ASTwoDimensionalArrayUtils.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.h
rename to submodules/AsyncDisplayKit/Source/ASTwoDimensionalArrayUtils.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.mm b/submodules/AsyncDisplayKit/Source/ASTwoDimensionalArrayUtils.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASTwoDimensionalArrayUtils.mm
rename to submodules/AsyncDisplayKit/Source/ASTwoDimensionalArrayUtils.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASWeakMap.h b/submodules/AsyncDisplayKit/Source/ASWeakMap.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/ASWeakMap.h
rename to submodules/AsyncDisplayKit/Source/ASWeakMap.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/ASWeakMap.mm b/submodules/AsyncDisplayKit/Source/ASWeakMap.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Private/ASWeakMap.mm
rename to submodules/AsyncDisplayKit/Source/ASWeakMap.mm
index 3110b13d37..1267d8ff69 100644
--- a/submodules/AsyncDisplayKit/Source/Private/ASWeakMap.mm
+++ b/submodules/AsyncDisplayKit/Source/ASWeakMap.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASWeakMap.h>
+#import "ASWeakMap.h"
 
 @interface ASWeakMapEntry ()
 @property (nonatomic, readonly) id key;
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASWeakProxy.h b/submodules/AsyncDisplayKit/Source/ASWeakProxy.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASWeakProxy.h
rename to submodules/AsyncDisplayKit/Source/ASWeakProxy.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASWeakProxy.mm b/submodules/AsyncDisplayKit/Source/ASWeakProxy.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/ASWeakProxy.mm
rename to submodules/AsyncDisplayKit/Source/ASWeakProxy.mm
index 4a73408dd5..4a3b5c8a2a 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASWeakProxy.mm
+++ b/submodules/AsyncDisplayKit/Source/ASWeakProxy.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/ASWeakProxy.h>
+#import "ASWeakProxy.h"
 #import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 #import <AsyncDisplayKit/ASAssert.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASWeakSet.h b/submodules/AsyncDisplayKit/Source/ASWeakSet.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASWeakSet.h
rename to submodules/AsyncDisplayKit/Source/ASWeakSet.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASWeakSet.mm b/submodules/AsyncDisplayKit/Source/ASWeakSet.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/ASWeakSet.mm
rename to submodules/AsyncDisplayKit/Source/ASWeakSet.mm
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASYogaUtilities.h b/submodules/AsyncDisplayKit/Source/ASYogaUtilities.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Layout/ASYogaUtilities.h
rename to submodules/AsyncDisplayKit/Source/ASYogaUtilities.h
diff --git a/submodules/AsyncDisplayKit/Source/Layout/ASYogaUtilities.mm b/submodules/AsyncDisplayKit/Source/ASYogaUtilities.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Layout/ASYogaUtilities.mm
rename to submodules/AsyncDisplayKit/Source/ASYogaUtilities.mm
index f0602ed4bd..f572851a37 100644
--- a/submodules/AsyncDisplayKit/Source/Layout/ASYogaUtilities.mm
+++ b/submodules/AsyncDisplayKit/Source/ASYogaUtilities.mm
@@ -6,9 +6,10 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#if YOGA /* YOGA */
+
 #import <AsyncDisplayKit/ASYogaUtilities.h>
 #import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
-#if YOGA /* YOGA */
 
 @implementation ASDisplayNode (YogaHelpers)
 
diff --git a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Debug.h b/submodules/AsyncDisplayKit/Source/AsyncDisplayKit+Debug.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Debug.h
rename to submodules/AsyncDisplayKit/Source/AsyncDisplayKit+Debug.h
diff --git a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Debug.mm b/submodules/AsyncDisplayKit/Source/AsyncDisplayKit+Debug.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Debug.mm
rename to submodules/AsyncDisplayKit/Source/AsyncDisplayKit+Debug.mm
diff --git a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Tips.h b/submodules/AsyncDisplayKit/Source/AsyncDisplayKit+Tips.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Tips.h
rename to submodules/AsyncDisplayKit/Source/AsyncDisplayKit+Tips.h
diff --git a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Tips.mm b/submodules/AsyncDisplayKit/Source/AsyncDisplayKit+Tips.mm
similarity index 96%
rename from submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Tips.mm
rename to submodules/AsyncDisplayKit/Source/AsyncDisplayKit+Tips.mm
index f1a3ec8d72..792349351f 100644
--- a/submodules/AsyncDisplayKit/Source/Debug/AsyncDisplayKit+Tips.mm
+++ b/submodules/AsyncDisplayKit/Source/AsyncDisplayKit+Tips.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/AsyncDisplayKit+Tips.h>
+#import "AsyncDisplayKit+Tips.h"
 #import <AsyncDisplayKit/ASDisplayNode+Ancestry.h>
 
 @implementation ASDisplayNode (Tips)
diff --git a/submodules/AsyncDisplayKit/Source/AsyncDisplayKit.h b/submodules/AsyncDisplayKit/Source/AsyncDisplayKit.h
deleted file mode 100644
index 00a0fb37f1..0000000000
--- a/submodules/AsyncDisplayKit/Source/AsyncDisplayKit.h
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-//  AsyncDisplayKit.h
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#ifndef MINIMAL_ASDK
-#define MINIMAL_ASDK 1
-#endif
-
-#import <AsyncDisplayKit/ASAvailability.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASDisplayNode.h>
-#import <AsyncDisplayKit/ASDisplayNode+Ancestry.h>
-#import <AsyncDisplayKit/ASDisplayNode+Convenience.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASConfiguration.h>
-#import <AsyncDisplayKit/ASConfigurationDelegate.h>
-#import <AsyncDisplayKit/ASConfigurationInternal.h>
-
-#import <AsyncDisplayKit/ASControlNode.h>
-#import <AsyncDisplayKit/ASImageNode.h>
-#import <AsyncDisplayKit/ASTextNode.h>
-#import <AsyncDisplayKit/ASTextNode2.h>
-#import <AsyncDisplayKit/ASEditableTextNode.h>
-#import <AsyncDisplayKit/ASButtonNode.h>
-
-#import <AsyncDisplayKit/ASImageProtocols.h>
-
-#import <AsyncDisplayKit/ASRangeManagingNode.h>
-#import <AsyncDisplayKit/ASSectionContext.h>
-
-#import <AsyncDisplayKit/ASElementMap.h>
-
-#import <AsyncDisplayKit/ASSupplementaryNodeSource.h>
-
-#import <AsyncDisplayKit/ASScrollNode.h>
-
-#import <AsyncDisplayKit/ASNodeController+Beta.h>
-#import <AsyncDisplayKit/ASViewController.h>
-#import <AsyncDisplayKit/ASNavigationController.h>
-#import <AsyncDisplayKit/ASTabBarController.h>
-#import <AsyncDisplayKit/ASRangeControllerUpdateRangeProtocol+Beta.h>
-
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASDimension.h>
-#import <AsyncDisplayKit/ASDimensionInternal.h>
-#import <AsyncDisplayKit/ASLayoutElement.h>
-#import <AsyncDisplayKit/ASLayoutSpec.h>
-#import <AsyncDisplayKit/ASBackgroundLayoutSpec.h>
-#import <AsyncDisplayKit/ASCenterLayoutSpec.h>
-#import <AsyncDisplayKit/ASCornerLayoutSpec.h>
-#import <AsyncDisplayKit/ASRelativeLayoutSpec.h>
-#import <AsyncDisplayKit/ASInsetLayoutSpec.h>
-#import <AsyncDisplayKit/ASOverlayLayoutSpec.h>
-#import <AsyncDisplayKit/ASRatioLayoutSpec.h>
-#import <AsyncDisplayKit/ASAbsoluteLayoutSpec.h>
-#import <AsyncDisplayKit/ASStackLayoutDefines.h>
-#import <AsyncDisplayKit/ASStackLayoutSpec.h>
-
-#import <AsyncDisplayKit/_ASAsyncTransaction.h>
-#import <AsyncDisplayKit/_ASAsyncTransactionGroup.h>
-#import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
-#import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/_ASDisplayView.h>
-#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-#import <AsyncDisplayKit/ASTextNode+Beta.h>
-#import <AsyncDisplayKit/ASTextNodeTypes.h>
-#import <AsyncDisplayKit/ASBlockTypes.h>
-#import <AsyncDisplayKit/ASContextTransitioning.h>
-#import <AsyncDisplayKit/ASControlNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASEventLog.h>
-#import <AsyncDisplayKit/ASHashing.h>
-#import <AsyncDisplayKit/ASHighlightOverlayLayer.h>
-#import <AsyncDisplayKit/ASImageContainerProtocolCategories.h>
-#import <AsyncDisplayKit/ASLocking.h>
-#import <AsyncDisplayKit/ASLog.h>
-#import <AsyncDisplayKit/ASMainThreadDeallocation.h>
-#import <AsyncDisplayKit/ASMutableAttributedStringBuilder.h>
-#import <AsyncDisplayKit/ASRunLoopQueue.h>
-#import <AsyncDisplayKit/ASTextKitComponents.h>
-#import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASTraitCollection.h>
-#import <AsyncDisplayKit/ASVisibilityProtocols.h>
-#import <AsyncDisplayKit/ASWeakSet.h>
-
-#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-#import <AsyncDisplayKit/NSMutableAttributedString+TextKitAdditions.h>
-#import <AsyncDisplayKit/UICollectionViewLayout+ASConvenience.h>
-#import <AsyncDisplayKit/UIView+ASConvenience.h>
-#import <AsyncDisplayKit/UIImage+ASConvenience.h>
-#import <AsyncDisplayKit/ASGraphicsContext.h>
-#import <AsyncDisplayKit/NSArray+Diffing.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-#import <AsyncDisplayKit/UIResponder+AsyncDisplayKit.h>
-
-#import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
diff --git a/submodules/AsyncDisplayKit/Source/AsyncDisplayKit.modulemap b/submodules/AsyncDisplayKit/Source/AsyncDisplayKit.modulemap
deleted file mode 100644
index fd7d49e620..0000000000
--- a/submodules/AsyncDisplayKit/Source/AsyncDisplayKit.modulemap
+++ /dev/null
@@ -1,19 +0,0 @@
-framework module AsyncDisplayKit {
-  umbrella header "AsyncDisplayKit.h"
-  
-  export *
-  module * {
-    export *
-  }
-  
-  explicit module ASControlNode_Subclasses {
-    header "ASControlNode+Subclasses.h"
-    export *
-  }
-  
-  explicit module ASDisplayNode_Subclasses {
-    header "ASDisplayNode+Subclasses.h"
-    export *
-  }
-  
-}
diff --git a/submodules/AsyncDisplayKit/Source/Details/CoreGraphics+ASConvenience.h b/submodules/AsyncDisplayKit/Source/CoreGraphics+ASConvenience.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/CoreGraphics+ASConvenience.h
rename to submodules/AsyncDisplayKit/Source/CoreGraphics+ASConvenience.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/NSArray+Diffing.h b/submodules/AsyncDisplayKit/Source/NSArray+Diffing.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/NSArray+Diffing.h
rename to submodules/AsyncDisplayKit/Source/NSArray+Diffing.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/NSArray+Diffing.mm b/submodules/AsyncDisplayKit/Source/NSArray+Diffing.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Details/NSArray+Diffing.mm
rename to submodules/AsyncDisplayKit/Source/NSArray+Diffing.mm
index 83d32fea68..51d564a0d9 100644
--- a/submodules/AsyncDisplayKit/Source/Details/NSArray+Diffing.mm
+++ b/submodules/AsyncDisplayKit/Source/NSArray+Diffing.mm
@@ -7,9 +7,9 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/NSArray+Diffing.h>
+#import "NSArray+Diffing.h"
 #import <UIKit/NSIndexPath+UIKitAdditions.h>
-#import <AsyncDisplayKit/ASAssert.h>
+#import "ASAssert.h"
 #import <unordered_map>
 
 @implementation NSArray (Diffing)
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSAttributedString+ASText.h b/submodules/AsyncDisplayKit/Source/NSAttributedString+ASText.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSAttributedString+ASText.h
rename to submodules/AsyncDisplayKit/Source/NSAttributedString+ASText.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSAttributedString+ASText.mm b/submodules/AsyncDisplayKit/Source/NSAttributedString+ASText.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSAttributedString+ASText.mm
rename to submodules/AsyncDisplayKit/Source/NSAttributedString+ASText.mm
index 39f628151c..205441e633 100644
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSAttributedString+ASText.mm
+++ b/submodules/AsyncDisplayKit/Source/NSAttributedString+ASText.mm
@@ -6,7 +6,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/NSAttributedString+ASText.h>
+#import "NSAttributedString+ASText.h"
 #import <AsyncDisplayKit/NSParagraphStyle+ASText.h>
 #import <AsyncDisplayKit/ASTextRunDelegate.h>
 #import <AsyncDisplayKit/ASTextUtilities.h>
diff --git a/submodules/AsyncDisplayKit/Source/Details/NSIndexSet+ASHelpers.h b/submodules/AsyncDisplayKit/Source/NSIndexSet+ASHelpers.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/NSIndexSet+ASHelpers.h
rename to submodules/AsyncDisplayKit/Source/NSIndexSet+ASHelpers.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/NSIndexSet+ASHelpers.mm b/submodules/AsyncDisplayKit/Source/NSIndexSet+ASHelpers.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/NSIndexSet+ASHelpers.mm
rename to submodules/AsyncDisplayKit/Source/NSIndexSet+ASHelpers.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/NSMutableAttributedString+TextKitAdditions.h b/submodules/AsyncDisplayKit/Source/NSMutableAttributedString+TextKitAdditions.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/NSMutableAttributedString+TextKitAdditions.h
rename to submodules/AsyncDisplayKit/Source/NSMutableAttributedString+TextKitAdditions.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/NSMutableAttributedString+TextKitAdditions.mm b/submodules/AsyncDisplayKit/Source/NSMutableAttributedString+TextKitAdditions.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/NSMutableAttributedString+TextKitAdditions.mm
rename to submodules/AsyncDisplayKit/Source/NSMutableAttributedString+TextKitAdditions.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSParagraphStyle+ASText.h b/submodules/AsyncDisplayKit/Source/NSParagraphStyle+ASText.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSParagraphStyle+ASText.h
rename to submodules/AsyncDisplayKit/Source/NSParagraphStyle+ASText.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSParagraphStyle+ASText.mm b/submodules/AsyncDisplayKit/Source/NSParagraphStyle+ASText.mm
similarity index 98%
rename from submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSParagraphStyle+ASText.mm
rename to submodules/AsyncDisplayKit/Source/NSParagraphStyle+ASText.mm
index bc19fd234c..80ce6305cb 100644
--- a/submodules/AsyncDisplayKit/Source/Private/TextExperiment/Utility/NSParagraphStyle+ASText.mm
+++ b/submodules/AsyncDisplayKit/Source/NSParagraphStyle+ASText.mm
@@ -6,8 +6,8 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/NSParagraphStyle+ASText.h>
-#import <AsyncDisplayKit/ASTextAttribute.h>
+#import "NSParagraphStyle+ASText.h"
+#import "Private/TextExperiment/String/ASTextAttribute.h"
 #import <CoreText/CoreText.h>
 
 // Dummy class for category
diff --git a/submodules/AsyncDisplayKit/Source/Details/UICollectionViewLayout+ASConvenience.h b/submodules/AsyncDisplayKit/Source/UICollectionViewLayout+ASConvenience.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/UICollectionViewLayout+ASConvenience.h
rename to submodules/AsyncDisplayKit/Source/UICollectionViewLayout+ASConvenience.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/UICollectionViewLayout+ASConvenience.mm b/submodules/AsyncDisplayKit/Source/UICollectionViewLayout+ASConvenience.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/UICollectionViewLayout+ASConvenience.mm
rename to submodules/AsyncDisplayKit/Source/UICollectionViewLayout+ASConvenience.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/UIView+ASConvenience.h b/submodules/AsyncDisplayKit/Source/UIView+ASConvenience.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/UIView+ASConvenience.h
rename to submodules/AsyncDisplayKit/Source/UIView+ASConvenience.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransaction.h b/submodules/AsyncDisplayKit/Source/_ASAsyncTransaction.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransaction.h
rename to submodules/AsyncDisplayKit/Source/_ASAsyncTransaction.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransaction.mm b/submodules/AsyncDisplayKit/Source/_ASAsyncTransaction.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransaction.mm
rename to submodules/AsyncDisplayKit/Source/_ASAsyncTransaction.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer+Private.h b/submodules/AsyncDisplayKit/Source/_ASAsyncTransactionContainer+Private.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer+Private.h
rename to submodules/AsyncDisplayKit/Source/_ASAsyncTransactionContainer+Private.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer.h b/submodules/AsyncDisplayKit/Source/_ASAsyncTransactionContainer.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer.h
rename to submodules/AsyncDisplayKit/Source/_ASAsyncTransactionContainer.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer.mm b/submodules/AsyncDisplayKit/Source/_ASAsyncTransactionContainer.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionContainer.mm
rename to submodules/AsyncDisplayKit/Source/_ASAsyncTransactionContainer.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionGroup.h b/submodules/AsyncDisplayKit/Source/_ASAsyncTransactionGroup.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionGroup.h
rename to submodules/AsyncDisplayKit/Source/_ASAsyncTransactionGroup.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionGroup.mm b/submodules/AsyncDisplayKit/Source/_ASAsyncTransactionGroup.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/Transactions/_ASAsyncTransactionGroup.mm
rename to submodules/AsyncDisplayKit/Source/_ASAsyncTransactionGroup.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutInfo.h b/submodules/AsyncDisplayKit/Source/_ASCollectionGalleryLayoutInfo.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutInfo.h
rename to submodules/AsyncDisplayKit/Source/_ASCollectionGalleryLayoutInfo.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutInfo.mm b/submodules/AsyncDisplayKit/Source/_ASCollectionGalleryLayoutInfo.mm
similarity index 96%
rename from submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutInfo.mm
rename to submodules/AsyncDisplayKit/Source/_ASCollectionGalleryLayoutInfo.mm
index fec0b52872..91a0c98411 100644
--- a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutInfo.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASCollectionGalleryLayoutInfo.mm
@@ -6,7 +6,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/_ASCollectionGalleryLayoutInfo.h>
+#import "_ASCollectionGalleryLayoutInfo.h"
 #import <AsyncDisplayKit/ASHashing.h>
 
 @implementation _ASCollectionGalleryLayoutInfo
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutItem.h b/submodules/AsyncDisplayKit/Source/_ASCollectionGalleryLayoutItem.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutItem.h
rename to submodules/AsyncDisplayKit/Source/_ASCollectionGalleryLayoutItem.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutItem.mm b/submodules/AsyncDisplayKit/Source/_ASCollectionGalleryLayoutItem.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASCollectionGalleryLayoutItem.mm
rename to submodules/AsyncDisplayKit/Source/_ASCollectionGalleryLayoutItem.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionReusableView.h b/submodules/AsyncDisplayKit/Source/_ASCollectionReusableView.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/_ASCollectionReusableView.h
rename to submodules/AsyncDisplayKit/Source/_ASCollectionReusableView.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionReusableView.mm b/submodules/AsyncDisplayKit/Source/_ASCollectionReusableView.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/_ASCollectionReusableView.mm
rename to submodules/AsyncDisplayKit/Source/_ASCollectionReusableView.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.h b/submodules/AsyncDisplayKit/Source/_ASCollectionViewCell.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.h
rename to submodules/AsyncDisplayKit/Source/_ASCollectionViewCell.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.mm b/submodules/AsyncDisplayKit/Source/_ASCollectionViewCell.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/_ASCollectionViewCell.mm
rename to submodules/AsyncDisplayKit/Source/_ASCollectionViewCell.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCoreAnimationExtras.h b/submodules/AsyncDisplayKit/Source/_ASCoreAnimationExtras.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASCoreAnimationExtras.h
rename to submodules/AsyncDisplayKit/Source/_ASCoreAnimationExtras.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASCoreAnimationExtras.mm b/submodules/AsyncDisplayKit/Source/_ASCoreAnimationExtras.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASCoreAnimationExtras.mm
rename to submodules/AsyncDisplayKit/Source/_ASCoreAnimationExtras.mm
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayLayer.h b/submodules/AsyncDisplayKit/Source/_ASDisplayLayer.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/_ASDisplayLayer.h
rename to submodules/AsyncDisplayKit/Source/_ASDisplayLayer.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayLayer.mm b/submodules/AsyncDisplayKit/Source/_ASDisplayLayer.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Details/_ASDisplayLayer.mm
rename to submodules/AsyncDisplayKit/Source/_ASDisplayLayer.mm
index a7478f1883..51676fc6e0 100644
--- a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayLayer.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASDisplayLayer.mm
@@ -14,7 +14,7 @@
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASDisplayNode.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import "Private/ASDisplayNodeInternal.h"
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 #import <AsyncDisplayKit/ASLog.h>
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.h b/submodules/AsyncDisplayKit/Source/_ASDisplayView.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.h
rename to submodules/AsyncDisplayKit/Source/_ASDisplayView.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.mm b/submodules/AsyncDisplayKit/Source/_ASDisplayView.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.mm
rename to submodules/AsyncDisplayKit/Source/_ASDisplayView.mm
index ae4d39c155..a0792bc2b2 100644
--- a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayView.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASDisplayView.mm
@@ -10,7 +10,7 @@
 #import <AsyncDisplayKit/_ASDisplayView.h>
 #import <AsyncDisplayKit/_ASDisplayViewAccessiblity.h>
 
-#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
+#import "Private/_ASCoreAnimationExtras.h"
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
 #import <AsyncDisplayKit/ASDisplayNode+Convenience.h>
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayViewAccessiblity.h b/submodules/AsyncDisplayKit/Source/_ASDisplayViewAccessiblity.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Details/_ASDisplayViewAccessiblity.h
rename to submodules/AsyncDisplayKit/Source/_ASDisplayViewAccessiblity.h
diff --git a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayViewAccessiblity.mm b/submodules/AsyncDisplayKit/Source/_ASDisplayViewAccessiblity.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Details/_ASDisplayViewAccessiblity.mm
rename to submodules/AsyncDisplayKit/Source/_ASDisplayViewAccessiblity.mm
index 9e91056aaf..9fe817d09b 100644
--- a/submodules/AsyncDisplayKit/Source/Details/_ASDisplayViewAccessiblity.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASDisplayViewAccessiblity.mm
@@ -13,7 +13,7 @@
 #import <AsyncDisplayKit/ASAvailability.h>
 #import <AsyncDisplayKit/ASCollectionNode.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
+#import "ASDisplayNode+FrameworkPrivate.h"
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
 #import <AsyncDisplayKit/ASTableNode.h>
 
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.h b/submodules/AsyncDisplayKit/Source/_ASHierarchyChangeSet.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.h
rename to submodules/AsyncDisplayKit/Source/_ASHierarchyChangeSet.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.mm b/submodules/AsyncDisplayKit/Source/_ASHierarchyChangeSet.mm
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASHierarchyChangeSet.mm
rename to submodules/AsyncDisplayKit/Source/_ASHierarchyChangeSet.mm
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASPendingState.h b/submodules/AsyncDisplayKit/Source/_ASPendingState.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASPendingState.h
rename to submodules/AsyncDisplayKit/Source/_ASPendingState.h
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASPendingState.mm b/submodules/AsyncDisplayKit/Source/_ASPendingState.mm
similarity index 99%
rename from submodules/AsyncDisplayKit/Source/Private/_ASPendingState.mm
rename to submodules/AsyncDisplayKit/Source/_ASPendingState.mm
index eb11e055f0..0b1fe54d54 100644
--- a/submodules/AsyncDisplayKit/Source/Private/_ASPendingState.mm
+++ b/submodules/AsyncDisplayKit/Source/_ASPendingState.mm
@@ -7,9 +7,9 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/_ASPendingState.h>
+#import "_ASPendingState.h"
 
-#import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
+#import "_ASCoreAnimationExtras.h"
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
diff --git a/submodules/AsyncDisplayKit/Source/Private/_ASScopeTimer.h b/submodules/AsyncDisplayKit/Source/_ASScopeTimer.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/Private/_ASScopeTimer.h
rename to submodules/AsyncDisplayKit/Source/_ASScopeTimer.h
diff --git a/submodules/AsyncDisplayKit/Source/tvOS/ASControlNode+tvOS.mm b/submodules/AsyncDisplayKit/Source/tvOS/ASControlNode+tvOS.mm
deleted file mode 100644
index a823d9625c..0000000000
--- a/submodules/AsyncDisplayKit/Source/tvOS/ASControlNode+tvOS.mm
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-//  ASControlNode+tvOS.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#if TARGET_OS_TV
-#import <AsyncDisplayKit/ASControlNode.h>
-#import <AsyncDisplayKit/ASControlNode+Private.h>
-
-@implementation ASControlNode (tvOS)
-
-#pragma mark - tvOS
-- (void)_pressDown
-{
-  [UIView animateWithDuration:0.1 delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
-    [self setPressedState];
-  } completion:^(BOOL finished) {
-    if (finished) {
-      [UIView animateWithDuration:0.1 delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
-        [self setFocusedState];
-      } completion:nil];
-    }
-  }];
-}
-
-- (BOOL)canBecomeFocused
-{
-  return YES;
-}
-
-- (BOOL)shouldUpdateFocusInContext:(nonnull UIFocusUpdateContext *)context
-{
-  return YES;
-}
-
-- (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator
-{
-  //FIXME: This is never valid inside an ASCellNode
-  if (context.nextFocusedView && context.nextFocusedView == self.view) {
-    //Focused
-    [coordinator addCoordinatedAnimations:^{
-      [self setFocusedState];
-    } completion:nil];
-  } else{
-    //Not focused
-    [coordinator addCoordinatedAnimations:^{
-      [self setDefaultFocusAppearance];
-    } completion:nil];
-  }
-}
-
-- (void)setFocusedState
-{
-  CALayer *layer = self.layer;
-  layer.shadowOffset = CGSizeMake(2, 10);
-  [self applyDefaultShadowProperties: layer];
-  self.view.transform = CGAffineTransformScale(CGAffineTransformIdentity, 1.1, 1.1);
-}
-
-- (void)setPressedState
-{
-  CALayer *layer = self.layer;
-  layer.shadowOffset = CGSizeMake(2, 2);
-  [self applyDefaultShadowProperties: layer];
-  self.view.transform = CGAffineTransformScale(CGAffineTransformIdentity, 1, 1);
-}
-
-- (void)applyDefaultShadowProperties:(CALayer *)layer
-{
-  layer.shadowColor = [UIColor blackColor].CGColor;
-  layer.shadowRadius = 12.0;
-  layer.shadowOpacity = 0.45;
-  layer.shadowPath = [UIBezierPath bezierPathWithRect:self.layer.bounds].CGPath;
-}
-
-- (void)setDefaultFocusAppearance
-{
-  CALayer *layer = self.layer;
-  layer.shadowOffset = CGSizeZero;
-  layer.shadowColor = [UIColor blackColor].CGColor;
-  layer.shadowRadius = 0;
-  layer.shadowOpacity = 0;
-  layer.shadowPath = [UIBezierPath bezierPathWithRect:self.layer.bounds].CGPath;
-  self.view.transform = CGAffineTransformScale(CGAffineTransformIdentity, 1, 1);
-}
-@end
-#endif
diff --git a/submodules/AsyncDisplayKit/Source/tvOS/ASImageNode+tvOS.mm b/submodules/AsyncDisplayKit/Source/tvOS/ASImageNode+tvOS.mm
deleted file mode 100644
index fa760f1291..0000000000
--- a/submodules/AsyncDisplayKit/Source/tvOS/ASImageNode+tvOS.mm
+++ /dev/null
@@ -1,191 +0,0 @@
-//
-//  ASImageNode+tvOS.mm
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <Foundation/Foundation.h>
-#if TARGET_OS_TV
-#import <AsyncDisplayKit/ASImageNode.h>
-#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-
-// TODO: Remove this – we don't need to link GLKit just to convert degrees to radians.
-#import <GLKit/GLKit.h>
-#import <tgmath.h>
-
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
-
-@implementation ASImageNode (tvOS)
-
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  [super touchesBegan:touches withEvent:event];
-  self.isDefaultFocusAppearance = NO;
-  UIView *view = [self getView];
-  CALayer *layer = view.layer;
-  
-  CGSize targetShadowOffset = CGSizeMake(0.0, self.bounds.size.height/8);
-  [layer removeAllAnimations];
-  [CATransaction begin];
-  [CATransaction setCompletionBlock:^{
-    layer.shadowOffset = targetShadowOffset;
-  }];
-  
-  CABasicAnimation *shadowOffsetAnimation = [CABasicAnimation animationWithKeyPath:@"shadowOffset"];
-  shadowOffsetAnimation.toValue = [NSValue valueWithCGSize:targetShadowOffset];
-  shadowOffsetAnimation.duration = 0.4;
-  shadowOffsetAnimation.removedOnCompletion = NO;
-  shadowOffsetAnimation.fillMode = kCAFillModeForwards;
-  shadowOffsetAnimation.timingFunction = [CAMediaTimingFunction functionWithName:@"easeOut"];
-  [layer addAnimation:shadowOffsetAnimation forKey:@"shadowOffset"];
-  [CATransaction commit];
-  
-  CABasicAnimation *shadowOpacityAnimation = [CABasicAnimation animationWithKeyPath:@"shadowOpacity"];
-  shadowOpacityAnimation.toValue = [NSNumber numberWithFloat:0.45];
-  shadowOpacityAnimation.duration = 0.4;
-  shadowOpacityAnimation.removedOnCompletion = false;
-  shadowOpacityAnimation.fillMode = kCAFillModeForwards;
-  shadowOpacityAnimation.timingFunction = [CAMediaTimingFunction functionWithName:@"easeOut"];
-  [layer addAnimation:shadowOpacityAnimation forKey:@"shadowOpacityAnimation"];
-  
-  view.transform = CGAffineTransformScale(CGAffineTransformIdentity, 1.25, 1.25);
-  
-  [CATransaction commit];
-}
-
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
-{
-  [super touchesMoved:touches withEvent:event];
-  
-  // TODO: Clean up, and improve visuals.
-  
-  if (!self.isDefaultFocusAppearance) {
-    // This view may correspond to either self.view
-    // or our superview if we are in a ASCellNode
-    UIView *view = [self getView];
-    
-    UITouch *touch = [touches anyObject];
-    // Get the specific point that was touched
-    
-    // This is quite messy in it's current state so is not ready for production.
-    // The reason it is here is for others to contribute and to make it clear what is occuring.
-    
-    // We get the touch location in self.view because
-    // we are operating in that coordinate system.
-    // BUT we apply our transforms to *view since we want to apply
-    // the transforms to the root view (L: 107)
-    CGPoint point = [touch locationInView:self.view];
-    CGFloat pitch = 0;
-    CGFloat yaw = 0;
-    BOOL topHalf = NO;
-    if (point.y > CGRectGetHeight(self.view.frame)) {
-      pitch = 15;
-    } else if (point.y < -CGRectGetHeight(self.view.frame)) {
-      pitch = -15;
-    } else {
-      pitch = (point.y/CGRectGetHeight(self.view.frame))*15;
-    }
-    if (pitch < 0) {
-      topHalf = YES;
-    }
-    
-    if (point.x > CGRectGetWidth(self.view.frame)) {
-      yaw = 10;
-    } else if (point.x < -CGRectGetWidth(self.view.frame)) {
-      yaw = -10;
-    } else {
-      yaw = (point.x/CGRectGetWidth(self.view.frame))*10;
-    }
-    if (!topHalf) {
-      if (yaw > 0) {
-        yaw = -yaw;
-      } else {
-        yaw = fabs(yaw);
-      }
-    }
-    
-    CATransform3D pitchTransform = CATransform3DMakeRotation(GLKMathDegreesToRadians(pitch),1.0,0.0,0.0);
-    CATransform3D yawTransform = CATransform3DMakeRotation(GLKMathDegreesToRadians(yaw),0.0,1.0,0.0);
-    CATransform3D transform = CATransform3DConcat(pitchTransform, yawTransform);
-    CATransform3D scaleAndTransform = CATransform3DConcat(transform, CATransform3DMakeAffineTransform(CGAffineTransformScale(CGAffineTransformIdentity, 1.25, 1.25)));
-    
-    [UIView animateWithDuration:0.5 animations:^{
-      view.layer.transform = scaleAndTransform;
-    }];
-  } else {
-    [self setDefaultFocusAppearance];
-  }
-}
-
-
-- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
-{
-  [super touchesEnded:touches withEvent:event];
-  [self finishTouches];
-}
-
-- (void)finishTouches
-{
-  if (!self.isDefaultFocusAppearance) {
-    UIView *view = [self getView];
-    CALayer *layer = view.layer;
-    
-    CGSize targetShadowOffset = CGSizeMake(0.0, self.bounds.size.height/8);
-    CATransform3D targetScaleTransform = CATransform3DMakeScale(1.2, 1.2, 1.2);
-    [CATransaction begin];
-    [CATransaction setCompletionBlock:^{
-      layer.shadowOffset = targetShadowOffset;
-    }];
-    [CATransaction commit];
-    
-    [UIView animateWithDuration:0.4 delay:0.0 options:UIViewAnimationOptionCurveEaseInOut animations:^{
-      view.layer.transform = targetScaleTransform;
-    } completion:^(BOOL finished) {
-      if (finished) {
-        [layer removeAnimationForKey:@"shadowOffset"];
-        [layer removeAnimationForKey:@"shadowOpacity"];
-      }
-    }];
-  } else {
-    [self setDefaultFocusAppearance];
-  }
-}
-
-- (void)setFocusedState
-{
-  UIView *view = [self getView];
-  CALayer *layer = view.layer;
-  layer.shadowOffset = CGSizeMake(2, 10);
-  layer.shadowColor = [UIColor blackColor].CGColor;
-  layer.shadowRadius = 12.0;
-  layer.shadowOpacity = 0.45;
-  layer.shadowPath = [UIBezierPath bezierPathWithRect:self.layer.bounds].CGPath;
-  view.transform = CGAffineTransformScale(CGAffineTransformIdentity, 1.25, 1.25);
-}
-
-- (void)setDefaultFocusAppearance
-{
-  UIView *view = [self getView];
-  CALayer *layer = view.layer;
-  view.transform = CGAffineTransformIdentity;
-  layer.shadowOpacity = 0;
-  layer.shadowOffset = CGSizeZero;
-  layer.shadowRadius = 0;
-  layer.shadowPath = nil;
-  [layer removeAnimationForKey:@"shadowOffset"];
-  [layer removeAnimationForKey:@"shadowOpacity"];
-  self.isDefaultFocusAppearance = YES;
-}
-
-- (UIView *)getView
-{
-  // TODO: This needs to be re-visited to handle all possibilities.
-  // If we are inside a ASCellNode, then we need to apply our focus effects to the ASCellNode view/layer rather than the ASImageNode view/layer.
-  return ASDisplayNodeUltimateParentOfNode(self).view;
-}
-
-@end
-#endif