Shuffle & Cleanup Stuff (#3080)

TextureGroup · Feb 27, 2017 · 73ca6ab · 73ca6ab
1 parent e48edef
commit 73ca6ab
Show file tree

Hide file tree

Showing 595 changed files with 181 additions and 225 deletions.
diff --git a/AsyncDisplayKit.podspec b/AsyncDisplayKit.podspec
@@ -19,26 +19,26 @@ Pod::Spec.new do |spec|
 
   # Subspecs
   spec.subspec 'Core' do |core|
-    core.prefix_header_file = 'AsyncDisplayKit/AsyncDisplayKit-Prefix.pch'
+    core.prefix_header_file = 'Source/AsyncDisplayKit-Prefix.pch'
     core.public_header_files = [
-        'AsyncDisplayKit/*.h',
-        'AsyncDisplayKit/Details/**/*.h',
-        'AsyncDisplayKit/Layout/**/*.h',
-        'Base/*.h',
-        'AsyncDisplayKit/Debug/ASLayoutElementInspectorNode.h',
-        'AsyncDisplayKit/TextKit/ASTextNodeTypes.h',
-        'AsyncDisplayKit/TextKit/ASTextKitComponents.h'
+        'Source/*.h',
+        'Source/Details/**/*.h',
+        'Source/Layout/**/*.h',
+        'Source/Base/*.h',
+        'Source/Debug/AsyncDisplayKit+Debug.h',
+        'Source/TextKit/ASTextNodeTypes.h',
+        'Source/TextKit/ASTextKitComponents.h'
     ]
 
     core.source_files = [
-        'AsyncDisplayKit/**/*.{h,m,mm}',
+        'Source/**/*.{h,m,mm}',
         'Base/*.{h,m}',
 
         # Most TextKit components are not public because the C++ content
         # in the headers will cause build errors when using
         # `use_frameworks!` on 0.39.0 & Swift 2.1.
         # See https://github.com/facebook/AsyncDisplayKit/issues/1153
-        'AsyncDisplayKit/TextKit/*.h',
+        'Source/TextKit/*.h',
     ]
     core.xcconfig = { 'GCC_PRECOMPILE_PREFIX_HEADER' => 'YES' }
   end

diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj
diff --git a/AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme b/AsyncDisplayKit.xcodeproj/xcshareddata/xcschemes/AsyncDisplayKit.xcscheme
@@ -78,7 +78,7 @@
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "FB_REFERENCE_IMAGE_DIR"
-            value = "$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages"
+            value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>

diff --git a/...StackLayoutSpecSnapshotTests/[email protected] b/...StackLayoutSpecSnapshotTests/[email protected]
diff --git a/.../ASStackLayoutSpecSnapshotTests/[email protected] b/.../ASStackLayoutSpecSnapshotTests/[email protected]
diff --git a/...LayoutSpecSnapshotTests/[email protected] b/...LayoutSpecSnapshotTests/[email protected]
diff --git a/...ayoutSpecSnapshotTests/[email protected] b/...ayoutSpecSnapshotTests/[email protected]
diff --git a/...SStackLayoutSpecSnapshotTests/[email protected] b/...SStackLayoutSpecSnapshotTests/[email protected]
diff --git a/...tackLayoutSpecSnapshotTests/[email protected] b/...tackLayoutSpecSnapshotTests/[email protected]
diff --git a/...ASStackLayoutSpecSnapshotTests/[email protected] b/...ASStackLayoutSpecSnapshotTests/[email protected]
diff --git a/...ayoutSpecSnapshotTests/[email protected] b/...ayoutSpecSnapshotTests/[email protected]
diff --git a/...youtSpecSnapshotTests/[email protected] b/...youtSpecSnapshotTests/[email protected]
diff --git a/...StackLayoutSpecSnapshotTests/[email protected] b/...StackLayoutSpecSnapshotTests/[email protected]
diff --git a/BUCK b/BUCK
@@ -15,21 +15,21 @@ COMMON_LANG_PREPROCESSOR_FLAGS = {
 COMMON_LINKER_FLAGS = ['-ObjC++']
 
 ASYNCDISPLAYKIT_EXPORTED_HEADERS = glob([
-  'AsyncDisplayKit/*.h',
-  'AsyncDisplayKit/Details/**/*.h',
-  'AsyncDisplayKit/Layout/*.h',
-  'Base/*.h',
-  'AsyncDisplayKit/Debug/ASLayoutElementInspectorNode.h',
+  'Source/*.h',
+  'Source/Details/**/*.h',
+  'Source/Layout/*.h',
+  'Source/Base/*.h',
+  'Source/Debug/AsyncDisplayKit+Debug.h',
   # Most TextKit components are not public because the C++ content
   # in the headers will cause build errors when using
   # `use_frameworks!` on 0.39.0 & Swift 2.1.
   # See https://github.com/facebook/AsyncDisplayKit/issues/1153
-  'AsyncDisplayKit/TextKit/ASTextNodeTypes.h',
-  'AsyncDisplayKit/TextKit/ASTextKitComponents.h'
+  'Source/TextKit/ASTextNodeTypes.h',
+  'Source/TextKit/ASTextKitComponents.h'
 ])
 
 ASYNCDISPLAYKIT_PRIVATE_HEADERS = glob([
-    'AsyncDisplayKit/**/*.h'
+    'Source/**/*.h'
   ],
   excludes = ASYNCDISPLAYKIT_EXPORTED_HEADERS,
 )
@@ -42,14 +42,14 @@ def asyncdisplaykit_library(
 
   apple_library(
     name = name,
-    prefix_header = 'AsyncDisplayKit/AsyncDisplayKit-Prefix.pch',
-    header_path_prefix = 'AsyncDisplayKit',
+    prefix_header = 'Source/AsyncDisplayKit-Prefix.pch',
+    header_path_prefix = 'Source',
     exported_headers = ASYNCDISPLAYKIT_EXPORTED_HEADERS,
     headers = ASYNCDISPLAYKIT_PRIVATE_HEADERS,
     srcs = glob([
-      'AsyncDisplayKit/**/*.m',
-      'AsyncDisplayKit/**/*.mm',
-      'Base/*.m'
+      'Source/**/*.m',
+      'Source/**/*.mm',
+      'Source/Base/*.m'
     ]),
     preprocessor_flags = COMMON_PREPROCESSOR_FLAGS + additional_preprocessor_flags,
     lang_preprocessor_flags = COMMON_LANG_PREPROCESSOR_FLAGS,
@@ -58,12 +58,13 @@ def asyncdisplaykit_library(
       'Photos',
       '-weak_framework',
       'MapKit',
+      '-weak_framework',
+      'AssetsLibrary',
     ],
     deps = deps,
     frameworks = [
       '$SDKROOT/System/Library/Frameworks/Foundation.framework',
       '$SDKROOT/System/Library/Frameworks/UIKit.framework',
-      '$SDKROOT/System/Library/Frameworks/AssetsLibrary.framework',
 
       '$SDKROOT/System/Library/Frameworks/QuartzCore.framework',
       '$SDKROOT/System/Library/Frameworks/CoreMedia.framework',
@@ -109,7 +110,7 @@ apple_bundle(
   name = 'TestHost',
   binary = ':TestHostBinary',
   extension = 'app',
-  info_plist = 'AsyncDisplayKitTestHost/Info.plist',
+  info_plist = 'Tests/TestHost/Info.plist',
   info_plist_substitutions = {
     'PRODUCT_BUNDLE_IDENTIFIER': 'com.facebook.AsyncDisplayKitTestHost',
   },
@@ -118,10 +119,10 @@ apple_bundle(
 
 apple_binary(
   name = 'TestHostBinary',
-  headers = glob(['AsyncDisplayKitTestHost/*.h']),
+  headers = glob(['Tests/TestHost/*.h']),
   srcs = glob([
-    'AsyncDisplayKitTestHost/*.m',
-    'AsyncDisplayKitTestHost/*.mm',
+    'Tests/TestHost/*.m',
+    'Tests/TestHost/*.mm',
   ]),
   lang_preprocessor_flags = COMMON_LANG_PREPROCESSOR_FLAGS,
   linker_flags = COMMON_LINKER_FLAGS,
@@ -145,30 +146,30 @@ apple_package(
 #####################################
 apple_resource(
   name = 'TestsResources',
-  files = ['AsyncDisplayKitTests/en.lproj/InfoPlist.strings'],
-  dirs = ['AsyncDisplayKitTests/TestResources'],
+  files = ['Tests/en.lproj/InfoPlist.strings'],
+  dirs = ['Tests/TestResources'],
 )
 
 apple_test(
   name = 'Tests',
   test_host_app = ':TestHost',
-  info_plist = 'AsyncDisplayKitTests/AsyncDisplayKitTests-Info.plist',
+  info_plist = 'Tests/AsyncDisplayKitTests-Info.plist',
   info_plist_substitutions = {
     'PRODUCT_BUNDLE_IDENTIFIER': 'com.facebook.AsyncDisplayKitTests',
   },
-  prefix_header = 'AsyncDisplayKitTests/AsyncDisplayKitTests-Prefix.pch',
+  prefix_header = 'Tests/AsyncDisplayKitTests-Prefix.pch',
   # Expose all ASDK headers to tests
   headers = ASYNCDISPLAYKIT_EXPORTED_HEADERS + ASYNCDISPLAYKIT_PRIVATE_HEADERS + glob([
-    'AsyncDisplayKitTests/*.h',
+    'Tests/*.h',
   ]),
   srcs = glob([
-      'AsyncDisplayKitTests/*.m',
-      'AsyncDisplayKitTests/*.mm'
+      'Tests/*.m',
+      'Tests/*.mm'
     ],
     # ASTextNodePerformanceTests are excluded (#2173)
-    excludes = ['AsyncDisplayKitTests/ASTextNodePerformanceTests.m*']
+    excludes = ['Tests/ASTextNodePerformanceTests.m*']
   ),
-  snapshot_reference_images_path='AsyncDisplayKitTests/ReferenceImages',
+  snapshot_reference_images_path='Tests/ReferenceImages',
   preprocessor_flags = COMMON_PREPROCESSOR_FLAGS + [
     '-Wno-implicit-function-declaration',
   ],

diff --git a/[email protected] b/[email protected]
diff --git a/AsyncDisplayKit/ASBlockTypes.h → Source/ASBlockTypes.h b/AsyncDisplayKit/ASBlockTypes.h → Source/ASBlockTypes.h
diff --git a/AsyncDisplayKit/ASButtonNode.h → Source/ASButtonNode.h b/AsyncDisplayKit/ASButtonNode.h → Source/ASButtonNode.h
diff --git a/AsyncDisplayKit/ASButtonNode.mm → Source/ASButtonNode.mm b/AsyncDisplayKit/ASButtonNode.mm → Source/ASButtonNode.mm
diff --git a/AsyncDisplayKit/ASCellNode.h → Source/ASCellNode.h b/AsyncDisplayKit/ASCellNode.h → Source/ASCellNode.h
diff --git a/AsyncDisplayKit/ASCellNode.mm → Source/ASCellNode.mm b/AsyncDisplayKit/ASCellNode.mm → Source/ASCellNode.mm
diff --git a/AsyncDisplayKit/ASCollectionNode+Beta.h → Source/ASCollectionNode+Beta.h b/AsyncDisplayKit/ASCollectionNode+Beta.h → Source/ASCollectionNode+Beta.h
diff --git a/AsyncDisplayKit/ASCollectionNode.h → Source/ASCollectionNode.h b/AsyncDisplayKit/ASCollectionNode.h → Source/ASCollectionNode.h
@@ -14,6 +14,7 @@
 #import <AsyncDisplayKit/ASDisplayNode.h>
 #import <AsyncDisplayKit/ASRangeControllerUpdateRangeProtocol+Beta.h>
 #import <AsyncDisplayKit/ASCollectionView.h>
+#import <AsyncDisplayKit/ASBlockTypes.h>
 
 @protocol ASCollectionViewLayoutFacilitatorProtocol;
 @protocol ASCollectionDelegate;

diff --git a/AsyncDisplayKit/ASCollectionNode.mm → Source/ASCollectionNode.mm b/AsyncDisplayKit/ASCollectionNode.mm → Source/ASCollectionNode.mm
@@ -26,6 +26,7 @@
 #import <AsyncDisplayKit/ASDataController.h>
 #import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
 #import <AsyncDisplayKit/ASThread.h>
+#import <AsyncDisplayKit/ASRangeController.h>
 
 #pragma mark - _ASCollectionPendingState
 
@@ -44,7 +45,7 @@ - (instancetype)init
 {
   self = [super init];
   if (self) {
-    _rangeMode = ASLayoutRangeModeCount;
+    _rangeMode = ASLayoutRangeModeUnspecified;
     _allowsSelection = YES;
     _allowsMultipleSelection = NO;
     _inverted = NO;
@@ -64,7 +65,7 @@ - (instancetype)init
   self = [super init];
   if (self) {
     _tuningParameters = std::vector<std::vector<ASRangeTuningParameters>> (ASLayoutRangeModeCount, std::vector<ASRangeTuningParameters> (ASLayoutRangeTypeCount));
-    _rangeMode = ASLayoutRangeModeCount;
+    _rangeMode = ASLayoutRangeModeUnspecified;
   }
   return self;
 }
@@ -158,7 +159,7 @@ - (void)didLoad
     view.allowsSelection         = pendingState.allowsSelection;
     view.allowsMultipleSelection = pendingState.allowsMultipleSelection;
 
-    if (pendingState.rangeMode != ASLayoutRangeModeCount) {
+    if (pendingState.rangeMode != ASLayoutRangeModeUnspecified) {
       [view.rangeController updateCurrentRangeWithMode:pendingState.rangeMode];
     }
   }

diff --git a/AsyncDisplayKit/ASCollectionView.h → Source/ASCollectionView.h b/AsyncDisplayKit/ASCollectionView.h → Source/ASCollectionView.h
@@ -10,10 +10,12 @@
 
 #import <UIKit/UIKit.h>
 
-#import <AsyncDisplayKit/ASRangeController.h>
 #import <AsyncDisplayKit/ASCollectionViewProtocols.h>
 #import <AsyncDisplayKit/ASBaseDefines.h>
 #import <AsyncDisplayKit/ASBatchContext.h>
+#import <AsyncDisplayKit/ASDimension.h>
+#import <AsyncDisplayKit/ASLayoutRangeType.h>
+#import <AsyncDisplayKit/ASScrollDirection.h>
 
 @class ASCellNode;
 @class ASCollectionNode;

diff --git a/AsyncDisplayKit/ASCollectionView.mm → Source/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm → Source/ASCollectionView.mm
diff --git a/...CollectionViewLayoutFacilitatorProtocol.h → ...CollectionViewLayoutFacilitatorProtocol.h b/...CollectionViewLayoutFacilitatorProtocol.h → ...CollectionViewLayoutFacilitatorProtocol.h
diff --git a/AsyncDisplayKit/ASCollectionViewProtocols.h → Source/ASCollectionViewProtocols.h b/AsyncDisplayKit/ASCollectionViewProtocols.h → Source/ASCollectionViewProtocols.h
diff --git a/AsyncDisplayKit/ASContextTransitioning.h → Source/ASContextTransitioning.h b/AsyncDisplayKit/ASContextTransitioning.h → Source/ASContextTransitioning.h
diff --git a/AsyncDisplayKit/ASControlNode+Subclasses.h → Source/ASControlNode+Subclasses.h b/AsyncDisplayKit/ASControlNode+Subclasses.h → Source/ASControlNode+Subclasses.h
diff --git a/AsyncDisplayKit/ASControlNode.h → Source/ASControlNode.h b/AsyncDisplayKit/ASControlNode.h → Source/ASControlNode.h
diff --git a/AsyncDisplayKit/ASControlNode.mm → Source/ASControlNode.mm b/AsyncDisplayKit/ASControlNode.mm → Source/ASControlNode.mm
diff --git a/AsyncDisplayKit/ASDisplayNode+Beta.h → Source/ASDisplayNode+Beta.h b/AsyncDisplayKit/ASDisplayNode+Beta.h → Source/ASDisplayNode+Beta.h
diff --git a/AsyncDisplayKit/ASDisplayNode+Deprecated.h → Source/ASDisplayNode+Deprecated.h b/AsyncDisplayKit/ASDisplayNode+Deprecated.h → Source/ASDisplayNode+Deprecated.h
diff --git a/AsyncDisplayKit/ASDisplayNode+Subclasses.h → Source/ASDisplayNode+Subclasses.h b/AsyncDisplayKit/ASDisplayNode+Subclasses.h → Source/ASDisplayNode+Subclasses.h
diff --git a/AsyncDisplayKit/ASDisplayNode+Yoga.mm → Source/ASDisplayNode+Yoga.mm b/AsyncDisplayKit/ASDisplayNode+Yoga.mm → Source/ASDisplayNode+Yoga.mm
diff --git a/AsyncDisplayKit/ASDisplayNode.h → Source/ASDisplayNode.h b/AsyncDisplayKit/ASDisplayNode.h → Source/ASDisplayNode.h
diff --git a/AsyncDisplayKit/ASDisplayNode.mm → Source/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm → Source/ASDisplayNode.mm
diff --git a/AsyncDisplayKit/ASDisplayNodeExtras.h → Source/ASDisplayNodeExtras.h b/AsyncDisplayKit/ASDisplayNodeExtras.h → Source/ASDisplayNodeExtras.h
diff --git a/AsyncDisplayKit/ASDisplayNodeExtras.mm → Source/ASDisplayNodeExtras.mm b/AsyncDisplayKit/ASDisplayNodeExtras.mm → Source/ASDisplayNodeExtras.mm
diff --git a/AsyncDisplayKit/ASEditableTextNode.h → Source/ASEditableTextNode.h b/AsyncDisplayKit/ASEditableTextNode.h → Source/ASEditableTextNode.h
diff --git a/AsyncDisplayKit/ASEditableTextNode.mm → Source/ASEditableTextNode.mm b/AsyncDisplayKit/ASEditableTextNode.mm → Source/ASEditableTextNode.mm
diff --git a/...layKit/ASIGListKitMethodImplementations.h → Source/ASIGListKitMethodImplementations.h b/...layKit/ASIGListKitMethodImplementations.h → Source/ASIGListKitMethodImplementations.h
diff --git a/AsyncDisplayKit/ASImageNode+AnimatedImage.mm → Source/ASImageNode+AnimatedImage.mm b/AsyncDisplayKit/ASImageNode+AnimatedImage.mm → Source/ASImageNode+AnimatedImage.mm
diff --git a/AsyncDisplayKit/ASImageNode.h → Source/ASImageNode.h b/AsyncDisplayKit/ASImageNode.h → Source/ASImageNode.h
diff --git a/AsyncDisplayKit/ASImageNode.mm → Source/ASImageNode.mm b/AsyncDisplayKit/ASImageNode.mm → Source/ASImageNode.mm
diff --git a/AsyncDisplayKit/ASMapNode.h → Source/ASMapNode.h b/AsyncDisplayKit/ASMapNode.h → Source/ASMapNode.h
diff --git a/AsyncDisplayKit/ASMapNode.mm → Source/ASMapNode.mm b/AsyncDisplayKit/ASMapNode.mm → Source/ASMapNode.mm
diff --git a/AsyncDisplayKit/ASMultiplexImageNode.h → Source/ASMultiplexImageNode.h b/AsyncDisplayKit/ASMultiplexImageNode.h → Source/ASMultiplexImageNode.h
diff --git a/AsyncDisplayKit/ASMultiplexImageNode.mm → Source/ASMultiplexImageNode.mm b/AsyncDisplayKit/ASMultiplexImageNode.mm → Source/ASMultiplexImageNode.mm
diff --git a/AsyncDisplayKit/ASNavigationController.h → Source/ASNavigationController.h b/AsyncDisplayKit/ASNavigationController.h → Source/ASNavigationController.h
diff --git a/AsyncDisplayKit/ASNavigationController.m → Source/ASNavigationController.m b/AsyncDisplayKit/ASNavigationController.m → Source/ASNavigationController.m
diff --git a/AsyncDisplayKit/ASNetworkImageNode.h → Source/ASNetworkImageNode.h b/AsyncDisplayKit/ASNetworkImageNode.h → Source/ASNetworkImageNode.h
diff --git a/AsyncDisplayKit/ASNetworkImageNode.mm → Source/ASNetworkImageNode.mm b/AsyncDisplayKit/ASNetworkImageNode.mm → Source/ASNetworkImageNode.mm
diff --git a/AsyncDisplayKit/ASNodeController+Beta.h → Source/ASNodeController+Beta.h b/AsyncDisplayKit/ASNodeController+Beta.h → Source/ASNodeController+Beta.h
diff --git a/AsyncDisplayKit/ASNodeController+Beta.m → Source/ASNodeController+Beta.m b/AsyncDisplayKit/ASNodeController+Beta.m → Source/ASNodeController+Beta.m
diff --git a/AsyncDisplayKit/ASPagerFlowLayout.h → Source/ASPagerFlowLayout.h b/AsyncDisplayKit/ASPagerFlowLayout.h → Source/ASPagerFlowLayout.h
diff --git a/AsyncDisplayKit/ASPagerFlowLayout.m → Source/ASPagerFlowLayout.m b/AsyncDisplayKit/ASPagerFlowLayout.m → Source/ASPagerFlowLayout.m
diff --git a/AsyncDisplayKit/ASPagerNode.h → Source/ASPagerNode.h b/AsyncDisplayKit/ASPagerNode.h → Source/ASPagerNode.h
diff --git a/AsyncDisplayKit/ASPagerNode.m → Source/ASPagerNode.m b/AsyncDisplayKit/ASPagerNode.m → Source/ASPagerNode.m
diff --git a/AsyncDisplayKit/ASRunLoopQueue.h → Source/ASRunLoopQueue.h b/AsyncDisplayKit/ASRunLoopQueue.h → Source/ASRunLoopQueue.h
diff --git a/AsyncDisplayKit/ASRunLoopQueue.mm → Source/ASRunLoopQueue.mm b/AsyncDisplayKit/ASRunLoopQueue.mm → Source/ASRunLoopQueue.mm
diff --git a/AsyncDisplayKit/ASScrollNode.h → Source/ASScrollNode.h b/AsyncDisplayKit/ASScrollNode.h → Source/ASScrollNode.h
diff --git a/AsyncDisplayKit/ASScrollNode.mm → Source/ASScrollNode.mm b/AsyncDisplayKit/ASScrollNode.mm → Source/ASScrollNode.mm
diff --git a/AsyncDisplayKit/ASSectionController.h → Source/ASSectionController.h b/AsyncDisplayKit/ASSectionController.h → Source/ASSectionController.h
diff --git a/AsyncDisplayKit/ASSupplementaryNodeSource.h → Source/ASSupplementaryNodeSource.h b/AsyncDisplayKit/ASSupplementaryNodeSource.h → Source/ASSupplementaryNodeSource.h
diff --git a/AsyncDisplayKit/ASTabBarController.h → Source/ASTabBarController.h b/AsyncDisplayKit/ASTabBarController.h → Source/ASTabBarController.h
diff --git a/AsyncDisplayKit/ASTabBarController.m → Source/ASTabBarController.m b/AsyncDisplayKit/ASTabBarController.m → Source/ASTabBarController.m
diff --git a/AsyncDisplayKit/ASTableNode.h → Source/ASTableNode.h b/AsyncDisplayKit/ASTableNode.h → Source/ASTableNode.h
diff --git a/AsyncDisplayKit/ASTableNode.mm → Source/ASTableNode.mm b/AsyncDisplayKit/ASTableNode.mm → Source/ASTableNode.mm
@@ -22,6 +22,7 @@
 #import <AsyncDisplayKit/ASTableView+Undeprecated.h>
 #import <AsyncDisplayKit/ASThread.h>
 #import <AsyncDisplayKit/ASDisplayNode+Beta.h>
+#import <AsyncDisplayKit/ASRangeController.h>
 
 #pragma mark - _ASTablePendingState
 
@@ -41,7 +42,7 @@ - (instancetype)init
 {
   self = [super init];
   if (self) {
-    _rangeMode = ASLayoutRangeModeCount;
+    _rangeMode = ASLayoutRangeModeUnspecified;
     _allowsSelection = YES;
     _allowsSelectionDuringEditing = NO;
     _allowsMultipleSelection = NO;
@@ -126,7 +127,7 @@ - (void)didLoad
     view.allowsSelectionDuringEditing = pendingState.allowsSelectionDuringEditing;
     view.allowsMultipleSelection = pendingState.allowsMultipleSelection;
     view.allowsMultipleSelectionDuringEditing = pendingState.allowsMultipleSelectionDuringEditing;
-    if (pendingState.rangeMode != ASLayoutRangeModeCount) {
+    if (pendingState.rangeMode != ASLayoutRangeModeUnspecified) {
       [view.rangeController updateCurrentRangeWithMode:pendingState.rangeMode];
     }
   }

diff --git a/AsyncDisplayKit/ASTableView.h → Source/ASTableView.h b/AsyncDisplayKit/ASTableView.h → Source/ASTableView.h
@@ -11,7 +11,6 @@
 #import <UIKit/UIKit.h>
 
 #import <AsyncDisplayKit/ASBaseDefines.h>
-#import <AsyncDisplayKit/ASLayoutController.h>
 #import <AsyncDisplayKit/ASLayoutRangeType.h>
 #import <AsyncDisplayKit/ASTableViewProtocols.h>
 

diff --git a/AsyncDisplayKit/ASTableView.mm → Source/ASTableView.mm b/AsyncDisplayKit/ASTableView.mm → Source/ASTableView.mm
diff --git a/AsyncDisplayKit/ASTableViewInternal.h → Source/ASTableViewInternal.h b/AsyncDisplayKit/ASTableViewInternal.h → Source/ASTableViewInternal.h
diff --git a/AsyncDisplayKit/ASTableViewProtocols.h → Source/ASTableViewProtocols.h b/AsyncDisplayKit/ASTableViewProtocols.h → Source/ASTableViewProtocols.h
diff --git a/AsyncDisplayKit/ASTextNode+Beta.h → Source/ASTextNode+Beta.h b/AsyncDisplayKit/ASTextNode+Beta.h → Source/ASTextNode+Beta.h
diff --git a/AsyncDisplayKit/ASTextNode.h → Source/ASTextNode.h b/AsyncDisplayKit/ASTextNode.h → Source/ASTextNode.h
diff --git a/AsyncDisplayKit/ASTextNode.mm → Source/ASTextNode.mm b/AsyncDisplayKit/ASTextNode.mm → Source/ASTextNode.mm
diff --git a/AsyncDisplayKit/ASVideoNode.h → Source/ASVideoNode.h b/AsyncDisplayKit/ASVideoNode.h → Source/ASVideoNode.h
diff --git a/AsyncDisplayKit/ASVideoNode.mm → Source/ASVideoNode.mm b/AsyncDisplayKit/ASVideoNode.mm → Source/ASVideoNode.mm
diff --git a/AsyncDisplayKit/ASVideoPlayerNode.h → Source/ASVideoPlayerNode.h b/AsyncDisplayKit/ASVideoPlayerNode.h → Source/ASVideoPlayerNode.h
diff --git a/AsyncDisplayKit/ASVideoPlayerNode.mm → Source/ASVideoPlayerNode.mm b/AsyncDisplayKit/ASVideoPlayerNode.mm → Source/ASVideoPlayerNode.mm
diff --git a/AsyncDisplayKit/ASViewController.h → Source/ASViewController.h b/AsyncDisplayKit/ASViewController.h → Source/ASViewController.h
diff --git a/AsyncDisplayKit/ASViewController.mm → Source/ASViewController.mm b/AsyncDisplayKit/ASViewController.mm → Source/ASViewController.mm
diff --git a/AsyncDisplayKit/ASVisibilityProtocols.h → Source/ASVisibilityProtocols.h b/AsyncDisplayKit/ASVisibilityProtocols.h → Source/ASVisibilityProtocols.h
diff --git a/AsyncDisplayKit/ASVisibilityProtocols.m → Source/ASVisibilityProtocols.m b/AsyncDisplayKit/ASVisibilityProtocols.m → Source/ASVisibilityProtocols.m
diff --git a/AsyncDisplayKit/AsyncDisplayKit-Prefix.pch → Source/AsyncDisplayKit-Prefix.pch b/AsyncDisplayKit/AsyncDisplayKit-Prefix.pch → Source/AsyncDisplayKit-Prefix.pch
diff --git a/AsyncDisplayKit/AsyncDisplayKit.h → Source/AsyncDisplayKit.h b/AsyncDisplayKit/AsyncDisplayKit.h → Source/AsyncDisplayKit.h
@@ -82,7 +82,6 @@
 #import <AsyncDisplayKit/ASTextNodeTypes.h>
 #import <AsyncDisplayKit/ASAvailability.h>
 #import <AsyncDisplayKit/ASBlockTypes.h>
-#import <AsyncDisplayKit/ASCollectionViewLayoutController.h>
 #import <AsyncDisplayKit/ASContextTransitioning.h>
 #import <AsyncDisplayKit/ASControlNode+Subclasses.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>

diff --git a/Base/ASAssert.h → Source/Base/ASAssert.h b/Base/ASAssert.h → Source/Base/ASAssert.h
diff --git a/Base/ASAvailability.h → Source/Base/ASAvailability.h b/Base/ASAvailability.h → Source/Base/ASAvailability.h
diff --git a/Base/ASBaseDefines.h → Source/Base/ASBaseDefines.h b/Base/ASBaseDefines.h → Source/Base/ASBaseDefines.h
diff --git a/Base/ASEqualityHelpers.h → Source/Base/ASEqualityHelpers.h b/Base/ASEqualityHelpers.h → Source/Base/ASEqualityHelpers.h
diff --git a/Base/ASLog.h → Source/Base/ASLog.h b/Base/ASLog.h → Source/Base/ASLog.h
diff --git a/AsyncDisplayKit/AsyncDisplayKit+Debug.h → Source/Debug/AsyncDisplayKit+Debug.h b/AsyncDisplayKit/AsyncDisplayKit+Debug.h → Source/Debug/AsyncDisplayKit+Debug.h
@@ -10,10 +10,8 @@
 //  of patent rights can be found in the PATENTS file in the same directory.
 //
 
-#import <AsyncDisplayKit/ASDisplayNode.h>
 #import <AsyncDisplayKit/ASControlNode.h>
 #import <AsyncDisplayKit/ASImageNode.h>
-#import <AsyncDisplayKit/ASRangeController.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -25,8 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
  * as well as upscaling (such as providing a URL not suitable for a Retina device).  For dev purposes only.
  * @param enabled Specify YES to show the label on all ASImageNodes with non-1.0x source-to-bounds pixel ratio.
  */
-+ (void)setShouldShowImageScalingOverlay:(BOOL)show;
-+ (BOOL)shouldShowImageScalingOverlay;
+@property (class, nonatomic) BOOL shouldShowImageScalingOverlay;
 
 @end
 
@@ -41,33 +38,19 @@ NS_ASSUME_NONNULL_BEGIN
  * overlay rect, but can't be visualized).
  * @param enable Specify YES to make this debug feature enabled when messaging the ASControlNode class.
  */
-+ (void)setEnableHitTestDebug:(BOOL)enable;
-+ (BOOL)enableHitTestDebug;
+@property (class, nonatomic) BOOL enableHitTestDebug;
 
 @end
 
-@interface ASRangeController (Debugging)
+@interface ASDisplayNode (RangeDebugging)
 
 /**
- * Class method to enable a visualization overlay of the all ASRangeController's tuning parameters. For dev purposes only.
- * To use, message ASRangeController in the AppDelegate --> [ASRangeController setShouldShowRangeDebugOverlay:YES];
- * @param enable Specify YES to make this debug feature enabled when messaging the ASRangeController class.
+ * Enable a visualization overlay of the all table/collection tuning parameters. For dev purposes only.
+ * To use, set this in the AppDelegate --> ASDisplayNode.shouldShowRangeDebugOverlay = YES
  */
-+ (void)setShouldShowRangeDebugOverlay:(BOOL)show;
-+ (BOOL)shouldShowRangeDebugOverlay;
-
-+ (void)layoutDebugOverlayIfNeeded;
-
-- (void)addRangeControllerToRangeDebugOverlay;
-
-- (void)updateRangeController:(ASRangeController *)controller
-     withScrollableDirections:(ASScrollDirection)scrollableDirections
-              scrollDirection:(ASScrollDirection)direction
-                    rangeMode:(ASLayoutRangeMode)mode
-      displayTuningParameters:(ASRangeTuningParameters)displayTuningParameters
-      preloadTuningParameters:(ASRangeTuningParameters)preloadTuningParameters
-               interfaceState:(ASInterfaceState)interfaceState;
+@property (class, nonatomic) BOOL shouldShowRangeDebugOverlay;
 
 @end
 
+
 NS_ASSUME_NONNULL_END
diff --git a/AsyncDisplayKit/AsyncDisplayKit+Debug.m → Source/Debug/AsyncDisplayKit+Debug.m b/AsyncDisplayKit/AsyncDisplayKit+Debug.m → Source/Debug/AsyncDisplayKit+Debug.m
@@ -241,7 +241,7 @@ - (void)updateWithVisibleRatio:(CGFloat)visibleRatio
 
 static BOOL __shouldShowRangeDebugOverlay = NO;
 
-@implementation ASRangeController (Debugging)
+@implementation ASDisplayNode (RangeDebugging)
 
 + (void)setShouldShowRangeDebugOverlay:(BOOL)show
 {
@@ -253,6 +253,10 @@ + (BOOL)shouldShowRangeDebugOverlay
   return __shouldShowRangeDebugOverlay;
 }
 
+@end
+
+@implementation ASRangeController (DebugInternal)
+
 + (void)layoutDebugOverlayIfNeeded
 {
   [[_ASRangeDebugOverlayView sharedInstance] setNeedsLayout];
@@ -306,7 +310,7 @@ + (instancetype)sharedInstance
 {
   static _ASRangeDebugOverlayView *__rangeDebugOverlay = nil;
 
-  if (!__rangeDebugOverlay && [ASRangeController shouldShowRangeDebugOverlay]) {
+  if (!__rangeDebugOverlay && ASDisplayNode.shouldShowRangeDebugOverlay) {
     __rangeDebugOverlay = [[self alloc] initWithFrame:CGRectZero];
     [[self keyWindow] addSubview:__rangeDebugOverlay];
   }

diff --git a/...yKit/Details/ASAbstractLayoutController.h → Source/Details/ASAbstractLayoutController.h b/...yKit/Details/ASAbstractLayoutController.h → Source/Details/ASAbstractLayoutController.h
@@ -15,10 +15,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 ASDISPLAYNODE_EXTERN_C_BEGIN
 
-FOUNDATION_EXPORT ASRangeTuningParameters const ASRangeTuningParametersZero;
-
-FOUNDATION_EXPORT BOOL ASRangeTuningParametersEqualToRangeTuningParameters(ASRangeTuningParameters lhs, ASRangeTuningParameters rhs);
-
 FOUNDATION_EXPORT ASDirectionalScreenfulBuffer ASDirectionalScreenfulBufferHorizontal(ASScrollDirection scrollDirection, ASRangeTuningParameters rangeTuningParameters);
 
 FOUNDATION_EXPORT ASDirectionalScreenfulBuffer ASDirectionalScreenfulBufferVertical(ASScrollDirection scrollDirection, ASRangeTuningParameters rangeTuningParameters);

diff --git a/...Kit/Details/ASAbstractLayoutController.mm → Source/Details/ASAbstractLayoutController.mm b/...Kit/Details/ASAbstractLayoutController.mm → Source/Details/ASAbstractLayoutController.mm
diff --git a/...splayKit/Details/ASBasicImageDownloader.h → Source/Details/ASBasicImageDownloader.h b/...splayKit/Details/ASBasicImageDownloader.h → Source/Details/ASBasicImageDownloader.h
diff --git a/...playKit/Details/ASBasicImageDownloader.mm → Source/Details/ASBasicImageDownloader.mm b/...playKit/Details/ASBasicImageDownloader.mm → Source/Details/ASBasicImageDownloader.mm
diff --git a/AsyncDisplayKit/Details/ASBatchContext.h → Source/Details/ASBatchContext.h b/AsyncDisplayKit/Details/ASBatchContext.h → Source/Details/ASBatchContext.h
diff --git a/AsyncDisplayKit/Details/ASBatchContext.mm → Source/Details/ASBatchContext.mm b/AsyncDisplayKit/Details/ASBatchContext.mm → Source/Details/ASBatchContext.mm
diff --git a/...cDisplayKit/Details/ASCollectionElement.h → Source/Details/ASCollectionElement.h b/...cDisplayKit/Details/ASCollectionElement.h → Source/Details/ASCollectionElement.h
diff --git a/...DisplayKit/Details/ASCollectionElement.mm → Source/Details/ASCollectionElement.mm b/...DisplayKit/Details/ASCollectionElement.mm → Source/Details/ASCollectionElement.mm
diff --git a/...DisplayKit/Details/ASCollectionInternal.h → Source/Details/ASCollectionInternal.h b/...DisplayKit/Details/ASCollectionInternal.h → Source/Details/ASCollectionInternal.h
diff --git a/...DisplayKit/Details/ASCollectionInternal.m → Source/Details/ASCollectionInternal.m b/...DisplayKit/Details/ASCollectionInternal.m → Source/Details/ASCollectionInternal.m
diff --git a/...etails/ASCollectionViewLayoutController.h → ...etails/ASCollectionViewLayoutController.h b/...etails/ASCollectionViewLayoutController.h → ...etails/ASCollectionViewLayoutController.h
@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class ASCollectionView;
 
+AS_SUBCLASSING_RESTRICTED
 @interface ASCollectionViewLayoutController : ASAbstractLayoutController
 
 - (instancetype)initWithCollectionView:(ASCollectionView *)collectionView;

diff --git a/...tails/ASCollectionViewLayoutController.mm → ...tails/ASCollectionViewLayoutController.mm b/...tails/ASCollectionViewLayoutController.mm → ...tails/ASCollectionViewLayoutController.mm
diff --git a/...Details/ASCollectionViewLayoutInspector.h → ...Details/ASCollectionViewLayoutInspector.h b/...Details/ASCollectionViewLayoutInspector.h → ...Details/ASCollectionViewLayoutInspector.h
diff --git a/...Details/ASCollectionViewLayoutInspector.m → ...Details/ASCollectionViewLayoutInspector.m b/...Details/ASCollectionViewLayoutInspector.m → ...Details/ASCollectionViewLayoutInspector.m
diff --git a/AsyncDisplayKit/Details/ASDataController.h → Source/Details/ASDataController.h b/AsyncDisplayKit/Details/ASDataController.h → Source/Details/ASDataController.h
diff --git a/AsyncDisplayKit/Details/ASDataController.mm → Source/Details/ASDataController.mm b/AsyncDisplayKit/Details/ASDataController.mm → Source/Details/ASDataController.mm
diff --git a/AsyncDisplayKit/Details/ASDelegateProxy.h → Source/Details/ASDelegateProxy.h b/AsyncDisplayKit/Details/ASDelegateProxy.h → Source/Details/ASDelegateProxy.h
diff --git a/AsyncDisplayKit/Details/ASDelegateProxy.m → Source/Details/ASDelegateProxy.m b/AsyncDisplayKit/Details/ASDelegateProxy.m → Source/Details/ASDelegateProxy.m
diff --git a/AsyncDisplayKit/Details/ASEventLog.h → Source/Details/ASEventLog.h b/AsyncDisplayKit/Details/ASEventLog.h → Source/Details/ASEventLog.h
diff --git a/AsyncDisplayKit/Details/ASEventLog.mm → Source/Details/ASEventLog.mm b/AsyncDisplayKit/Details/ASEventLog.mm → Source/Details/ASEventLog.mm
diff --git a/...playKit/Details/ASHighlightOverlayLayer.h → Source/Details/ASHighlightOverlayLayer.h b/...playKit/Details/ASHighlightOverlayLayer.h → Source/Details/ASHighlightOverlayLayer.h
diff --git a/...layKit/Details/ASHighlightOverlayLayer.mm → Source/Details/ASHighlightOverlayLayer.mm b/...layKit/Details/ASHighlightOverlayLayer.mm → Source/Details/ASHighlightOverlayLayer.mm
diff --git a/...ails/ASImageContainerProtocolCategories.h → ...ails/ASImageContainerProtocolCategories.h b/...ails/ASImageContainerProtocolCategories.h → ...ails/ASImageContainerProtocolCategories.h
diff --git a/...ails/ASImageContainerProtocolCategories.m → ...ails/ASImageContainerProtocolCategories.m b/...ails/ASImageContainerProtocolCategories.m → ...ails/ASImageContainerProtocolCategories.m
diff --git a/AsyncDisplayKit/Details/ASImageProtocols.h → Source/Details/ASImageProtocols.h b/AsyncDisplayKit/Details/ASImageProtocols.h → Source/Details/ASImageProtocols.h
diff --git a/AsyncDisplayKit/Details/ASLayoutController.h → Source/Details/ASLayoutController.h b/AsyncDisplayKit/Details/ASLayoutController.h → Source/Details/ASLayoutController.h
@@ -20,11 +20,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 ASDISPLAYNODE_EXTERN_C_BEGIN
 
-typedef struct {
-  CGFloat leadingBufferScreenfuls;
-  CGFloat trailingBufferScreenfuls;
-} ASRangeTuningParameters;
-
 struct ASDirectionalScreenfulBuffer {
   CGFloat positiveDirection; // Positive relative to iOS Core Animation layer coordinate space.
   CGFloat negativeDirection;