Gotta have this

Fix imports

.gitignore

@@ -22,3 +22,4 @@ Podfile.lock
 IDEWorkspaceChecks.plist
 *.xcworkspace
 .build
+bazel-*

BUILD.bazel

@@ -0,0 +1,51 @@
+FLEX_PUBLIC_HDRS = glob([
+        "Classes/*.h",
+        "Classes/Manager/*.h",
+        "Classes/Toolbar/*.h",
+        "Classes/Core/**/*.h",
+        "Classes/Utility/Runtime/Objc/**/*.h",
+        "Classes/Utility/Runtime/Objc/*.h",
+        "Classes/ObjectExplorers/**/*.h",
+        "Classes/Editing/**/*.h",
+        "Classes/GlobalStateExplorers/**/*.h",
+        "Classes/Utility/Categories/*.h",
+    ], [
+        "**/FLEX.h"
+    ], allow_empty = False
+) + [
+    "Classes/Utility/FLEXMacros.h",
+    "Classes/Utility/FLEXAlert.h",
+    "Classes/Utility/FLEXResources.h",
+    "Classes/Utility/FLEXHeapEnumerator.h"
+]
+
+objc_library(
+    name = "FLEX",
+    module_name = "FLEX",
+    hdrs = FLEX_PUBLIC_HDRS,
+    srcs = glob([
+        "Classes/**/*.m",
+        "Classes/**/*.mm",
+        "Classes/**/*.c",
+        "Classes/**/*.h"
+    ], FLEX_PUBLIC_HDRS, allow_empty = False),
+    sdk_dylibs = [
+        "libz",
+        "libsqlite3"
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "UIKit",
+        "CoreGraphics",
+        "ImageIO",
+        "QuartzCore",
+        "WebKit",
+        "Security",
+        "SceneKit"
+    ],
+    copts = [
+        "-Wno-deprecated-declarations",
+        "-Wno-unsupported-availability-guard"
+    ],
+    visibility = ["//visibility:public"]
+)

Classes/Core/Controllers/FLEXFilteringTableViewController.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableViewController.h"
+#import "Classes/Headers/FLEXTableViewController.h"
 
 #pragma mark - FLEXTableViewFiltering
 @protocol FLEXTableViewFiltering <FLEXSearchResultsUpdating>

Classes/Core/Controllers/FLEXFilteringTableViewController.m

@@ -6,10 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXFilteringTableViewController.h"
-#import "FLEXTableViewSection.h"
-#import "NSArray+FLEX.h"
-#import "FLEXMacros.h"
+#import "Classes/Headers/FLEXFilteringTableViewController.h"
+#import "Classes/Headers/FLEXTableViewSection.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/Utility/FLEXMacros.h"
 
 @interface FLEXFilteringTableViewController ()
 

Classes/Core/Controllers/FLEXNavigationController.m

@@ -6,10 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXNavigationController.h"
-#import "FLEXExplorerViewController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXTabList.h"
+#import "Classes/Headers/FLEXNavigationController.h"
+#import "Classes/ExplorerInterface/FLEXExplorerViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabList.h"
 
 @interface UINavigationController (Private) <UIGestureRecognizerDelegate>
 - (void)_gestureRecognizedInteractiveHide:(UIGestureRecognizer *)sender;
@@ -29,7 +29,8 @@
 @implementation FLEXNavigationController
 
 + (instancetype)withRootViewController:(UIViewController *)rootVC {
-    return [[self alloc] initWithRootViewController:rootVC];
+    FLEXNavigationController *nav = [[self alloc] initWithRootViewController:rootVC];
+    return nav;
 }
 
 - (void)viewDidLoad {
@@ -66,6 +67,17 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     
+    if (@available(iOS 15.0, *)) {
+        UISheetPresentationController *presenter = self.sheetPresentationController;
+        presenter.detents = @[
+            UISheetPresentationControllerDetent.mediumDetent,
+            UISheetPresentationControllerDetent.largeDetent,
+        ];
+        presenter.prefersScrollingExpandsWhenScrolledToEdge = NO;
+        presenter.selectedDetentIdentifier = UISheetPresentationControllerDetentIdentifierLarge;
+        presenter.largestUndimmedDetentIdentifier = UISheetPresentationControllerDetentIdentifierLarge;
+    }
+    
     if (self.beingPresented && !self.didSetupPendingDismissButtons) {
         for (UIViewController *vc in self.viewControllers) {
             [self addNavigationBarItemsToViewController:vc.navigationItem];

Classes/Core/Controllers/FLEXTableViewController.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "FLEXTableView.h"
+#import "Classes/Headers/FLEXTableView.h"
 @class FLEXScopeCarousel, FLEXWindow, FLEXTableViewSection;
 
 typedef CGFloat FLEXDebounceInterval;

Classes/Core/Controllers/FLEXTableViewController.m

@@ -6,15 +6,15 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableViewController.h"
-#import "FLEXExplorerViewController.h"
-#import "FLEXBookmarksViewController.h"
-#import "FLEXTabsViewController.h"
-#import "FLEXScopeCarousel.h"
-#import "FLEXTableView.h"
-#import "FLEXUtility.h"
-#import "FLEXResources.h"
-#import "UIBarButtonItem+FLEX.h"
+#import "Classes/Headers/FLEXTableViewController.h"
+#import "Classes/ExplorerInterface/FLEXExplorerViewController.h"
+#import "Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabsViewController.h"
+#import "Classes/Core/Views/Carousel/FLEXScopeCarousel.h"
+#import "Classes/Headers/FLEXTableView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/FLEXResources.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
 #import <objc/runtime.h>
 
 @interface Block : NSObject

Classes/Core/FLEXSingleRowSection.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableViewSection.h"
+#import "Classes/Headers/FLEXTableViewSection.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Classes/Core/FLEXSingleRowSection.m

@@ -6,8 +6,8 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXSingleRowSection.h"
-#import "FLEXTableView.h"
+#import "Classes/Headers/FLEXSingleRowSection.h"
+#import "Classes/Headers/FLEXTableView.h"
 
 @interface FLEXSingleRowSection ()
 @property (nonatomic, readonly) NSString *reuseIdentifier;

Classes/Core/FLEXTableViewSection.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "NSArray+FLEX.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
 @class FLEXTableView;
 
 NS_ASSUME_NONNULL_BEGIN

Classes/Core/FLEXTableViewSection.m

@@ -6,10 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableViewSection.h"
-#import "FLEXTableView.h"
-#import "FLEXUtility.h"
-#import "UIMenu+FLEX.h"
+#import "Classes/Headers/FLEXTableViewSection.h"
+#import "Classes/Headers/FLEXTableView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/Categories/UIMenu+FLEX.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wincomplete-implementation"

Classes/Core/Views/Carousel/FLEXCarouselCell.m

@@ -6,9 +6,9 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXCarouselCell.h"
-#import "FLEXColor.h"
-#import "UIView+FLEX_Layout.h"
+#import "Classes/Core/Views/Carousel/FLEXCarouselCell.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Utility/Categories/Private/UIView+FLEX_Layout.h"
 
 @interface FLEXCarouselCell ()
 @property (nonatomic, readonly) UILabel *titleLabel;

Classes/Core/Views/Carousel/FLEXScopeCarousel.m

@@ -6,11 +6,11 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXScopeCarousel.h"
-#import "FLEXCarouselCell.h"
-#import "FLEXColor.h"
-#import "FLEXMacros.h"
-#import "UIView+FLEX_Layout.h"
+#import "Classes/Core/Views/Carousel/FLEXScopeCarousel.h"
+#import "Classes/Core/Views/Carousel/FLEXCarouselCell.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Utility/FLEXMacros.h"
+#import "Classes/Utility/Categories/Private/UIView+FLEX_Layout.h"
 
 const CGFloat kCarouselItemSpacing = 0;
 NSString * const kCarouselCellReuseIdentifier = @"kCarouselCellReuseIdentifier";

Classes/Core/Views/Cells/FLEXCodeFontCell.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXMultilineTableViewCell.h"
+#import "Classes/Headers/FLEXMultilineTableViewCell.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Classes/Core/Views/Cells/FLEXCodeFontCell.m

@@ -6,8 +6,8 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXCodeFontCell.h"
-#import "UIFont+FLEX.h"
+#import "Classes/Headers/FLEXCodeFontCell.h"
+#import "Classes/Utility/Categories/UIFont+FLEX.h"
 
 @implementation FLEXCodeFontCell
 

Classes/Core/Views/Cells/FLEXKeyValueTableViewCell.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableViewCell.h"
+#import "Classes/Headers/FLEXTableViewCell.h"
 
 @interface FLEXKeyValueTableViewCell : FLEXTableViewCell
 

Classes/Core/Views/Cells/FLEXKeyValueTableViewCell.m

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXKeyValueTableViewCell.h"
+#import "Classes/Headers/FLEXKeyValueTableViewCell.h"
 
 @implementation FLEXKeyValueTableViewCell
 

Classes/Core/Views/Cells/FLEXMultilineTableViewCell.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableViewCell.h"
+#import "Classes/Headers/FLEXTableViewCell.h"
 
 /// A cell with both labels set to be multi-line capable.
 @interface FLEXMultilineTableViewCell : FLEXTableViewCell

Classes/Core/Views/Cells/FLEXMultilineTableViewCell.m

@@ -6,9 +6,9 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXMultilineTableViewCell.h"
-#import "UIView+FLEX_Layout.h"
-#import "FLEXUtility.h"
+#import "Classes/Headers/FLEXMultilineTableViewCell.h"
+#import "Classes/Utility/Categories/Private/UIView+FLEX_Layout.h"
+#import "Classes/Utility/FLEXUtility.h"
 
 @interface FLEXMultilineTableViewCell ()
 @property (nonatomic, readonly) UILabel *_titleLabel;

Classes/Core/Views/Cells/FLEXSubtitleTableViewCell.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableViewCell.h"
+#import "Classes/Headers/FLEXTableViewCell.h"
 
 /// A cell initialized with \c UITableViewCellStyleSubtitle
 @interface FLEXSubtitleTableViewCell : FLEXTableViewCell

Classes/Core/Views/Cells/FLEXSubtitleTableViewCell.m

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXSubtitleTableViewCell.h"
+#import "Classes/Headers/FLEXSubtitleTableViewCell.h"
 
 @implementation FLEXSubtitleTableViewCell
 

Classes/Core/Views/Cells/FLEXTableViewCell.m

@@ -6,10 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableViewCell.h"
-#import "FLEXUtility.h"
-#import "FLEXColor.h"
-#import "FLEXTableView.h"
+#import "Classes/Headers/FLEXTableViewCell.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Headers/FLEXTableView.h"
 
 @interface UITableView (Internal)
 // Exists at least since iOS 5

Classes/Core/Views/FLEXTableView.m

@@ -6,12 +6,12 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableView.h"
-#import "FLEXUtility.h"
-#import "FLEXSubtitleTableViewCell.h"
-#import "FLEXMultilineTableViewCell.h"
-#import "FLEXKeyValueTableViewCell.h"
-#import "FLEXCodeFontCell.h"
+#import "Classes/Headers/FLEXTableView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Headers/FLEXSubtitleTableViewCell.h"
+#import "Classes/Headers/FLEXMultilineTableViewCell.h"
+#import "Classes/Headers/FLEXKeyValueTableViewCell.h"
+#import "Classes/Headers/FLEXCodeFontCell.h"
 
 FLEXTableViewCellReuseIdentifier const kFLEXDefaultCell = @"kFLEXDefaultCell";
 FLEXTableViewCellReuseIdentifier const kFLEXDetailCell = @"kFLEXDetailCell";

Classes/Editing/ArgumentInputViews/FLEXArgumentInputColorView.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
 
 @interface FLEXArgumentInputColorView : FLEXArgumentInputView
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputColorView.m

@@ -6,9 +6,9 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputColorView.h"
-#import "FLEXUtility.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputColorView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
 
 @protocol FLEXColorComponentInputViewDelegate;
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputDateView.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
 
 @interface FLEXArgumentInputDateView : FLEXArgumentInputView
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputDateView.m

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputDateView.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputDateView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
 
 @interface FLEXArgumentInputDateView ()
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontView.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
 
 @interface FLEXArgumentInputFontView : FLEXArgumentInputView
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontView.m

@@ -6,10 +6,10 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputFontView.h"
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXArgumentInputFontsPickerView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontView.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontsPickerView.h"
 
 @interface FLEXArgumentInputFontView ()
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontsPickerView.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2014年 f. All rights reserved.
 //
 
-#import "FLEXArgumentInputTextView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h"
 
 @interface FLEXArgumentInputFontsPickerView : FLEXArgumentInputTextView <UIPickerViewDataSource, UIPickerViewDelegate>
 @end

Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontsPickerView.m

@@ -6,8 +6,8 @@
 //  Copyright (c) 2014年 f. All rights reserved.
 //
 
-#import "FLEXArgumentInputFontsPickerView.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontsPickerView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
 
 @interface FLEXArgumentInputFontsPickerView ()
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputNotSupportedView.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputTextView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h"
 
 @interface FLEXArgumentInputNotSupportedView : FLEXArgumentInputTextView
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputNotSupportedView.m

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputNotSupportedView.h"
-#import "FLEXColor.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputNotSupportedView.h"
+#import "Classes/Utility/FLEXColor.h"
 
 @implementation FLEXArgumentInputNotSupportedView
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputNumberView.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputTextView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h"
 
 @interface FLEXArgumentInputNumberView : FLEXArgumentInputTextView
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputNumberView.m

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputNumberView.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputNumberView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
 
 @implementation FLEXArgumentInputNumberView
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputObjectView.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputTextView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h"
 
 @interface FLEXArgumentInputObjectView : FLEXArgumentInputTextView
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputObjectView.m

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputObjectView.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputObjectView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
 
 static const CGFloat kSegmentInputMargin = 10;
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputStringView.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputTextView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h"
 
 @interface FLEXArgumentInputStringView : FLEXArgumentInputTextView
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputStringView.m

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputStringView.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputStringView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
 
 @implementation FLEXArgumentInputStringView
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputStructView.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
 
 @interface FLEXArgumentInputStructView : FLEXArgumentInputView
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputStructView.m

@@ -6,10 +6,10 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputStructView.h"
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXTypeEncodingParser.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputStructView.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Utility/Runtime/Objc/FLEXTypeEncodingParser.h"
 
 @interface FLEXArgumentInputStructView ()
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
 
 @interface FLEXArgumentInputSwitchView : FLEXArgumentInputView
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.m

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputSwitchView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.h"
 
 @interface FLEXArgumentInputSwitchView ()
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h

@@ -6,7 +6,7 @@
 //
 //
 
-#import "FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
 
 @interface FLEXArgumentInputTextView : FLEXArgumentInputView <UITextViewDelegate>
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.m

@@ -6,9 +6,9 @@
 //
 //
 
-#import "FLEXColor.h"
-#import "FLEXArgumentInputTextView.h"
-#import "FLEXUtility.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputTextView.h"
+#import "Classes/Utility/FLEXUtility.h"
 
 @interface FLEXArgumentInputTextView ()
 

Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.m

@@ -6,9 +6,9 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXArgumentInputView.h"
-#import "FLEXUtility.h"
-#import "FLEXColor.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/FLEXColor.h"
 
 @interface FLEXArgumentInputView ()
 

Classes/Editing/FLEXArgumentInputViewFactory.h

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "FLEXArgumentInputSwitchView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.h"
 
 @interface FLEXArgumentInputViewFactory : NSObject
 

Classes/Editing/FLEXArgumentInputViewFactory.m

@@ -6,18 +6,18 @@
 //
 //
 
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXArgumentInputView.h"
-#import "FLEXArgumentInputObjectView.h"
-#import "FLEXArgumentInputNumberView.h"
-#import "FLEXArgumentInputSwitchView.h"
-#import "FLEXArgumentInputStructView.h"
-#import "FLEXArgumentInputNotSupportedView.h"
-#import "FLEXArgumentInputStringView.h"
-#import "FLEXArgumentInputFontView.h"
-#import "FLEXArgumentInputColorView.h"
-#import "FLEXArgumentInputDateView.h"
-#import "FLEXRuntimeUtility.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputObjectView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputNumberView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputSwitchView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputStructView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputNotSupportedView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputStringView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputFontView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputColorView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputDateView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
 
 @implementation FLEXArgumentInputViewFactory
 

Classes/Editing/FLEXDefaultEditorViewController.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXFieldEditorViewController.h"
+#import "Classes/Editing/FLEXFieldEditorViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Classes/Editing/FLEXDefaultEditorViewController.m

@@ -6,11 +6,11 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXDefaultEditorViewController.h"
-#import "FLEXFieldEditorView.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXArgumentInputView.h"
-#import "FLEXArgumentInputViewFactory.h"
+#import "Classes/Editing/FLEXDefaultEditorViewController.h"
+#import "Classes/Editing/FLEXFieldEditorView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
 
 @interface FLEXDefaultEditorViewController ()
 

Classes/Editing/FLEXFieldEditorView.m

@@ -6,10 +6,10 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXFieldEditorView.h"
-#import "FLEXArgumentInputView.h"
-#import "FLEXUtility.h"
-#import "FLEXColor.h"
+#import "Classes/Editing/FLEXFieldEditorView.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/FLEXColor.h"
 
 @interface FLEXFieldEditorView ()
 

Classes/Editing/FLEXFieldEditorViewController.h

@@ -6,9 +6,9 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXVariableEditorViewController.h"
-#import "FLEXProperty.h"
-#import "FLEXIvar.h"
+#import "Classes/Editing/FLEXVariableEditorViewController.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXProperty.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXIvar.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Classes/Editing/FLEXFieldEditorViewController.m

@@ -6,15 +6,15 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXFieldEditorViewController.h"
-#import "FLEXFieldEditorView.h"
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXPropertyAttributes.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXMetadataExtras.h"
-#import "FLEXUtility.h"
-#import "FLEXColor.h"
-#import "UIBarButtonItem+FLEX.h"
+#import "Classes/Editing/FLEXFieldEditorViewController.h"
+#import "Classes/Editing/FLEXFieldEditorView.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXPropertyAttributes.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXMetadataExtras.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
 
 @interface FLEXFieldEditorViewController () <FLEXArgumentInputViewDelegate>
 

Classes/Editing/FLEXMethodCallingViewController.h

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXVariableEditorViewController.h"
-#import "FLEXMethod.h"
+#import "Classes/Editing/FLEXVariableEditorViewController.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXMethod.h"
 
 @interface FLEXMethodCallingViewController : FLEXVariableEditorViewController
 

Classes/Editing/FLEXMethodCallingViewController.m

@@ -6,14 +6,14 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXMethodCallingViewController.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXFieldEditorView.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXObjectExplorerViewController.h"
-#import "FLEXArgumentInputView.h"
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXUtility.h"
+#import "Classes/Editing/FLEXMethodCallingViewController.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Editing/FLEXFieldEditorView.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Headers/FLEXObjectExplorerViewController.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
+#import "Classes/Utility/FLEXUtility.h"
 
 @interface FLEXMethodCallingViewController ()
 @property (nonatomic, readonly) FLEXMethod *method;

Classes/Editing/FLEXVariableEditorViewController.m

@@ -6,16 +6,16 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXColor.h"
-#import "FLEXVariableEditorViewController.h"
-#import "FLEXFieldEditorView.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXUtility.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXArgumentInputView.h"
-#import "FLEXArgumentInputViewFactory.h"
-#import "FLEXObjectExplorerViewController.h"
-#import "UIBarButtonItem+FLEX.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Editing/FLEXVariableEditorViewController.h"
+#import "Classes/Editing/FLEXFieldEditorView.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Editing/ArgumentInputViews/FLEXArgumentInputView.h"
+#import "Classes/Editing/FLEXArgumentInputViewFactory.h"
+#import "Classes/Headers/FLEXObjectExplorerViewController.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
 
 @interface FLEXVariableEditorViewController () <UIScrollViewDelegate>
 @property (nonatomic) UIScrollView *scrollView;

Classes/ExplorerInterface/Bookmarks/FLEXBookmarkManager.m

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXBookmarkManager.h"
+#import "Classes/ExplorerInterface/Bookmarks/FLEXBookmarkManager.h"
 
 static NSMutableArray *kFLEXBookmarkManagerBookmarks = nil;
 

Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableViewController.h"
+#import "Classes/Headers/FLEXTableViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.m

@@ -6,16 +6,16 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXBookmarksViewController.h"
-#import "FLEXExplorerViewController.h"
-#import "FLEXNavigationController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXBookmarkManager.h"
-#import "UIBarButtonItem+FLEX.h"
-#import "FLEXColor.h"
-#import "FLEXUtility.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXTableView.h"
+#import "Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.h"
+#import "Classes/ExplorerInterface/FLEXExplorerViewController.h"
+#import "Classes/Headers/FLEXNavigationController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/ExplorerInterface/Bookmarks/FLEXBookmarkManager.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Headers/FLEXTableView.h"
 
 @interface FLEXBookmarksViewController ()
 @property (nonatomic, copy) NSArray *bookmarks;

Classes/ExplorerInterface/FLEXExplorerViewController.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXExplorerToolbar.h"
+#import "Classes/Headers/FLEXExplorerToolbar.h"
 
 @class FLEXWindow;
 @protocol FLEXExplorerViewControllerDelegate;

Classes/ExplorerInterface/FLEXExplorerViewController.m

@@ -6,21 +6,21 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXExplorerViewController.h"
-#import "FLEXExplorerToolbarItem.h"
-#import "FLEXUtility.h"
-#import "FLEXWindow.h"
-#import "FLEXTabList.h"
-#import "FLEXNavigationController.h"
-#import "FLEXHierarchyViewController.h"
-#import "FLEXGlobalsViewController.h"
-#import "FLEXObjectExplorerViewController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXNetworkMITMViewController.h"
-#import "FLEXTabsViewController.h"
-#import "FLEXWindowManagerController.h"
-#import "FLEXViewControllersViewController.h"
-#import "NSUserDefaults+FLEX.h"
+#import "Classes/ExplorerInterface/FLEXExplorerViewController.h"
+#import "Classes/Headers/FLEXExplorerToolbarItem.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/ExplorerInterface/FLEXWindow.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabList.h"
+#import "Classes/Headers/FLEXNavigationController.h"
+#import "Classes/ViewHierarchy/FLEXHierarchyViewController.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Network/FLEXNetworkMITMViewController.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabsViewController.h"
+#import "Classes/ExplorerInterface/FLEXWindowManagerController.h"
+#import "Classes/ExplorerInterface/FLEXViewControllersViewController.h"
+#import "Classes/Utility/Categories/NSUserDefaults+FLEX.h"
 
 typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     FLEXExplorerModeDefault,
@@ -466,7 +466,11 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     toolbar.moveItem.selected = self.currentMode == FLEXExplorerModeMove;
     
     // Recent only enabled when we have a last active tab
-    toolbar.recentItem.enabled = FLEXTabList.sharedList.activeTab != nil;
+    if (!self.presentedViewController) {
+        toolbar.recentItem.enabled = FLEXTabList.sharedList.activeTab != nil;
+    } else {
+        toolbar.recentItem.enabled = NO;
+    }
 }
 
 
@@ -848,31 +852,34 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
 #pragma mark - Touch Handling
 
 - (BOOL)shouldReceiveTouchAtWindowPoint:(CGPoint)pointInWindowCoordinates {
-    BOOL shouldReceiveTouch = NO;
-    
     CGPoint pointInLocalCoordinates = [self.view convertPoint:pointInWindowCoordinates fromView:nil];
     
-    // Always if it's on the toolbar
-    if (CGRectContainsPoint(self.explorerToolbar.frame, pointInLocalCoordinates)) {
-        shouldReceiveTouch = YES;
+    // If we have a modal presented, is it in the modal?
+    if (self.presentedViewController) {
+        UIView *presentedView = self.presentedViewController.view;
+        CGPoint pipvc = [presentedView convertPoint:pointInLocalCoordinates fromView:self.view];
+        UIView *hit = [presentedView hitTest:pipvc withEvent:nil];
+        if (hit != nil) {
+            return YES;
+        }
     }
     
     // Always if we're in selection mode
-    if (!shouldReceiveTouch && self.currentMode == FLEXExplorerModeSelect) {
-        shouldReceiveTouch = YES;
+    if (self.currentMode == FLEXExplorerModeSelect) {
+        return YES;
     }
     
     // Always in move mode too
-    if (!shouldReceiveTouch && self.currentMode == FLEXExplorerModeMove) {
-        shouldReceiveTouch = YES;
+    if (self.currentMode == FLEXExplorerModeMove) {
+        return YES;
     }
     
-    // Always if we have a modal presented
-    if (!shouldReceiveTouch && self.presentedViewController) {
-        shouldReceiveTouch = YES;
+    // Always if it's on the toolbar
+    if (CGRectContainsPoint(self.explorerToolbar.frame, pointInLocalCoordinates)) {
+        return YES;
     }
     
-    return shouldReceiveTouch;
+    return NO;
 }
 
 
@@ -918,8 +925,14 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     // up in case we start replacing them again in the future
     self.appMenuItems = UIMenuController.sharedMenuController.menuItems;
     
+    [self updateButtonStates];
+    
     // Show the view controller
-    [super presentViewController:toPresent animated:animated completion:completion];
+    [super presentViewController:toPresent animated:animated completion:^{
+        [self updateButtonStates];
+        
+        if (completion) completion();
+    }];
 }
 
 - (void)dismissViewControllerAnimated:(BOOL)animated completion:(void (^)(void))completion {    
@@ -940,7 +953,11 @@ typedef NS_ENUM(NSUInteger, FLEXExplorerMode) {
     
     [self updateButtonStates];
     
-    [super dismissViewControllerAnimated:animated completion:completion];
+    [super dismissViewControllerAnimated:animated completion:^{
+        [self updateButtonStates];
+        
+        if (completion) completion();
+    }];
 }
 
 - (BOOL)wantsWindowToBecomeKey {

Classes/ExplorerInterface/FLEXViewControllersViewController.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXFilteringTableViewController.h"
+#import "Classes/Headers/FLEXFilteringTableViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Classes/ExplorerInterface/FLEXViewControllersViewController.m

@@ -6,10 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXViewControllersViewController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXMutableListSection.h"
-#import "FLEXUtility.h"
+#import "Classes/ExplorerInterface/FLEXViewControllersViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Headers/FLEXMutableListSection.h"
+#import "Classes/Utility/FLEXUtility.h"
 
 @interface FLEXViewControllersViewController ()
 @property (nonatomic, readonly) FLEXMutableListSection *section;

Classes/ExplorerInterface/FLEXWindow.m

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXWindow.h"
-#import "FLEXUtility.h"
+#import "Classes/ExplorerInterface/FLEXWindow.h"
+#import "Classes/Utility/FLEXUtility.h"
 #import <objc/runtime.h>
 
 @implementation FLEXWindow
@@ -18,8 +18,7 @@
         // Some apps have windows at UIWindowLevelStatusBar + n.
         // If we make the window level too high, we block out UIAlertViews.
         // There's a balance between staying above the app's windows and staying below alerts.
-        // UIWindowLevelStatusBar + 100 seems to hit that balance.
-        self.windowLevel = UIWindowLevelStatusBar + 100.0;
+        self.windowLevel = UIWindowLevelAlert - 1;
     }
     return self;
 }

Classes/ExplorerInterface/FLEXWindowManagerController.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableViewController.h"
+#import "Classes/Headers/FLEXTableViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Classes/ExplorerInterface/FLEXWindowManagerController.m

@@ -6,10 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXWindowManagerController.h"
-#import "FLEXManager+Private.h"
-#import "FLEXUtility.h"
-#import "FLEXObjectExplorerFactory.h"
+#import "Classes/ExplorerInterface/FLEXWindowManagerController.h"
+#import "Classes/Manager/Private/FLEXManager+Private.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
 
 @interface FLEXWindowManagerController ()
 @property (nonatomic) UIWindow *keyWindow;

Classes/ExplorerInterface/Tabs/FLEXTabList.m

@@ -6,8 +6,8 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTabList.h"
-#import "FLEXUtility.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabList.h"
+#import "Classes/Utility/FLEXUtility.h"
 
 @interface FLEXTabList () {
     NSMutableArray *_openTabs;

Classes/ExplorerInterface/Tabs/FLEXTabsViewController.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableViewController.h"
+#import "Classes/Headers/FLEXTableViewController.h"
 
 @interface FLEXTabsViewController : FLEXTableViewController
 

Classes/ExplorerInterface/Tabs/FLEXTabsViewController.m

@@ -6,17 +6,17 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTabsViewController.h"
-#import "FLEXNavigationController.h"
-#import "FLEXTabList.h"
-#import "FLEXBookmarkManager.h"
-#import "FLEXTableView.h"
-#import "FLEXUtility.h"
-#import "FLEXColor.h"
-#import "UIBarButtonItem+FLEX.h"
-#import "FLEXExplorerViewController.h"
-#import "FLEXGlobalsViewController.h"
-#import "FLEXBookmarksViewController.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabsViewController.h"
+#import "Classes/Headers/FLEXNavigationController.h"
+#import "Classes/ExplorerInterface/Tabs/FLEXTabList.h"
+#import "Classes/ExplorerInterface/Bookmarks/FLEXBookmarkManager.h"
+#import "Classes/Headers/FLEXTableView.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
+#import "Classes/ExplorerInterface/FLEXExplorerViewController.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsViewController.h"
+#import "Classes/ExplorerInterface/Bookmarks/FLEXBookmarksViewController.h"
 
 @interface FLEXTabsViewController ()
 @property (nonatomic, copy) NSArray<UINavigationController *> *openTabs;

Classes/FLEX-Categories.h

@@ -6,16 +6,16 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "UIBarButtonItem+FLEX.h"
-#import "CALayer+FLEX.h"
-#import "UIFont+FLEX.h"
-#import "UIGestureRecognizer+Blocks.h"
-#import "UIPasteboard+FLEX.h"
-#import "UIMenu+FLEX.h"
-#import "UITextField+Range.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
+#import "Classes/Utility/Categories/CALayer+FLEX.h"
+#import "Classes/Utility/Categories/UIFont+FLEX.h"
+#import "Classes/Utility/Categories/UIGestureRecognizer+Blocks.h"
+#import "Classes/Utility/Categories/UIPasteboard+FLEX.h"
+#import "Classes/Utility/Categories/UIMenu+FLEX.h"
+#import "Classes/Utility/Categories/UITextField+Range.h"
 
-#import "NSObject+FLEX_Reflection.h"
-#import "NSArray+FLEX.h"
-#import "NSUserDefaults+FLEX.h"
-#import "NSTimer+FLEX.h"
-#import "NSDateFormatter+FLEX.h"
+#import "Classes/Utility/Categories/NSObject+FLEX_Reflection.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/Utility/Categories/NSUserDefaults+FLEX.h"
+#import "Classes/Utility/Categories/NSTimer+FLEX.h"
+#import "Classes/Utility/Categories/NSDateFormatter+FLEX.h"

Classes/FLEX-Core.h

@@ -6,17 +6,17 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXFilteringTableViewController.h"
-#import "FLEXNavigationController.h"
-#import "FLEXTableViewController.h"
-#import "FLEXTableView.h"
+#import "Classes/Headers/FLEXFilteringTableViewController.h"
+#import "Classes/Headers/FLEXNavigationController.h"
+#import "Classes/Headers/FLEXTableViewController.h"
+#import "Classes/Headers/FLEXTableView.h"
 
-#import "FLEXSingleRowSection.h"
-#import "FLEXTableViewSection.h"
+#import "Classes/Headers/FLEXSingleRowSection.h"
+#import "Classes/Headers/FLEXTableViewSection.h"
 
-#import "FLEXCodeFontCell.h"
-#import "FLEXSubtitleTableViewCell.h"
-#import "FLEXTableViewCell.h"
-#import "FLEXMultilineTableViewCell.h"
-#import "FLEXKeyValueTableViewCell.h"
+#import "Classes/Headers/FLEXCodeFontCell.h"
+#import "Classes/Headers/FLEXSubtitleTableViewCell.h"
+#import "Classes/Headers/FLEXTableViewCell.h"
+#import "Classes/Headers/FLEXMultilineTableViewCell.h"
+#import "Classes/Headers/FLEXKeyValueTableViewCell.h"
 

Classes/FLEX-ObjectExploring.h

@@ -6,17 +6,17 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXObjectExplorerViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Headers/FLEXObjectExplorerViewController.h"
 
-#import "FLEXObjectExplorer.h"
+#import "Classes/Headers/FLEXObjectExplorer.h"
 
-#import "FLEXShortcut.h"
-#import "FLEXShortcutsSection.h"
+#import "Classes/Headers/FLEXShortcut.h"
+#import "Classes/Headers/FLEXShortcutsSection.h"
 
-#import "FLEXCollectionContentSection.h"
-#import "FLEXColorPreviewSection.h"
-#import "FLEXDefaultsContentSection.h"
-#import "FLEXMetadataSection.h"
-#import "FLEXMutableListSection.h"
-#import "FLEXObjectInfoSection.h"
+#import "Classes/Headers/FLEXCollectionContentSection.h"
+#import "Classes/Headers/FLEXColorPreviewSection.h"
+#import "Classes/Headers/FLEXDefaultsContentSection.h"
+#import "Classes/Headers/FLEXMetadataSection.h"
+#import "Classes/Headers/FLEXMutableListSection.h"
+#import "Classes/Headers/FLEXObjectInfoSection.h"

Classes/FLEX-Runtime.h

@@ -6,22 +6,22 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXObjcInternal.h"
-#import "FLEXSwiftInternal.h"
-#import "FLEXRuntimeSafety.h"
-#import "FLEXBlockDescription.h"
-#import "FLEXTypeEncodingParser.h"
+#import "Classes/Utility/Runtime/Objc/FLEXObjcInternal.h"
+#import "Classes/Utility/Runtime/Objc/FLEXSwiftInternal.h"
+#import "Classes/Utility/Runtime/Objc/FLEXRuntimeSafety.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXBlockDescription.h"
+#import "Classes/Utility/Runtime/Objc/FLEXTypeEncodingParser.h"
 
-#import "FLEXMirror.h"
-#import "FLEXProtocol.h"
-#import "FLEXProperty.h"
-#import "FLEXIvar.h"
-#import "FLEXMethodBase.h"
-#import "FLEXMethod.h"
-#import "FLEXPropertyAttributes.h"
-#import "FLEXRuntime+Compare.h"
-#import "FLEXRuntime+UIKitHelpers.h"
-#import "FLEXMetadataExtras.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXMirror.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXProtocol.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXProperty.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXIvar.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXMethodBase.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXMethod.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXPropertyAttributes.h"
+#import "Classes/Utility/Categories/FLEXRuntime+Compare.h"
+#import "Classes/Utility/Categories/FLEXRuntime+UIKitHelpers.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXMetadataExtras.h"
 
-#import "FLEXProtocolBuilder.h"
-#import "FLEXClassBuilder.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXProtocolBuilder.h"
+#import "Classes/Utility/Runtime/Objc/Reflection/FLEXClassBuilder.h"

Classes/FLEX.h

@@ -7,19 +7,20 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXManager.h"
-#import "FLEXManager+Extensibility.h"
-#import "FLEXManager+Networking.h"
+#import "Classes/Headers/FLEXManager.h"
+#import "Classes/Headers/FLEXManager+Extensibility.h"
+#import "Classes/Headers/FLEXManager+Networking.h"
 
-#import "FLEXExplorerToolbar.h"
-#import "FLEXExplorerToolbarItem.h"
-#import "FLEXGlobalsEntry.h"
+#import "Classes/Headers/FLEXExplorerToolbar.h"
+#import "Classes/Headers/FLEXExplorerToolbarItem.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h"
 
-#import "FLEX-Core.h"
-#import "FLEX-Runtime.h"
-#import "FLEX-Categories.h"
-#import "FLEX-ObjectExploring.h"
+#import "Classes/Headers/FLEX-Core.h"
+#import "Classes/Headers/FLEX-Runtime.h"
+#import "Classes/Headers/FLEX-Categories.h"
+#import "Classes/Headers/FLEX-ObjectExploring.h"
 
-#import "FLEXMacros.h"
-#import "FLEXAlert.h"
-#import "FLEXResources.h"
+#import "Classes/Utility/FLEXMacros.h"
+#import "Classes/Utility/FLEXAlert.h"
+#import "Classes/Utility/FLEXResources.h"
+#import "Classes/Utility/FLEXHeapEnumerator.h"

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.m

@@ -6,11 +6,11 @@
 //  Copyright © 2015年 f. All rights reserved.
 //
 
-#import "FLEXDBQueryRowCell.h"
-#import "FLEXMultiColumnTableView.h"
-#import "NSArray+FLEX.h"
-#import "UIFont+FLEX.h"
-#import "FLEXColor.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXMultiColumnTableView.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/Utility/Categories/UIFont+FLEX.h"
+#import "Classes/Utility/FLEXColor.h"
 
 NSString * const kFLEXDBQueryRowCellReuse = @"kFLEXDBQueryRowCellReuse";
 

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDatabaseManager.h

@@ -12,7 +12,7 @@
 //  which Flying Meat Inc. licenses this file to you.
 
 #import <Foundation/Foundation.h>
-#import "FLEXSQLResult.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.h"
 
 /// Conformers should automatically open and close the database
 @protocol FLEXDatabaseManager <NSObject>

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXMultiColumnTableView.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "FLEXTableColumnHeader.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableColumnHeader.h"
 
 @class FLEXMultiColumnTableView;
 

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXMultiColumnTableView.m

@@ -6,11 +6,11 @@
 //  Copyright © 2015年 Peng Tao. All rights reserved.
 //
 
-#import "FLEXMultiColumnTableView.h"
-#import "FLEXDBQueryRowCell.h"
-#import "FLEXTableLeftCell.h"
-#import "NSArray+FLEX.h"
-#import "FLEXColor.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXMultiColumnTableView.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDBQueryRowCell.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableLeftCell.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/Utility/FLEXColor.h"
 
 @interface FLEXMultiColumnTableView () <
     UITableViewDataSource, UITableViewDelegate,

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDatabaseManager.h

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "FLEXDatabaseManager.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDatabaseManager.h"
 
 @interface FLEXRealmDatabaseManager : NSObject <FLEXDatabaseManager>
 

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDatabaseManager.m

@@ -6,15 +6,15 @@
 //  Copyright © 2016 Realm. All rights reserved.
 //
 
-#import "FLEXRealmDatabaseManager.h"
-#import "NSArray+FLEX.h"
-#import "FLEXSQLResult.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDatabaseManager.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.h"
 
 #if __has_include(<Realm/Realm.h>)
 #import <Realm/Realm.h>
 #import <Realm/RLMRealm_Dynamic.h>
 #else
-#import "FLEXRealmDefines.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDefines.h"
 #endif
 
 @interface FLEXRealmDatabaseManager ()

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.m

@@ -6,8 +6,8 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXSQLResult.h"
-#import "NSArray+FLEX.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
 
 @implementation FLEXSQLResult
 @synthesize keyedRows = _keyedRows;

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.h

@@ -12,8 +12,8 @@
 //  which Flying Meat Inc. licenses this file to you.
 
 #import <Foundation/Foundation.h>
-#import "FLEXDatabaseManager.h"
-#import "FLEXSQLResult.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDatabaseManager.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLResult.h"
 
 @interface FLEXSQLiteDatabaseManager : NSObject <FLEXDatabaseManager>
 

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.m

@@ -6,10 +6,10 @@
 //  Copyright © 2015年 Peng Tao. All rights reserved.
 //
 
-#import "FLEXSQLiteDatabaseManager.h"
-#import "FLEXManager.h"
-#import "NSArray+FLEX.h"
-#import "FLEXRuntimeConstants.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.h"
+#import "Classes/Headers/FLEXManager.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/Utility/Runtime/Objc/FLEXRuntimeConstants.h"
 #import <sqlite3.h>
 
 #define kQuery(name, str) static NSString * const QUERY_##name = str

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableColumnHeader.m

@@ -6,10 +6,10 @@
 //  Copyright © 2015年 f. All rights reserved.
 //
 
-#import "FLEXTableColumnHeader.h"
-#import "FLEXColor.h"
-#import "UIFont+FLEX.h"
-#import "FLEXUtility.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableColumnHeader.h"
+#import "Classes/Utility/FLEXColor.h"
+#import "Classes/Utility/Categories/UIFont+FLEX.h"
+#import "Classes/Utility/FLEXUtility.h"
 
 static const CGFloat kMargin = 5;
 static const CGFloat kArrowWidth = 20;

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableContentViewController.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "FLEXDatabaseManager.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDatabaseManager.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableContentViewController.m

@@ -6,12 +6,12 @@
 //  Copyright © 2015年 Peng Tao. All rights reserved.
 //
 
-#import "FLEXTableContentViewController.h"
-#import "FLEXTableRowDataViewController.h"
-#import "FLEXMultiColumnTableView.h"
-#import "FLEXWebViewController.h"
-#import "FLEXUtility.h"
-#import "UIBarButtonItem+FLEX.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableContentViewController.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableRowDataViewController.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXMultiColumnTableView.h"
+#import "Classes/GlobalStateExplorers/FLEXWebViewController.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
 
 @interface FLEXTableContentViewController () <
     FLEXMultiColumnTableViewDataSource, FLEXMultiColumnTableViewDelegate

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableLeftCell.m

@@ -6,7 +6,7 @@
 //  Copyright © 2015年 f. All rights reserved.
 //
 
-#import "FLEXTableLeftCell.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableLeftCell.h"
 
 @implementation FLEXTableLeftCell
 

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableListViewController.h

@@ -6,7 +6,7 @@
 //  Copyright © 2015年 Peng Tao. All rights reserved.
 //
 
-#import "FLEXFilteringTableViewController.h"
+#import "Classes/Headers/FLEXFilteringTableViewController.h"
 
 @interface FLEXTableListViewController : FLEXFilteringTableViewController
 

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableListViewController.m

@@ -6,15 +6,15 @@
 //  Copyright © 2015年 Peng Tao. All rights reserved.
 //
 
-#import "FLEXTableListViewController.h"
-#import "FLEXDatabaseManager.h"
-#import "FLEXSQLiteDatabaseManager.h"
-#import "FLEXRealmDatabaseManager.h"
-#import "FLEXTableContentViewController.h"
-#import "FLEXMutableListSection.h"
-#import "NSArray+FLEX.h"
-#import "FLEXAlert.h"
-#import "FLEXMacros.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableListViewController.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXDatabaseManager.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXSQLiteDatabaseManager.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXRealmDatabaseManager.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableContentViewController.h"
+#import "Classes/Headers/FLEXMutableListSection.h"
+#import "Classes/Utility/Categories/NSArray+FLEX.h"
+#import "Classes/Utility/FLEXAlert.h"
+#import "Classes/Utility/FLEXMacros.h"
 
 @interface FLEXTableListViewController ()
 @property (nonatomic, readonly) id<FLEXDatabaseManager> dbm;
@@ -93,16 +93,37 @@
 }
     
 - (void)queryButtonPressed {
+    [self showQueryInput:nil];
+}
+
+- (void)showQueryInput:(NSString *)prefillQuery {
     FLEXSQLiteDatabaseManager *database = self.dbm;
     
     [FLEXAlert makeAlert:^(FLEXAlert *make) {
         make.title(@"Execute an SQL query");
-        make.textField(nil);
+        make.configuredTextField(^(UITextField *textField) {
+            textField.text = prefillQuery;
+        });
+        
         make.button(@"Run").handler(^(NSArray<NSString *> *strings) {
-            FLEXSQLResult *result = [database executeStatement:strings[0]];
+            NSString *query = strings[0];
+            FLEXSQLResult *result = [database executeStatement:query];
             
             if (result.message) {
-                [FLEXAlert showAlert:@"Message" message:result.message from:self];
+                // Allow users to edit their last query if it had an error
+                if ([result.message containsString:@"error"]) {
+                    [FLEXAlert makeAlert:^(FLEXAlert *make) {
+                        make.title(@"Error").message(result.message);
+                        make.button(@"Edit Query").preferred().handler(^(NSArray<NSString *> *_) {
+                            // Show query editor again with our last input
+                            [self showQueryInput:query];
+                        });
+                        
+                        make.button(@"Cancel").cancelStyle();
+                    } showFrom:self];
+                } else {
+                    [FLEXAlert showAlert:@"Message" message:result.message from:self];
+                }
             } else {
                 UIViewController *resultsScreen = [FLEXTableContentViewController
                     columns:result.columns rows:result.rows

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableRowDataViewController.h

@@ -5,7 +5,7 @@
 //  Created by Chaoshuai Lu on 7/8/20.
 //
 
-#import "FLEXFilteringTableViewController.h"
+#import "Classes/Headers/FLEXFilteringTableViewController.h"
 
 @interface FLEXTableRowDataViewController : FLEXFilteringTableViewController
 

Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableRowDataViewController.m

@@ -5,9 +5,9 @@
 //  Created by Chaoshuai Lu on 7/8/20.
 //
 
-#import "FLEXTableRowDataViewController.h"
-#import "FLEXMutableListSection.h"
-#import "FLEXAlert.h"
+#import "Classes/GlobalStateExplorers/DatabaseBrowser/FLEXTableRowDataViewController.h"
+#import "Classes/Headers/FLEXMutableListSection.h"
+#import "Classes/Utility/FLEXAlert.h"
 
 @interface FLEXTableRowDataViewController ()
 @property (nonatomic) NSDictionary<NSString *, NSString *> *rowsByColumn;

Classes/GlobalStateExplorers/FLEXAPNSViewController.h

@@ -6,8 +6,8 @@
 //  Copyright © 2022 FLEX Team. All rights reserved.
 //
 
-#import "FLEXGlobalsEntry.h"
-#import "FLEXFilteringTableViewController.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h"
+#import "Classes/Headers/FLEXFilteringTableViewController.h"
 
 @interface FLEXAPNSViewController : FLEXFilteringTableViewController <FLEXGlobalsEntry>
 

Classes/GlobalStateExplorers/FLEXAPNSViewController.m

@@ -6,17 +6,17 @@
 //  Copyright © 2022 FLEX Team. All rights reserved.
 //
 
-#import "FLEXAPNSViewController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXMutableListSection.h"
-#import "FLEXSingleRowSection.h"
-#import "NSUserDefaults+FLEX.h"
-#import "UIBarButtonItem+FLEX.h"
-#import "NSDateFormatter+FLEX.h"
-#import "FLEXResources.h"
-#import "FLEXUtility.h"
-#import "FLEXRuntimeUtility.h"
-#import "flex_fishhook.h"
+#import "Classes/GlobalStateExplorers/FLEXAPNSViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Headers/FLEXMutableListSection.h"
+#import "Classes/Headers/FLEXSingleRowSection.h"
+#import "Classes/Utility/Categories/NSUserDefaults+FLEX.h"
+#import "Classes/Utility/Categories/UIBarButtonItem+FLEX.h"
+#import "Classes/Utility/Categories/NSDateFormatter+FLEX.h"
+#import "Classes/Utility/FLEXResources.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Utility/Runtime/flex_fishhook.h"
 #import <dlfcn.h>
 #import <UserNotifications/UserNotifications.h>
 

Classes/GlobalStateExplorers/FLEXAddressExplorerCoordinator.h

@@ -6,7 +6,7 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXGlobalsEntry.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h"
 
 @interface FLEXAddressExplorerCoordinator : NSObject <FLEXGlobalsEntry>
 

Classes/GlobalStateExplorers/FLEXAddressExplorerCoordinator.m

@@ -6,12 +6,12 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXAddressExplorerCoordinator.h"
-#import "FLEXGlobalsViewController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXObjectExplorerViewController.h"
-#import "FLEXRuntimeUtility.h"
-#import "FLEXUtility.h"
+#import "Classes/GlobalStateExplorers/FLEXAddressExplorerCoordinator.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Headers/FLEXObjectExplorerViewController.h"
+#import "Classes/Utility/Runtime/FLEXRuntimeUtility.h"
+#import "Classes/Utility/FLEXUtility.h"
 
 @interface UITableViewController (FLEXAddressExploration)
 - (void)deselectSelectedRow;

Classes/GlobalStateExplorers/FLEXCookiesViewController.h

@@ -6,8 +6,8 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXGlobalsEntry.h"
-#import "FLEXFilteringTableViewController.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h"
+#import "Classes/Headers/FLEXFilteringTableViewController.h"
 
 @interface FLEXCookiesViewController : FLEXFilteringTableViewController <FLEXGlobalsEntry>
 

Classes/GlobalStateExplorers/FLEXCookiesViewController.m

@@ -6,10 +6,10 @@
 //  Copyright © 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXCookiesViewController.h"
-#import "FLEXObjectExplorerFactory.h"
-#import "FLEXMutableListSection.h"
-#import "FLEXUtility.h"
+#import "Classes/GlobalStateExplorers/FLEXCookiesViewController.h"
+#import "Classes/Headers/FLEXObjectExplorerFactory.h"
+#import "Classes/Headers/FLEXMutableListSection.h"
+#import "Classes/Utility/FLEXUtility.h"
 
 @interface FLEXCookiesViewController ()
 @property (nonatomic, readonly) FLEXMutableListSection<NSHTTPCookie *> *cookies;

Classes/GlobalStateExplorers/FLEXLiveObjectsController.h

@@ -6,8 +6,8 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXTableViewController.h"
-#import "FLEXGlobalsEntry.h"
+#import "Classes/Headers/FLEXTableViewController.h"
+#import "Classes/GlobalStateExplorers/Globals/FLEXGlobalsEntry.h"
 
 @interface FLEXLiveObjectsController : FLEXTableViewController <FLEXGlobalsEntry>
 

Classes/GlobalStateExplorers/FLEXLiveObjectsController.m

@@ -6,12 +6,12 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXLiveObjectsController.h"
-#import "FLEXHeapEnumerator.h"
-#import "FLEXObjectListViewController.h"
-#import "FLEXUtility.h"
-#import "FLEXScopeCarousel.h"
-#import "FLEXTableView.h"
+#import "Classes/GlobalStateExplorers/FLEXLiveObjectsController.h"
+#import "Classes/Utility/FLEXHeapEnumerator.h"
+#import "Classes/GlobalStateExplorers/FLEXObjectListViewController.h"
+#import "Classes/Utility/FLEXUtility.h"
+#import "Classes/Core/Views/Carousel/FLEXScopeCarousel.h"
+#import "Classes/Headers/FLEXTableView.h"
 #import <objc/runtime.h>
 
 static const NSInteger kFLEXLiveObjectsSortAlphabeticallyIndex = 0;

Classes/GlobalStateExplorers/FLEXObjectListViewController.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2020 FLEX Team. All rights reserved.
 //
 
-#import "FLEXFilteringTableViewController.h"
+#import "Classes/Headers/FLEXFilteringTableViewController.h"
 
 @interface FLEXObjectListViewController : FLEXFilteringTableViewController