refactor(iOS): chaged project structure to separate abstractions

wix · TheLonelyAstronaut · Apr 25, 2024 · Apr 30, 2024 · May 1, 2024 · May 1, 2024
commit 57f0930fd15abb2ca42dc9fb79f2b0f2777ad65f
diff --git a/lib/ios/AnimationObserver.h → lib/ios/Animations/AnimationObserver.h b/lib/ios/AnimationObserver.h → lib/ios/Animations/AnimationObserver.h
diff --git a/lib/ios/AnimationObserver.mm → lib/ios/Animations/AnimationObserver.mm b/lib/ios/AnimationObserver.mm → lib/ios/Animations/AnimationObserver.mm
diff --git a/lib/ios/BaseAnimator.h → lib/ios/Animations/BaseAnimator.h b/lib/ios/BaseAnimator.h → lib/ios/Animations/BaseAnimator.h
diff --git a/lib/ios/BaseAnimator.mm → lib/ios/Animations/BaseAnimator.mm b/lib/ios/BaseAnimator.mm → lib/ios/Animations/BaseAnimator.mm
diff --git a/lib/ios/DisplayLinkAnimation.h → lib/ios/Animations/DisplayLinkAnimation.h b/lib/ios/DisplayLinkAnimation.h → lib/ios/Animations/DisplayLinkAnimation.h
diff --git a/lib/ios/DisplayLinkAnimator.h → lib/ios/Animations/DisplayLinkAnimator.h b/lib/ios/DisplayLinkAnimator.h → lib/ios/Animations/DisplayLinkAnimator.h
diff --git a/lib/ios/DisplayLinkAnimator.mm → lib/ios/Animations/DisplayLinkAnimator.mm b/lib/ios/DisplayLinkAnimator.mm → lib/ios/Animations/DisplayLinkAnimator.mm
diff --git a/lib/ios/DisplayLinkAnimatorDelegate.h → .../Animations/DisplayLinkAnimatorDelegate.h b/lib/ios/DisplayLinkAnimatorDelegate.h → .../Animations/DisplayLinkAnimatorDelegate.h
diff --git a/lib/ios/ElementAnimator.h → lib/ios/Animations/ElementAnimator.h b/lib/ios/ElementAnimator.h → lib/ios/Animations/ElementAnimator.h
diff --git a/lib/ios/ElementAnimator.mm → lib/ios/Animations/ElementAnimator.mm b/lib/ios/ElementAnimator.mm → lib/ios/Animations/ElementAnimator.mm
diff --git a/lib/ios/RNNEnterExitAnimation.h → lib/ios/Animations/RNNEnterExitAnimation.h b/lib/ios/RNNEnterExitAnimation.h → lib/ios/Animations/RNNEnterExitAnimation.h
diff --git a/lib/ios/RNNEnterExitAnimation.mm → lib/ios/Animations/RNNEnterExitAnimation.mm b/lib/ios/RNNEnterExitAnimation.mm → lib/ios/Animations/RNNEnterExitAnimation.mm
diff --git a/lib/ios/RNNInterpolator.h → lib/ios/Animations/RNNInterpolator.h b/lib/ios/RNNInterpolator.h → lib/ios/Animations/RNNInterpolator.h
diff --git a/lib/ios/RNNInterpolator.mm → lib/ios/Animations/RNNInterpolator.mm b/lib/ios/RNNInterpolator.mm → lib/ios/Animations/RNNInterpolator.mm
diff --git a/lib/ios/RNNPushAnimation.h → lib/ios/Animations/RNNPushAnimation.h b/lib/ios/RNNPushAnimation.h → lib/ios/Animations/RNNPushAnimation.h
diff --git a/lib/ios/RNNPushAnimation.mm → lib/ios/Animations/RNNPushAnimation.mm b/lib/ios/RNNPushAnimation.mm → lib/ios/Animations/RNNPushAnimation.mm
diff --git a/lib/ios/RNNSetRootAnimator.h → lib/ios/Animations/RNNSetRootAnimator.h b/lib/ios/RNNSetRootAnimator.h → lib/ios/Animations/RNNSetRootAnimator.h
diff --git a/lib/ios/RNNSetRootAnimator.mm → lib/ios/Animations/RNNSetRootAnimator.mm b/lib/ios/RNNSetRootAnimator.mm → lib/ios/Animations/RNNSetRootAnimator.mm
diff --git a/lib/ios/ScreenAnimationController.h → ...os/Animations/ScreenAnimationController.h b/lib/ios/ScreenAnimationController.h → ...os/Animations/ScreenAnimationController.h
diff --git a/lib/ios/ScreenAnimationController.mm → ...s/Animations/ScreenAnimationController.mm b/lib/ios/ScreenAnimationController.mm → ...s/Animations/ScreenAnimationController.mm
diff --git a/lib/ios/ScreenReversedAnimationController.h → ...tions/ScreenReversedAnimationController.h b/lib/ios/ScreenReversedAnimationController.h → ...tions/ScreenReversedAnimationController.h
diff --git a/lib/ios/ScreenReversedAnimationController.mm → ...ions/ScreenReversedAnimationController.mm b/lib/ios/ScreenReversedAnimationController.mm → ...ions/ScreenReversedAnimationController.mm
diff --git a/lib/ios/SharedElementAnimator.h → lib/ios/Animations/SharedElementAnimator.h b/lib/ios/SharedElementAnimator.h → lib/ios/Animations/SharedElementAnimator.h
diff --git a/lib/ios/SharedElementAnimator.mm → lib/ios/Animations/SharedElementAnimator.mm b/lib/ios/SharedElementAnimator.mm → lib/ios/Animations/SharedElementAnimator.mm
diff --git a/lib/ios/RNNAppDelegate.h → lib/ios/AppDelegate/RNNAppDelegate.h b/lib/ios/RNNAppDelegate.h → lib/ios/AppDelegate/RNNAppDelegate.h
diff --git a/lib/ios/RNNAppDelegate.mm → lib/ios/AppDelegate/RNNAppDelegate.mm b/lib/ios/RNNAppDelegate.mm → lib/ios/AppDelegate/RNNAppDelegate.mm
diff --git a/lib/ios/BottomTabsAfterInitialTabAttacher.h → ...chers/BottomTabsAfterInitialTabAttacher.h b/lib/ios/BottomTabsAfterInitialTabAttacher.h → ...chers/BottomTabsAfterInitialTabAttacher.h
diff --git a/lib/ios/BottomTabsAfterInitialTabAttacher.mm → ...hers/BottomTabsAfterInitialTabAttacher.mm b/lib/ios/BottomTabsAfterInitialTabAttacher.mm → ...hers/BottomTabsAfterInitialTabAttacher.mm
diff --git a/lib/ios/BottomTabsAttachMode.h → ...ottomTabsAttachers/BottomTabsAttachMode.h b/lib/ios/BottomTabsAttachMode.h → ...ottomTabsAttachers/BottomTabsAttachMode.h
diff --git a/lib/ios/BottomTabsAttachMode.mm → ...ttomTabsAttachers/BottomTabsAttachMode.mm b/lib/ios/BottomTabsAttachMode.mm → ...ttomTabsAttachers/BottomTabsAttachMode.mm
diff --git a/lib/ios/BottomTabsBaseAttacher.h → ...tomTabsAttachers/BottomTabsBaseAttacher.h b/lib/ios/BottomTabsBaseAttacher.h → ...tomTabsAttachers/BottomTabsBaseAttacher.h
diff --git a/lib/ios/BottomTabsBaseAttacher.mm → ...omTabsAttachers/BottomTabsBaseAttacher.mm b/lib/ios/BottomTabsBaseAttacher.mm → ...omTabsAttachers/BottomTabsBaseAttacher.mm
diff --git a/lib/ios/BottomTabsOnSwitchToTabAttacher.h → ...tachers/BottomTabsOnSwitchToTabAttacher.h b/lib/ios/BottomTabsOnSwitchToTabAttacher.h → ...tachers/BottomTabsOnSwitchToTabAttacher.h
diff --git a/lib/ios/BottomTabsOnSwitchToTabAttacher.mm → ...achers/BottomTabsOnSwitchToTabAttacher.mm b/lib/ios/BottomTabsOnSwitchToTabAttacher.mm → ...achers/BottomTabsOnSwitchToTabAttacher.mm
diff --git a/lib/ios/BottomTabsTogetherAttacher.h → ...absAttachers/BottomTabsTogetherAttacher.h b/lib/ios/BottomTabsTogetherAttacher.h → ...absAttachers/BottomTabsTogetherAttacher.h
diff --git a/lib/ios/BottomTabsTogetherAttacher.mm → ...bsAttachers/BottomTabsTogetherAttacher.mm b/lib/ios/BottomTabsTogetherAttacher.mm → ...bsAttachers/BottomTabsTogetherAttacher.mm
diff --git a/lib/ios/Legacy/RNNBridgeManager.h → lib/ios/Bridge/RNNBridgeManager.h b/lib/ios/Legacy/RNNBridgeManager.h → lib/ios/Bridge/RNNBridgeManager.h
diff --git a/lib/ios/Legacy/RNNBridgeManager.mm → lib/ios/Bridge/RNNBridgeManager.mm b/lib/ios/Legacy/RNNBridgeManager.mm → lib/ios/Bridge/RNNBridgeManager.mm
@@ -7,7 +7,6 @@
 #import "RNNModalHostViewManagerHandler.h"
 #import "RNNReactComponentRegistry.h"
 #import "RNNReactRootViewCreator.h"
-#import "RNNSplashScreen.h"
 #import <React/RCTBridge.h>
 #import <React/RCTUIManager.h>
 
@@ -75,21 +74,21 @@ - (void)registerExternalComponent:(NSString *)name callback:(RNNExternalViewCrea
     id<RNNComponentViewCreator> rootViewCreator =
         [[RNNReactRootViewCreator alloc] initWithBridge:bridge eventEmitter:eventEmitter];
     _componentRegistry = [[RNNReactComponentRegistry alloc] initWithCreator:rootViewCreator];
-    RNNControllerFactory *controllerFactory =
-        [[RNNControllerFactory alloc] initWithRootViewCreator:rootViewCreator
+    RNNViewControllerFactory *controllerFactory =
+        [[RNNViewControllerFactory alloc] initWithRootViewCreator:rootViewCreator
                                                  eventEmitter:eventEmitter
                                                         store:_store
                                             componentRegistry:_componentRegistry
                                                     andBridge:bridge
                                   bottomTabsAttachModeFactory:[BottomTabsAttachModeFactory new]];
     RNNSetRootAnimator *setRootAnimator = [RNNSetRootAnimator new];
-    _commandsHandler = [[RNNCommandsHandler alloc] initWithControllerFactory:controllerFactory
-                                                               layoutManager:_layoutManager
-                                                                eventEmitter:eventEmitter
-                                                                modalManager:_modalManager
-                                                              overlayManager:_overlayManager
-                                                             setRootAnimator:setRootAnimator
-                                                                  mainWindow:_mainWindow];
+    _commandsHandler = [[RNNCommandsHandler alloc] initWithViewControllerFactory:controllerFactory
+                                                                   layoutManager:_layoutManager
+                                                                    eventEmitter:eventEmitter
+                                                                    modalManager:_modalManager
+                                                                  overlayManager:_overlayManager
+                                                                 setRootAnimator:setRootAnimator
+                                                                      mainWindow:_mainWindow];
     RNNBridgeModule *bridgeModule =
         [[RNNBridgeModule alloc] initWithCommandsHandler:_commandsHandler];
 

diff --git a/lib/ios/Legacy/RNNBridgeModule.h → lib/ios/Bridge/RNNBridgeModule.h b/lib/ios/Legacy/RNNBridgeModule.h → lib/ios/Bridge/RNNBridgeModule.h
diff --git a/lib/ios/Legacy/RNNBridgeModule.mm → lib/ios/Bridge/RNNBridgeModule.mm b/lib/ios/Legacy/RNNBridgeModule.mm → lib/ios/Bridge/RNNBridgeModule.mm
diff --git a/lib/ios/RNNCommandsHandler.h → lib/ios/Commands/RNNCommandsHandler.h b/lib/ios/RNNCommandsHandler.h → lib/ios/Commands/RNNCommandsHandler.h
@@ -1,4 +1,4 @@
-#import "RNNControllerFactory.h"
+#import "RNNViewControllerFactory.h"
 #import "RNNLayoutManager.h"
 #import "RNNModalManager.h"
 #import "RNNOverlayManager.h"
@@ -14,7 +14,7 @@
 
 @interface RNNCommandsHandler : NSObject
 
-- (instancetype)initWithControllerFactory:(RNNControllerFactory *)controllerFactory
+- (instancetype)initWithViewControllerFactory:(RNNViewControllerFactory *)controllerFactory
                             layoutManager:(RNNLayoutManager *)layoutManager
                              eventEmitter:(RNNEventEmitter *)eventEmitter
                              modalManager:(RNNModalManager *)modalManager

diff --git a/lib/ios/RNNCommandsHandler.mm → lib/ios/Commands/RNNCommandsHandler.mm b/lib/ios/RNNCommandsHandler.mm → lib/ios/Commands/RNNCommandsHandler.mm
@@ -30,7 +30,7 @@ @interface RNNCommandsHandler ()
 @end
 
 @implementation RNNCommandsHandler {
-    RNNControllerFactory *_controllerFactory;
+    RNNViewControllerFactory *_controllerFactory;
     RNNLayoutManager *_layoutManager;
     RNNModalManager *_modalManager;
     RNNOverlayManager *_overlayManager;
@@ -39,13 +39,13 @@ @implementation RNNCommandsHandler {
     RNNSetRootAnimator *_setRootAnimator;
 }
 
-- (instancetype)initWithControllerFactory:(RNNControllerFactory *)controllerFactory
-                            layoutManager:(RNNLayoutManager *)layoutManager
-                             eventEmitter:(RNNEventEmitter *)eventEmitter
-                             modalManager:(RNNModalManager *)modalManager
-                           overlayManager:(RNNOverlayManager *)overlayManager
-                          setRootAnimator:(RNNSetRootAnimator *)setRootAnimator
-                               mainWindow:(UIWindow *)mainWindow {
+- (instancetype)initWithViewControllerFactory:(RNNViewControllerFactory *)controllerFactory
+                                layoutManager:(RNNLayoutManager *)layoutManager
+                                 eventEmitter:(RNNEventEmitter *)eventEmitter
+                                 modalManager:(RNNModalManager *)modalManager
+                               overlayManager:(RNNOverlayManager *)overlayManager
+                              setRootAnimator:(RNNSetRootAnimator *)setRootAnimator
+                                   mainWindow:(UIWindow *)mainWindow {
     self = [super init];
     _controllerFactory = controllerFactory;
     _layoutManager = layoutManager;

diff --git a/lib/ios/RNNEventEmitter.h → lib/ios/Events/RNNEventEmitter.h b/lib/ios/RNNEventEmitter.h → lib/ios/Events/RNNEventEmitter.h
diff --git a/lib/ios/RNNEventEmitter.mm → lib/ios/Events/RNNEventEmitter.mm b/lib/ios/RNNEventEmitter.mm → lib/ios/Events/RNNEventEmitter.mm
diff --git a/lib/ios/NSArray+utils.h → lib/ios/Extensions/Array/NSArray+utils.h b/lib/ios/NSArray+utils.h → lib/ios/Extensions/Array/NSArray+utils.h
diff --git a/lib/ios/NSArray+utils.mm → lib/ios/Extensions/Array/NSArray+utils.mm b/lib/ios/NSArray+utils.mm → lib/ios/Extensions/Array/NSArray+utils.mm
diff --git a/lib/ios/Color+Interpolation.h → ...os/Extensions/Color/Color+Interpolation.h b/lib/ios/Color+Interpolation.h → ...os/Extensions/Color/Color+Interpolation.h
diff --git a/lib/ios/Color+Interpolation.mm → ...s/Extensions/Color/Color+Interpolation.mm b/lib/ios/Color+Interpolation.mm → ...s/Extensions/Color/Color+Interpolation.mm
diff --git a/lib/ios/Utils/UIColor+RNNUtils.h → lib/ios/Extensions/Color/UIColor+RNNUtils.h b/lib/ios/Utils/UIColor+RNNUtils.h → lib/ios/Extensions/Color/UIColor+RNNUtils.h
diff --git a/lib/ios/Utils/UIColor+RNNUtils.mm → lib/ios/Extensions/Color/UIColor+RNNUtils.mm b/lib/ios/Utils/UIColor+RNNUtils.mm → lib/ios/Extensions/Color/UIColor+RNNUtils.mm
diff --git a/lib/ios/UINavigationController+RNNCommands.h → ...ller/UINavigationController+RNNCommands.h b/lib/ios/UINavigationController+RNNCommands.h → ...ller/UINavigationController+RNNCommands.h
diff --git a/...ios/UINavigationController+RNNCommands.mm → ...ler/UINavigationController+RNNCommands.mm b/...ios/UINavigationController+RNNCommands.mm → ...ler/UINavigationController+RNNCommands.mm
diff --git a/lib/ios/UINavigationController+RNNOptions.h → ...oller/UINavigationController+RNNOptions.h b/lib/ios/UINavigationController+RNNOptions.h → ...oller/UINavigationController+RNNOptions.h
diff --git a/lib/ios/UINavigationController+RNNOptions.mm → ...ller/UINavigationController+RNNOptions.mm b/lib/ios/UINavigationController+RNNOptions.mm → ...ller/UINavigationController+RNNOptions.mm
diff --git a/lib/ios/UISplitViewController+RNNOptions.h → ...roller/UISplitViewController+RNNOptions.h b/lib/ios/UISplitViewController+RNNOptions.h → ...roller/UISplitViewController+RNNOptions.h
diff --git a/lib/ios/UISplitViewController+RNNOptions.mm → ...oller/UISplitViewController+RNNOptions.mm b/lib/ios/UISplitViewController+RNNOptions.mm → ...oller/UISplitViewController+RNNOptions.mm
diff --git a/lib/ios/UITabBarController+RNNOptions.h → ...ontroller/UITabBarController+RNNOptions.h b/lib/ios/UITabBarController+RNNOptions.h → ...ontroller/UITabBarController+RNNOptions.h
diff --git a/lib/ios/UITabBarController+RNNOptions.mm → ...ntroller/UITabBarController+RNNOptions.mm b/lib/ios/UITabBarController+RNNOptions.mm → ...ntroller/UITabBarController+RNNOptions.mm
diff --git a/lib/ios/Utils/UITabBarController+RNNUtils.h → .../Controller/UITabBarController+RNNUtils.h b/lib/ios/Utils/UITabBarController+RNNUtils.h → .../Controller/UITabBarController+RNNUtils.h
diff --git a/lib/ios/Utils/UITabBarController+RNNUtils.mm → ...Controller/UITabBarController+RNNUtils.mm b/lib/ios/Utils/UITabBarController+RNNUtils.mm → ...Controller/UITabBarController+RNNUtils.mm
diff --git a/lib/ios/UIViewController+LayoutProtocol.h → ...troller/UIViewController+LayoutProtocol.h b/lib/ios/UIViewController+LayoutProtocol.h → ...troller/UIViewController+LayoutProtocol.h
diff --git a/lib/ios/UIViewController+LayoutProtocol.mm → ...roller/UIViewController+LayoutProtocol.mm b/lib/ios/UIViewController+LayoutProtocol.mm → ...roller/UIViewController+LayoutProtocol.mm
diff --git a/lib/ios/UIViewController+RNNOptions.h → .../Controller/UIViewController+RNNOptions.h b/lib/ios/UIViewController+RNNOptions.h → .../Controller/UIViewController+RNNOptions.h
diff --git a/lib/ios/UIViewController+RNNOptions.mm → ...Controller/UIViewController+RNNOptions.mm b/lib/ios/UIViewController+RNNOptions.mm → ...Controller/UIViewController+RNNOptions.mm
diff --git a/lib/ios/Extensions/Controller/UIViewController+SideMenuController.mm b/lib/ios/Extensions/Controller/UIViewController+SideMenuController.mm
@@ -0,0 +1,18 @@
+#import "UIViewController+SideMenuViewController.h"
+
+@implementation UIViewController (SideMenuController)
+
+- (RNNSideMenuViewController *)sideMenuController {
+    UIViewController *vc = self;
+    while (vc) {
+        if ([vc isKindOfClass:[RNNSideMenuViewController class]]) {
+            return (RNNSideMenuViewController *)vc;
+        }
+
+        vc = vc.parentViewController;
+    }
+
+    return nil;
+}
+
+@end
diff --git a/lib/ios/Extensions/Controller/UIViewController+SideMenuViewController.h b/lib/ios/Extensions/Controller/UIViewController+SideMenuViewController.h
@@ -0,0 +1,8 @@
+#import "RNNSideMenuViewController.h"
+#import <UIKit/UIKit.h>
+
+@interface UIViewController (RNNSideMenuViewController)
+
+- (RNNSideMenuViewController *)sideMenuController;
+
+@end
diff --git a/lib/ios/UIImage+utils.h → lib/ios/Extensions/Image/UIImage+utils.h b/lib/ios/UIImage+utils.h → lib/ios/Extensions/Image/UIImage+utils.h
diff --git a/lib/ios/UIImage+utils.mm → lib/ios/Extensions/Image/UIImage+utils.mm b/lib/ios/UIImage+utils.mm → lib/ios/Extensions/Image/UIImage+utils.mm
diff --git a/lib/ios/UIImageView+Transition.h → ...Extensions/Image/UIImageView+Transition.h b/lib/ios/UIImageView+Transition.h → ...Extensions/Image/UIImageView+Transition.h
diff --git a/lib/ios/UIImageView+Transition.mm → ...xtensions/Image/UIImageView+Transition.mm b/lib/ios/UIImageView+Transition.mm → ...xtensions/Image/UIImageView+Transition.mm
diff --git a/lib/ios/RCTConvert+Interpolation.h → ...ons/RCTConvert/RCTConvert+Interpolation.h b/lib/ios/RCTConvert+Interpolation.h → ...ons/RCTConvert/RCTConvert+Interpolation.h
diff --git a/lib/ios/RCTConvert+Interpolation.mm → ...ns/RCTConvert/RCTConvert+Interpolation.mm b/lib/ios/RCTConvert+Interpolation.mm → ...ns/RCTConvert/RCTConvert+Interpolation.mm
diff --git a/lib/ios/RCTConvert+SideMenuOpenGestureMode.h → ...vert/RCTConvert+SideMenuOpenGestureMode.h b/lib/ios/RCTConvert+SideMenuOpenGestureMode.h → ...vert/RCTConvert+SideMenuOpenGestureMode.h
diff --git a/...ios/RCTConvert+SideMenuOpenGestureMode.mm → ...ert/RCTConvert+SideMenuOpenGestureMode.mm b/...ios/RCTConvert+SideMenuOpenGestureMode.mm → ...ert/RCTConvert+SideMenuOpenGestureMode.mm
diff --git a/lib/ios/RCTConvert+UIBarButtonSystemItem.h → ...onvert/RCTConvert+UIBarButtonSystemItem.h b/lib/ios/RCTConvert+UIBarButtonSystemItem.h → ...onvert/RCTConvert+UIBarButtonSystemItem.h
diff --git a/lib/ios/RCTConvert+UIBarButtonSystemItem.mm → ...nvert/RCTConvert+UIBarButtonSystemItem.mm b/lib/ios/RCTConvert+UIBarButtonSystemItem.mm → ...nvert/RCTConvert+UIBarButtonSystemItem.mm
diff --git a/lib/ios/RCTConvert+UIFontWeight.h → ...ions/RCTConvert/RCTConvert+UIFontWeight.h b/lib/ios/RCTConvert+UIFontWeight.h → ...ions/RCTConvert/RCTConvert+UIFontWeight.h
diff --git a/lib/ios/RCTConvert+UIFontWeight.mm → ...ons/RCTConvert/RCTConvert+UIFontWeight.mm b/lib/ios/RCTConvert+UIFontWeight.mm → ...ons/RCTConvert/RCTConvert+UIFontWeight.mm
diff --git a/lib/ios/UITabBar+utils.h → lib/ios/Extensions/UIView/UITabBar+utils.h b/lib/ios/UITabBar+utils.h → lib/ios/Extensions/UIView/UITabBar+utils.h
diff --git a/lib/ios/UITabBar+utils.mm → lib/ios/Extensions/UIView/UITabBar+utils.mm b/lib/ios/UITabBar+utils.mm → lib/ios/Extensions/UIView/UITabBar+utils.mm
diff --git a/lib/ios/Utils/UIView+Utils.h → lib/ios/Extensions/UIView/UIView+Utils.h b/lib/ios/Utils/UIView+Utils.h → lib/ios/Extensions/UIView/UIView+Utils.h
diff --git a/lib/ios/Utils/UIView+Utils.mm → lib/ios/Extensions/UIView/UIView+Utils.mm b/lib/ios/Utils/UIView+Utils.mm → lib/ios/Extensions/UIView/UIView+Utils.mm
diff --git a/lib/ios/Utils/UIViewController+Utils.h → ...xtensions/UIView/UIViewController+Utils.h b/lib/ios/Utils/UIViewController+Utils.h → ...xtensions/UIView/UIViewController+Utils.h
diff --git a/lib/ios/Utils/UIViewController+Utils.mm → ...tensions/UIView/UIViewController+Utils.mm b/lib/ios/Utils/UIViewController+Utils.mm → ...tensions/UIView/UIViewController+Utils.mm
diff --git a/lib/ios/AnimatedViewFactory.h → lib/ios/Factories/AnimatedViewFactory.h b/lib/ios/AnimatedViewFactory.h → lib/ios/Factories/AnimatedViewFactory.h
diff --git a/lib/ios/AnimatedViewFactory.mm → lib/ios/Factories/AnimatedViewFactory.mm b/lib/ios/AnimatedViewFactory.mm → lib/ios/Factories/AnimatedViewFactory.mm
diff --git a/lib/ios/BottomTabPresenterCreator.h → ...ios/Factories/BottomTabPresenterCreator.h b/lib/ios/BottomTabPresenterCreator.h → ...ios/Factories/BottomTabPresenterCreator.h
diff --git a/lib/ios/BottomTabPresenterCreator.mm → ...os/Factories/BottomTabPresenterCreator.mm b/lib/ios/BottomTabPresenterCreator.mm → ...os/Factories/BottomTabPresenterCreator.mm
diff --git a/lib/ios/BottomTabsAttachModeFactory.h → ...s/Factories/BottomTabsAttachModeFactory.h b/lib/ios/BottomTabsAttachModeFactory.h → ...s/Factories/BottomTabsAttachModeFactory.h
diff --git a/lib/ios/BottomTabsAttachModeFactory.mm → .../Factories/BottomTabsAttachModeFactory.mm b/lib/ios/BottomTabsAttachModeFactory.mm → .../Factories/BottomTabsAttachModeFactory.mm
diff --git a/lib/ios/BottomTabsPresenterCreator.h → ...os/Factories/BottomTabsPresenterCreator.h b/lib/ios/BottomTabsPresenterCreator.h → ...os/Factories/BottomTabsPresenterCreator.h
diff --git a/lib/ios/BottomTabsPresenterCreator.mm → ...s/Factories/BottomTabsPresenterCreator.mm b/lib/ios/BottomTabsPresenterCreator.mm → ...s/Factories/BottomTabsPresenterCreator.mm
diff --git a/lib/ios/RNNBaseIconCreator.h → lib/ios/Factories/RNNBaseIconCreator.h b/lib/ios/RNNBaseIconCreator.h → lib/ios/Factories/RNNBaseIconCreator.h
diff --git a/lib/ios/RNNBaseIconCreator.mm → lib/ios/Factories/RNNBaseIconCreator.mm b/lib/ios/RNNBaseIconCreator.mm → lib/ios/Factories/RNNBaseIconCreator.mm
diff --git a/lib/ios/RNNButtonBuilder.h → lib/ios/Factories/RNNButtonBuilder.h b/lib/ios/RNNButtonBuilder.h → lib/ios/Factories/RNNButtonBuilder.h
diff --git a/lib/ios/RNNButtonBuilder.mm → lib/ios/Factories/RNNButtonBuilder.mm b/lib/ios/RNNButtonBuilder.mm → lib/ios/Factories/RNNButtonBuilder.mm
diff --git a/lib/ios/RNNComponentViewCreator.h → lib/ios/Factories/RNNComponentViewCreator.h b/lib/ios/RNNComponentViewCreator.h → lib/ios/Factories/RNNComponentViewCreator.h
diff --git a/lib/ios/RNNControllerFactory.mm → lib/ios/Factories/RNNControllerFactory.mm b/lib/ios/RNNControllerFactory.mm → lib/ios/Factories/RNNControllerFactory.mm
@@ -1,15 +1,15 @@
-#import "RNNControllerFactory.h"
+#import "RNNViewControllerFactory.h"
 #import "BottomTabPresenterCreator.h"
 #import "BottomTabsPresenterCreator.h"
 #import "RNNBottomTabsController.h"
 #import "RNNComponentViewController.h"
 #import "RNNExternalViewController.h"
-#import "RNNSideMenuController.h"
+#import "RNNSideMenuViewController.h"
 #import "RNNSplitViewController.h"
 #import "RNNStackController.h"
 #import "RNNTopTabsViewController.h"
 
-@implementation RNNControllerFactory {
+@implementation RNNViewControllerFactory {
     id<RNNComponentViewCreator> _creator;
     RNNExternalComponentStore *_store;
     RCTBridge *_bridge;
@@ -267,8 +267,8 @@ - (UIViewController *)createSideMenu:(RNNLayoutNode *)node {
 
     NSArray *childViewControllers = [self extractChildrenViewControllersFromNode:node];
 
-    RNNSideMenuController *sideMenu =
-        [[RNNSideMenuController alloc] initWithLayoutInfo:layoutInfo
+    RNNSideMenuViewController *sideMenu =
+        [[RNNSideMenuViewController alloc] initWithLayoutInfo:layoutInfo
                                                   creator:_creator
                                      childViewControllers:childViewControllers
                                                   options:options
@@ -285,7 +285,7 @@ - (UIViewController *)createSideMenuChild:(RNNLayoutNode *)node type:(RNNSideMen
     RNNNavigationOptions *options =
         [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
 
-    RNNSideMenuChildVC *sideMenuChild = [[RNNSideMenuChildVC alloc]
+    RNNSideMenuChildViewController *sideMenuChild = [[RNNSideMenuChildViewController alloc]
          initWithLayoutInfo:layoutInfo
                     creator:_creator
                     options:options

diff --git a/lib/ios/RNNDynamicIconCreator.h → lib/ios/Factories/RNNDynamicIconCreator.h b/lib/ios/RNNDynamicIconCreator.h → lib/ios/Factories/RNNDynamicIconCreator.h
diff --git a/lib/ios/RNNDynamicIconCreator.mm → lib/ios/Factories/RNNDynamicIconCreator.mm b/lib/ios/RNNDynamicIconCreator.mm → lib/ios/Factories/RNNDynamicIconCreator.mm
diff --git a/lib/ios/RNNFontAttributesCreator.h → lib/ios/Factories/RNNFontAttributesCreator.h b/lib/ios/RNNFontAttributesCreator.h → lib/ios/Factories/RNNFontAttributesCreator.h
diff --git a/lib/ios/RNNFontAttributesCreator.mm → ...ios/Factories/RNNFontAttributesCreator.mm b/lib/ios/RNNFontAttributesCreator.mm → ...ios/Factories/RNNFontAttributesCreator.mm
diff --git a/lib/ios/RNNIconCreator.h → lib/ios/Factories/RNNIconCreator.h b/lib/ios/RNNIconCreator.h → lib/ios/Factories/RNNIconCreator.h
diff --git a/lib/ios/RNNIconCreator.mm → lib/ios/Factories/RNNIconCreator.mm b/lib/ios/RNNIconCreator.mm → lib/ios/Factories/RNNIconCreator.mm
diff --git a/lib/ios/RNNIconDrawer.h → lib/ios/Factories/RNNIconDrawer.h b/lib/ios/RNNIconDrawer.h → lib/ios/Factories/RNNIconDrawer.h
diff --git a/lib/ios/RNNIconDrawer.mm → lib/ios/Factories/RNNIconDrawer.mm b/lib/ios/RNNIconDrawer.mm → lib/ios/Factories/RNNIconDrawer.mm
diff --git a/lib/ios/RNNReactRootViewCreator.h → lib/ios/Factories/RNNReactRootViewCreator.h b/lib/ios/RNNReactRootViewCreator.h → lib/ios/Factories/RNNReactRootViewCreator.h
diff --git a/lib/ios/RNNReactRootViewCreator.mm → lib/ios/Factories/RNNReactRootViewCreator.mm b/lib/ios/RNNReactRootViewCreator.mm → lib/ios/Factories/RNNReactRootViewCreator.mm
diff --git a/lib/ios/RNNTabBarItemCreator.h → lib/ios/Factories/RNNTabBarItemCreator.h b/lib/ios/RNNTabBarItemCreator.h → lib/ios/Factories/RNNTabBarItemCreator.h
diff --git a/lib/ios/RNNTabBarItemCreator.mm → lib/ios/Factories/RNNTabBarItemCreator.mm b/lib/ios/RNNTabBarItemCreator.mm → lib/ios/Factories/RNNTabBarItemCreator.mm
diff --git a/lib/ios/RNNControllerFactory.h → lib/ios/Factories/RNNViewControllerFactory.h b/lib/ios/RNNControllerFactory.h → lib/ios/Factories/RNNViewControllerFactory.h
@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-@interface RNNControllerFactory : NSObject
+@interface RNNViewControllerFactory : NSObject
 
 - (instancetype)initWithRootViewCreator:(id<RNNComponentViewCreator>)creator
                            eventEmitter:(RNNEventEmitter *)eventEmitter

diff --git a/lib/ios/TabBarItemAppearanceCreator.h → ...s/Factories/TabBarItemAppearanceCreator.h b/lib/ios/TabBarItemAppearanceCreator.h → ...s/Factories/TabBarItemAppearanceCreator.h
diff --git a/lib/ios/TabBarItemAppearanceCreator.mm → .../Factories/TabBarItemAppearanceCreator.mm b/lib/ios/TabBarItemAppearanceCreator.mm → .../Factories/TabBarItemAppearanceCreator.mm
diff --git a/lib/ios/TabBarItemIOS15Creator.h → lib/ios/Factories/TabBarItemIOS15Creator.h b/lib/ios/TabBarItemIOS15Creator.h → lib/ios/Factories/TabBarItemIOS15Creator.h
diff --git a/lib/ios/TabBarItemIOS15Creator.mm → lib/ios/Factories/TabBarItemIOS15Creator.mm b/lib/ios/TabBarItemIOS15Creator.mm → lib/ios/Factories/TabBarItemIOS15Creator.mm
diff --git a/lib/ios/TopBarPresenterCreator.h → lib/ios/Factories/TopBarPresenterCreator.h b/lib/ios/TopBarPresenterCreator.h → lib/ios/Factories/TopBarPresenterCreator.h
diff --git a/lib/ios/TopBarPresenterCreator.mm → lib/ios/Factories/TopBarPresenterCreator.mm b/lib/ios/TopBarPresenterCreator.mm → lib/ios/Factories/TopBarPresenterCreator.mm
diff --git a/lib/ios/RNNLayoutInfo.h → lib/ios/Layout/RNNLayoutInfo.h b/lib/ios/RNNLayoutInfo.h → lib/ios/Layout/RNNLayoutInfo.h
diff --git a/lib/ios/RNNLayoutInfo.mm → lib/ios/Layout/RNNLayoutInfo.mm b/lib/ios/RNNLayoutInfo.mm → lib/ios/Layout/RNNLayoutInfo.mm
diff --git a/lib/ios/RNNLayoutManager.h → lib/ios/Layout/RNNLayoutManager.h b/lib/ios/RNNLayoutManager.h → lib/ios/Layout/RNNLayoutManager.h
diff --git a/lib/ios/RNNLayoutManager.mm → lib/ios/Layout/RNNLayoutManager.mm b/lib/ios/RNNLayoutManager.mm → lib/ios/Layout/RNNLayoutManager.mm
diff --git a/lib/ios/RNNLayoutNode.h → lib/ios/Layout/RNNLayoutNode.h b/lib/ios/RNNLayoutNode.h → lib/ios/Layout/RNNLayoutNode.h
diff --git a/lib/ios/RNNLayoutNode.mm → lib/ios/Layout/RNNLayoutNode.mm b/lib/ios/RNNLayoutNode.mm → lib/ios/Layout/RNNLayoutNode.mm
diff --git a/lib/ios/RNNLayoutProtocol.h → lib/ios/Layout/RNNLayoutProtocol.h b/lib/ios/RNNLayoutProtocol.h → lib/ios/Layout/RNNLayoutProtocol.h
diff --git a/lib/ios/RNNModalHostViewManagerHandler.h → ...os/Modal/RNNModalHostViewManagerHandler.h b/lib/ios/RNNModalHostViewManagerHandler.h → ...os/Modal/RNNModalHostViewManagerHandler.h
diff --git a/lib/ios/RNNModalHostViewManagerHandler.mm → ...s/Modal/RNNModalHostViewManagerHandler.mm b/lib/ios/RNNModalHostViewManagerHandler.mm → ...s/Modal/RNNModalHostViewManagerHandler.mm
diff --git a/lib/ios/RNNModalManager.h → lib/ios/Modal/RNNModalManager.h b/lib/ios/RNNModalManager.h → lib/ios/Modal/RNNModalManager.h
diff --git a/lib/ios/RNNModalManager.mm → lib/ios/Modal/RNNModalManager.mm b/lib/ios/RNNModalManager.mm → lib/ios/Modal/RNNModalManager.mm
diff --git a/lib/ios/RNNModalManagerEventHandler.h → lib/ios/Modal/RNNModalManagerEventHandler.h b/lib/ios/RNNModalManagerEventHandler.h → lib/ios/Modal/RNNModalManagerEventHandler.h
diff --git a/lib/ios/RNNModalManagerEventHandler.mm → lib/ios/Modal/RNNModalManagerEventHandler.mm b/lib/ios/RNNModalManagerEventHandler.mm → lib/ios/Modal/RNNModalManagerEventHandler.mm
diff --git a/lib/ios/DeprecationOptions.h → lib/ios/Options/DeprecationOptions.h b/lib/ios/DeprecationOptions.h → lib/ios/Options/DeprecationOptions.h
diff --git a/lib/ios/DeprecationOptions.mm → lib/ios/Options/DeprecationOptions.mm b/lib/ios/DeprecationOptions.mm → lib/ios/Options/DeprecationOptions.mm
diff --git a/lib/ios/DotIndicatorOptions.h → lib/ios/Options/DotIndicatorOptions.h b/lib/ios/DotIndicatorOptions.h → lib/ios/Options/DotIndicatorOptions.h
diff --git a/lib/ios/DotIndicatorOptions.mm → lib/ios/Options/DotIndicatorOptions.mm b/lib/ios/DotIndicatorOptions.mm → lib/ios/Options/DotIndicatorOptions.mm
diff --git a/lib/ios/ElementTransitionOptions.h → lib/ios/Options/ElementTransitionOptions.h b/lib/ios/ElementTransitionOptions.h → lib/ios/Options/ElementTransitionOptions.h
diff --git a/lib/ios/ElementTransitionOptions.mm → lib/ios/Options/ElementTransitionOptions.mm b/lib/ios/ElementTransitionOptions.mm → lib/ios/Options/ElementTransitionOptions.mm
diff --git a/lib/ios/RNNAnimationsOptions.h → lib/ios/Options/RNNAnimationsOptions.h b/lib/ios/RNNAnimationsOptions.h → lib/ios/Options/RNNAnimationsOptions.h
diff --git a/lib/ios/RNNAnimationsOptions.mm → lib/ios/Options/RNNAnimationsOptions.mm b/lib/ios/RNNAnimationsOptions.mm → lib/ios/Options/RNNAnimationsOptions.mm
diff --git a/lib/ios/RNNBackButtonOptions.h → lib/ios/Options/RNNBackButtonOptions.h b/lib/ios/RNNBackButtonOptions.h → lib/ios/Options/RNNBackButtonOptions.h
diff --git a/lib/ios/RNNBackButtonOptions.mm → lib/ios/Options/RNNBackButtonOptions.mm b/lib/ios/RNNBackButtonOptions.mm → lib/ios/Options/RNNBackButtonOptions.mm
diff --git a/lib/ios/RNNBackgroundOptions.h → lib/ios/Options/RNNBackgroundOptions.h b/lib/ios/RNNBackgroundOptions.h → lib/ios/Options/RNNBackgroundOptions.h
diff --git a/lib/ios/RNNBackgroundOptions.mm → lib/ios/Options/RNNBackgroundOptions.mm b/lib/ios/RNNBackgroundOptions.mm → lib/ios/Options/RNNBackgroundOptions.mm
diff --git a/lib/ios/RNNBottomTabOptions.h → lib/ios/Options/RNNBottomTabOptions.h b/lib/ios/RNNBottomTabOptions.h → lib/ios/Options/RNNBottomTabOptions.h
diff --git a/lib/ios/RNNBottomTabOptions.mm → lib/ios/Options/RNNBottomTabOptions.mm b/lib/ios/RNNBottomTabOptions.mm → lib/ios/Options/RNNBottomTabOptions.mm
diff --git a/lib/ios/RNNBottomTabsOptions.h → lib/ios/Options/RNNBottomTabsOptions.h b/lib/ios/RNNBottomTabsOptions.h → lib/ios/Options/RNNBottomTabsOptions.h
diff --git a/lib/ios/RNNBottomTabsOptions.mm → lib/ios/Options/RNNBottomTabsOptions.mm b/lib/ios/RNNBottomTabsOptions.mm → lib/ios/Options/RNNBottomTabsOptions.mm
diff --git a/lib/ios/RNNButtonOptions.h → lib/ios/Options/RNNButtonOptions.h b/lib/ios/RNNButtonOptions.h → lib/ios/Options/RNNButtonOptions.h
diff --git a/lib/ios/RNNButtonOptions.mm → lib/ios/Options/RNNButtonOptions.mm b/lib/ios/RNNButtonOptions.mm → lib/ios/Options/RNNButtonOptions.mm
diff --git a/lib/ios/RNNComponentOptions.h → lib/ios/Options/RNNComponentOptions.h b/lib/ios/RNNComponentOptions.h → lib/ios/Options/RNNComponentOptions.h
diff --git a/lib/ios/RNNComponentOptions.mm → lib/ios/Options/RNNComponentOptions.mm b/lib/ios/RNNComponentOptions.mm → lib/ios/Options/RNNComponentOptions.mm
diff --git a/lib/ios/RNNDefaultOptionsHelper.h → lib/ios/Options/RNNDefaultOptionsHelper.h b/lib/ios/RNNDefaultOptionsHelper.h → lib/ios/Options/RNNDefaultOptionsHelper.h
diff --git a/lib/ios/RNNDefaultOptionsHelper.mm → lib/ios/Options/RNNDefaultOptionsHelper.mm b/lib/ios/RNNDefaultOptionsHelper.mm → lib/ios/Options/RNNDefaultOptionsHelper.mm
diff --git a/lib/ios/RNNIconBackgroundOptions.h → lib/ios/Options/RNNIconBackgroundOptions.h b/lib/ios/RNNIconBackgroundOptions.h → lib/ios/Options/RNNIconBackgroundOptions.h
diff --git a/lib/ios/RNNIconBackgroundOptions.mm → lib/ios/Options/RNNIconBackgroundOptions.mm b/lib/ios/RNNIconBackgroundOptions.mm → lib/ios/Options/RNNIconBackgroundOptions.mm
diff --git a/lib/ios/RNNInsetsOptions.h → lib/ios/Options/RNNInsetsOptions.h b/lib/ios/RNNInsetsOptions.h → lib/ios/Options/RNNInsetsOptions.h
diff --git a/lib/ios/RNNInsetsOptions.mm → lib/ios/Options/RNNInsetsOptions.mm b/lib/ios/RNNInsetsOptions.mm → lib/ios/Options/RNNInsetsOptions.mm
diff --git a/lib/ios/RNNLargeTitleOptions.h → lib/ios/Options/RNNLargeTitleOptions.h b/lib/ios/RNNLargeTitleOptions.h → lib/ios/Options/RNNLargeTitleOptions.h
diff --git a/lib/ios/RNNLargeTitleOptions.mm → lib/ios/Options/RNNLargeTitleOptions.mm b/lib/ios/RNNLargeTitleOptions.mm → lib/ios/Options/RNNLargeTitleOptions.mm
diff --git a/lib/ios/RNNLayoutOptions.h → lib/ios/Options/RNNLayoutOptions.h b/lib/ios/RNNLayoutOptions.h → lib/ios/Options/RNNLayoutOptions.h
diff --git a/lib/ios/RNNLayoutOptions.mm → lib/ios/Options/RNNLayoutOptions.mm b/lib/ios/RNNLayoutOptions.mm → lib/ios/Options/RNNLayoutOptions.mm
diff --git a/lib/ios/RNNModalOptions.h → lib/ios/Options/RNNModalOptions.h b/lib/ios/RNNModalOptions.h → lib/ios/Options/RNNModalOptions.h
diff --git a/lib/ios/RNNModalOptions.mm → lib/ios/Options/RNNModalOptions.mm b/lib/ios/RNNModalOptions.mm → lib/ios/Options/RNNModalOptions.mm
diff --git a/lib/ios/RNNNavigationOptions.h → lib/ios/Options/RNNNavigationOptions.h b/lib/ios/RNNNavigationOptions.h → lib/ios/Options/RNNNavigationOptions.h
diff --git a/lib/ios/RNNNavigationOptions.mm → lib/ios/Options/RNNNavigationOptions.mm b/lib/ios/RNNNavigationOptions.mm → lib/ios/Options/RNNNavigationOptions.mm
@@ -1,7 +1,7 @@
 #import "RNNNavigationOptions.h"
 #import "RNNBottomTabsController.h"
 #import "RNNComponentViewController.h"
-#import "RNNSideMenuController.h"
+#import "RNNSideMenuViewController.h"
 #import "RNNSplitViewController.h"
 #import "RNNSplitViewOptions.h"
 #import "RNNStackController.h"

diff --git a/lib/ios/RNNOptions.h → lib/ios/Options/RNNOptions.h b/lib/ios/RNNOptions.h → lib/ios/Options/RNNOptions.h
diff --git a/lib/ios/RNNOptions.mm → lib/ios/Options/RNNOptions.mm b/lib/ios/RNNOptions.mm → lib/ios/Options/RNNOptions.mm
diff --git a/lib/ios/RNNOverlayOptions.h → lib/ios/Options/RNNOverlayOptions.h b/lib/ios/RNNOverlayOptions.h → lib/ios/Options/RNNOverlayOptions.h
diff --git a/lib/ios/RNNOverlayOptions.mm → lib/ios/Options/RNNOverlayOptions.mm b/lib/ios/RNNOverlayOptions.mm → lib/ios/Options/RNNOverlayOptions.mm
diff --git a/lib/ios/RNNPreviewOptions.h → lib/ios/Options/RNNPreviewOptions.h b/lib/ios/RNNPreviewOptions.h → lib/ios/Options/RNNPreviewOptions.h
diff --git a/lib/ios/RNNPreviewOptions.mm → lib/ios/Options/RNNPreviewOptions.mm b/lib/ios/RNNPreviewOptions.mm → lib/ios/Options/RNNPreviewOptions.mm
diff --git a/...NNScrollEdgeAppearanceBackgroundOptions.h → ...NNScrollEdgeAppearanceBackgroundOptions.h b/...NNScrollEdgeAppearanceBackgroundOptions.h → ...NNScrollEdgeAppearanceBackgroundOptions.h
diff --git a/...NScrollEdgeAppearanceBackgroundOptions.mm → ...NScrollEdgeAppearanceBackgroundOptions.mm b/...NScrollEdgeAppearanceBackgroundOptions.mm → ...NScrollEdgeAppearanceBackgroundOptions.mm
diff --git a/lib/ios/RNNScrollEdgeAppearanceOptions.h → .../Options/RNNScrollEdgeAppearanceOptions.h b/lib/ios/RNNScrollEdgeAppearanceOptions.h → .../Options/RNNScrollEdgeAppearanceOptions.h
diff --git a/lib/ios/RNNScrollEdgeAppearanceOptions.mm → ...Options/RNNScrollEdgeAppearanceOptions.mm b/lib/ios/RNNScrollEdgeAppearanceOptions.mm → ...Options/RNNScrollEdgeAppearanceOptions.mm
diff --git a/lib/ios/RNNSearchBarOptions.h → lib/ios/Options/RNNSearchBarOptions.h b/lib/ios/RNNSearchBarOptions.h → lib/ios/Options/RNNSearchBarOptions.h
diff --git a/lib/ios/RNNSearchBarOptions.mm → lib/ios/Options/RNNSearchBarOptions.mm b/lib/ios/RNNSearchBarOptions.mm → lib/ios/Options/RNNSearchBarOptions.mm
diff --git a/lib/ios/RNNShadowOptions.h → lib/ios/Options/RNNShadowOptions.h b/lib/ios/RNNShadowOptions.h → lib/ios/Options/RNNShadowOptions.h
diff --git a/lib/ios/RNNShadowOptions.mm → lib/ios/Options/RNNShadowOptions.mm b/lib/ios/RNNShadowOptions.mm → lib/ios/Options/RNNShadowOptions.mm
diff --git a/lib/ios/RNNSharedElementAnimationOptions.h → ...ptions/RNNSharedElementAnimationOptions.h b/lib/ios/RNNSharedElementAnimationOptions.h → ...ptions/RNNSharedElementAnimationOptions.h
diff --git a/lib/ios/RNNSharedElementAnimationOptions.mm → ...tions/RNNSharedElementAnimationOptions.mm b/lib/ios/RNNSharedElementAnimationOptions.mm → ...tions/RNNSharedElementAnimationOptions.mm
diff --git a/lib/ios/RNNSideMenuOptions.h → lib/ios/Options/RNNSideMenuOptions.h b/lib/ios/RNNSideMenuOptions.h → lib/ios/Options/RNNSideMenuOptions.h
diff --git a/lib/ios/RNNSideMenuOptions.mm → lib/ios/Options/RNNSideMenuOptions.mm b/lib/ios/RNNSideMenuOptions.mm → lib/ios/Options/RNNSideMenuOptions.mm
diff --git a/lib/ios/RNNSideMenuSideOptions.h → lib/ios/Options/RNNSideMenuSideOptions.h b/lib/ios/RNNSideMenuSideOptions.h → lib/ios/Options/RNNSideMenuSideOptions.h
diff --git a/lib/ios/RNNSideMenuSideOptions.mm → lib/ios/Options/RNNSideMenuSideOptions.mm b/lib/ios/RNNSideMenuSideOptions.mm → lib/ios/Options/RNNSideMenuSideOptions.mm
diff --git a/lib/ios/RNNSplitViewOptions.h → lib/ios/Options/RNNSplitViewOptions.h b/lib/ios/RNNSplitViewOptions.h → lib/ios/Options/RNNSplitViewOptions.h
diff --git a/lib/ios/RNNSplitViewOptions.mm → lib/ios/Options/RNNSplitViewOptions.mm b/lib/ios/RNNSplitViewOptions.mm → lib/ios/Options/RNNSplitViewOptions.mm
diff --git a/lib/ios/RNNStatusBarOptions.h → lib/ios/Options/RNNStatusBarOptions.h b/lib/ios/RNNStatusBarOptions.h → lib/ios/Options/RNNStatusBarOptions.h
diff --git a/lib/ios/RNNStatusBarOptions.mm → lib/ios/Options/RNNStatusBarOptions.mm b/lib/ios/RNNStatusBarOptions.mm → lib/ios/Options/RNNStatusBarOptions.mm
diff --git a/lib/ios/RNNSubtitleOptions.h → lib/ios/Options/RNNSubtitleOptions.h b/lib/ios/RNNSubtitleOptions.h → lib/ios/Options/RNNSubtitleOptions.h
diff --git a/lib/ios/RNNSubtitleOptions.mm → lib/ios/Options/RNNSubtitleOptions.mm b/lib/ios/RNNSubtitleOptions.mm → lib/ios/Options/RNNSubtitleOptions.mm
diff --git a/lib/ios/RNNTitleOptions.h → lib/ios/Options/RNNTitleOptions.h b/lib/ios/RNNTitleOptions.h → lib/ios/Options/RNNTitleOptions.h
diff --git a/lib/ios/RNNTitleOptions.mm → lib/ios/Options/RNNTitleOptions.mm b/lib/ios/RNNTitleOptions.mm → lib/ios/Options/RNNTitleOptions.mm
diff --git a/lib/ios/RNNTopBarOptions.h → lib/ios/Options/RNNTopBarOptions.h b/lib/ios/RNNTopBarOptions.h → lib/ios/Options/RNNTopBarOptions.h
diff --git a/lib/ios/RNNTopBarOptions.mm → lib/ios/Options/RNNTopBarOptions.mm b/lib/ios/RNNTopBarOptions.mm → lib/ios/Options/RNNTopBarOptions.mm
diff --git a/lib/ios/RNNTopTabOptions.h → lib/ios/Options/RNNTopTabOptions.h b/lib/ios/RNNTopTabOptions.h → lib/ios/Options/RNNTopTabOptions.h
diff --git a/lib/ios/RNNTopTabOptions.mm → lib/ios/Options/RNNTopTabOptions.mm b/lib/ios/RNNTopTabOptions.mm → lib/ios/Options/RNNTopTabOptions.mm
diff --git a/lib/ios/RNNTopTabsOptions.h → lib/ios/Options/RNNTopTabsOptions.h b/lib/ios/RNNTopTabsOptions.h → lib/ios/Options/RNNTopTabsOptions.h
diff --git a/lib/ios/RNNTopTabsOptions.mm → lib/ios/Options/RNNTopTabsOptions.mm b/lib/ios/RNNTopTabsOptions.mm → lib/ios/Options/RNNTopTabsOptions.mm
diff --git a/lib/ios/SharedElementTransitionOptions.h → .../Options/SharedElementTransitionOptions.h b/lib/ios/SharedElementTransitionOptions.h → .../Options/SharedElementTransitionOptions.h
diff --git a/lib/ios/SharedElementTransitionOptions.mm → ...Options/SharedElementTransitionOptions.mm b/lib/ios/SharedElementTransitionOptions.mm → ...Options/SharedElementTransitionOptions.mm
diff --git a/lib/ios/TransitionDetailsOptions.h → lib/ios/Options/TransitionDetailsOptions.h b/lib/ios/TransitionDetailsOptions.h → lib/ios/Options/TransitionDetailsOptions.h
diff --git a/lib/ios/TransitionDetailsOptions.mm → lib/ios/Options/TransitionDetailsOptions.mm b/lib/ios/TransitionDetailsOptions.mm → lib/ios/Options/TransitionDetailsOptions.mm
diff --git a/lib/ios/TransitionOptions.h → lib/ios/Options/TransitionOptions.h b/lib/ios/TransitionOptions.h → lib/ios/Options/TransitionOptions.h
diff --git a/lib/ios/TransitionOptions.mm → lib/ios/Options/TransitionOptions.mm b/lib/ios/TransitionOptions.mm → lib/ios/Options/TransitionOptions.mm
diff --git a/lib/ios/WindowOptions.h → lib/ios/Options/WindowOptions.h b/lib/ios/WindowOptions.h → lib/ios/Options/WindowOptions.h
diff --git a/lib/ios/WindowOptions.mm → lib/ios/Options/WindowOptions.mm b/lib/ios/WindowOptions.mm → lib/ios/Options/WindowOptions.mm
diff --git a/lib/ios/RNNOverlayManager.h → lib/ios/Overlay/RNNOverlayManager.h b/lib/ios/RNNOverlayManager.h → lib/ios/Overlay/RNNOverlayManager.h
diff --git a/lib/ios/RNNOverlayManager.mm → lib/ios/Overlay/RNNOverlayManager.mm b/lib/ios/RNNOverlayManager.mm → lib/ios/Overlay/RNNOverlayManager.mm
diff --git a/lib/ios/RNNOverlayWindow.h → lib/ios/Overlay/RNNOverlayWindow.h b/lib/ios/RNNOverlayWindow.h → lib/ios/Overlay/RNNOverlayWindow.h
diff --git a/lib/ios/RNNOverlayWindow.mm → lib/ios/Overlay/RNNOverlayWindow.mm b/lib/ios/RNNOverlayWindow.mm → lib/ios/Overlay/RNNOverlayWindow.mm
diff --git a/lib/ios/Bool.h → lib/ios/Params/Bool.h b/lib/ios/Bool.h → lib/ios/Params/Bool.h
diff --git a/lib/ios/Bool.mm → lib/ios/Params/Bool.mm b/lib/ios/Bool.mm → lib/ios/Params/Bool.mm
diff --git a/lib/ios/Color.h → lib/ios/Params/Color.h b/lib/ios/Color.h → lib/ios/Params/Color.h
diff --git a/lib/ios/Color.mm → lib/ios/Params/Color.mm b/lib/ios/Color.mm → lib/ios/Params/Color.mm
diff --git a/lib/ios/Double.h → lib/ios/Params/Double.h b/lib/ios/Double.h → lib/ios/Params/Double.h
diff --git a/lib/ios/Double.mm → lib/ios/Params/Double.mm b/lib/ios/Double.mm → lib/ios/Params/Double.mm
diff --git a/lib/ios/Enum.h → lib/ios/Params/Enum.h b/lib/ios/Enum.h → lib/ios/Params/Enum.h
diff --git a/lib/ios/Enum.mm → lib/ios/Params/Enum.mm b/lib/ios/Enum.mm → lib/ios/Params/Enum.mm
diff --git a/lib/ios/Image.h → lib/ios/Params/Image.h b/lib/ios/Image.h → lib/ios/Params/Image.h
diff --git a/lib/ios/Image.mm → lib/ios/Params/Image.mm b/lib/ios/Image.mm → lib/ios/Params/Image.mm
diff --git a/lib/ios/IntNumber.h → lib/ios/Params/IntNumber.h b/lib/ios/IntNumber.h → lib/ios/Params/IntNumber.h
diff --git a/lib/ios/IntNumber.mm → lib/ios/Params/IntNumber.mm b/lib/ios/IntNumber.mm → lib/ios/Params/IntNumber.mm
diff --git a/lib/ios/NoColor.h → lib/ios/Params/NoColor.h b/lib/ios/NoColor.h → lib/ios/Params/NoColor.h
diff --git a/lib/ios/NoColor.mm → lib/ios/Params/NoColor.mm b/lib/ios/NoColor.mm → lib/ios/Params/NoColor.mm
diff --git a/lib/ios/NullBool.h → lib/ios/Params/NullBool.h b/lib/ios/NullBool.h → lib/ios/Params/NullBool.h
diff --git a/lib/ios/NullBool.mm → lib/ios/Params/NullBool.mm b/lib/ios/NullBool.mm → lib/ios/Params/NullBool.mm
diff --git a/lib/ios/NullColor.h → lib/ios/Params/NullColor.h b/lib/ios/NullColor.h → lib/ios/Params/NullColor.h
diff --git a/lib/ios/NullColor.mm → lib/ios/Params/NullColor.mm b/lib/ios/NullColor.mm → lib/ios/Params/NullColor.mm
diff --git a/lib/ios/NullDictionary.h → lib/ios/Params/NullDictionary.h b/lib/ios/NullDictionary.h → lib/ios/Params/NullDictionary.h
diff --git a/lib/ios/NullDictionary.mm → lib/ios/Params/NullDictionary.mm b/lib/ios/NullDictionary.mm → lib/ios/Params/NullDictionary.mm
diff --git a/lib/ios/NullDouble.h → lib/ios/Params/NullDouble.h b/lib/ios/NullDouble.h → lib/ios/Params/NullDouble.h
diff --git a/lib/ios/NullDouble.mm → lib/ios/Params/NullDouble.mm b/lib/ios/NullDouble.mm → lib/ios/Params/NullDouble.mm
diff --git a/lib/ios/NullEnum.h → lib/ios/Params/NullEnum.h b/lib/ios/NullEnum.h → lib/ios/Params/NullEnum.h
diff --git a/lib/ios/NullEnum.mm → lib/ios/Params/NullEnum.mm b/lib/ios/NullEnum.mm → lib/ios/Params/NullEnum.mm
diff --git a/lib/ios/NullImage.h → lib/ios/Params/NullImage.h b/lib/ios/NullImage.h → lib/ios/Params/NullImage.h
diff --git a/lib/ios/NullImage.mm → lib/ios/Params/NullImage.mm b/lib/ios/NullImage.mm → lib/ios/Params/NullImage.mm
diff --git a/lib/ios/NullIntNumber.h → lib/ios/Params/NullIntNumber.h b/lib/ios/NullIntNumber.h → lib/ios/Params/NullIntNumber.h
diff --git a/lib/ios/NullIntNumber.mm → lib/ios/Params/NullIntNumber.mm b/lib/ios/NullIntNumber.mm → lib/ios/Params/NullIntNumber.mm
diff --git a/lib/ios/NullNumber.h → lib/ios/Params/NullNumber.h b/lib/ios/NullNumber.h → lib/ios/Params/NullNumber.h
diff --git a/lib/ios/NullNumber.mm → lib/ios/Params/NullNumber.mm b/lib/ios/NullNumber.mm → lib/ios/Params/NullNumber.mm
diff --git a/lib/ios/NullText.h → lib/ios/Params/NullText.h b/lib/ios/NullText.h → lib/ios/Params/NullText.h
diff --git a/lib/ios/NullText.mm → lib/ios/Params/NullText.mm b/lib/ios/NullText.mm → lib/ios/Params/NullText.mm
diff --git a/lib/ios/Number.h → lib/ios/Params/Number.h b/lib/ios/Number.h → lib/ios/Params/Number.h
diff --git a/lib/ios/Number.mm → lib/ios/Params/Number.mm b/lib/ios/Number.mm → lib/ios/Params/Number.mm
diff --git a/lib/ios/Param.h → lib/ios/Params/Param.h b/lib/ios/Param.h → lib/ios/Params/Param.h
diff --git a/lib/ios/Param.mm → lib/ios/Params/Param.mm b/lib/ios/Param.mm → lib/ios/Params/Param.mm
diff --git a/lib/ios/RNNDictionary.h → lib/ios/Params/RNNDictionary.h b/lib/ios/RNNDictionary.h → lib/ios/Params/RNNDictionary.h
diff --git a/lib/ios/RNNDictionary.mm → lib/ios/Params/RNNDictionary.mm b/lib/ios/RNNDictionary.mm → lib/ios/Params/RNNDictionary.mm
diff --git a/lib/ios/Text.h → lib/ios/Params/Text.h b/lib/ios/Text.h → lib/ios/Params/Text.h
diff --git a/lib/ios/Text.mm → lib/ios/Params/Text.mm b/lib/ios/Text.mm → lib/ios/Params/Text.mm
diff --git a/lib/ios/TimeInterval.h → lib/ios/Params/TimeInterval.h b/lib/ios/TimeInterval.h → lib/ios/Params/TimeInterval.h
diff --git a/lib/ios/TimeInterval.mm → lib/ios/Params/TimeInterval.mm b/lib/ios/TimeInterval.mm → lib/ios/Params/TimeInterval.mm
diff --git a/lib/ios/BottomTabPresenter.h → lib/ios/Presenters/BottomTabPresenter.h b/lib/ios/BottomTabPresenter.h → lib/ios/Presenters/BottomTabPresenter.h
diff --git a/lib/ios/BottomTabPresenter.mm → lib/ios/Presenters/BottomTabPresenter.mm b/lib/ios/BottomTabPresenter.mm → lib/ios/Presenters/BottomTabPresenter.mm
diff --git a/lib/ios/BottomTabsAppearancePresenter.h → ...resenters/BottomTabsAppearancePresenter.h b/lib/ios/BottomTabsAppearancePresenter.h → ...resenters/BottomTabsAppearancePresenter.h
diff --git a/lib/ios/BottomTabsAppearancePresenter.mm → ...esenters/BottomTabsAppearancePresenter.mm b/lib/ios/BottomTabsAppearancePresenter.mm → ...esenters/BottomTabsAppearancePresenter.mm
diff --git a/lib/ios/BottomTabsBasePresenter.h → lib/ios/Presenters/BottomTabsBasePresenter.h b/lib/ios/BottomTabsBasePresenter.h → lib/ios/Presenters/BottomTabsBasePresenter.h
diff --git a/lib/ios/BottomTabsBasePresenter.mm → ...ios/Presenters/BottomTabsBasePresenter.mm b/lib/ios/BottomTabsBasePresenter.mm → ...ios/Presenters/BottomTabsBasePresenter.mm
diff --git a/lib/ios/RNNBasePresenter.h → lib/ios/Presenters/RNNBasePresenter.h b/lib/ios/RNNBasePresenter.h → lib/ios/Presenters/RNNBasePresenter.h
diff --git a/lib/ios/RNNBasePresenter.mm → lib/ios/Presenters/RNNBasePresenter.mm b/lib/ios/RNNBasePresenter.mm → lib/ios/Presenters/RNNBasePresenter.mm
diff --git a/lib/ios/RNNBottomTabsPresenter.h → lib/ios/Presenters/RNNBottomTabsPresenter.h b/lib/ios/RNNBottomTabsPresenter.h → lib/ios/Presenters/RNNBottomTabsPresenter.h
diff --git a/lib/ios/RNNBottomTabsPresenter.mm → lib/ios/Presenters/RNNBottomTabsPresenter.mm b/lib/ios/RNNBottomTabsPresenter.mm → lib/ios/Presenters/RNNBottomTabsPresenter.mm
diff --git a/lib/ios/RNNButtonsPresenter.h → lib/ios/Presenters/RNNButtonsPresenter.h b/lib/ios/RNNButtonsPresenter.h → lib/ios/Presenters/RNNButtonsPresenter.h
diff --git a/lib/ios/RNNButtonsPresenter.mm → lib/ios/Presenters/RNNButtonsPresenter.mm b/lib/ios/RNNButtonsPresenter.mm → lib/ios/Presenters/RNNButtonsPresenter.mm
diff --git a/lib/ios/RNNComponentPresenter.h → lib/ios/Presenters/RNNComponentPresenter.h b/lib/ios/RNNComponentPresenter.h → lib/ios/Presenters/RNNComponentPresenter.h
diff --git a/lib/ios/RNNComponentPresenter.mm → lib/ios/Presenters/RNNComponentPresenter.mm b/lib/ios/RNNComponentPresenter.mm → lib/ios/Presenters/RNNComponentPresenter.mm
diff --git a/lib/ios/RNNDotIndicatorPresenter.h → ...ios/Presenters/RNNDotIndicatorPresenter.h b/lib/ios/RNNDotIndicatorPresenter.h → ...ios/Presenters/RNNDotIndicatorPresenter.h
diff --git a/lib/ios/RNNDotIndicatorPresenter.mm → ...os/Presenters/RNNDotIndicatorPresenter.mm b/lib/ios/RNNDotIndicatorPresenter.mm → ...os/Presenters/RNNDotIndicatorPresenter.mm
diff --git a/lib/ios/RNNSideMenuPresenter.h → lib/ios/Presenters/RNNSideMenuPresenter.h b/lib/ios/RNNSideMenuPresenter.h → lib/ios/Presenters/RNNSideMenuPresenter.h
diff --git a/lib/ios/RNNSideMenuPresenter.mm → lib/ios/Presenters/RNNSideMenuPresenter.mm b/lib/ios/RNNSideMenuPresenter.mm → lib/ios/Presenters/RNNSideMenuPresenter.mm
@@ -1,5 +1,5 @@
 #import "RNNSideMenuPresenter.h"
-#import "RNNSideMenuController.h"
+#import "RNNSideMenuViewController.h"
 
 @implementation RNNSideMenuPresenter
 
@@ -130,8 +130,8 @@ - (void)mergeOptions:(RNNNavigationOptions *)options
     }
 }
 
-- (RNNSideMenuController *)sideMenuController {
-    return (RNNSideMenuController *)self.boundViewController;
+- (RNNSideMenuViewController *)sideMenuController {
+    return (RNNSideMenuViewController *)self.boundViewController;
 }
 
 @end
diff --git a/lib/ios/RNNSplitViewControllerPresenter.h → ...senters/RNNSplitViewControllerPresenter.h b/lib/ios/RNNSplitViewControllerPresenter.h → ...senters/RNNSplitViewControllerPresenter.h
diff --git a/lib/ios/RNNSplitViewControllerPresenter.mm → ...enters/RNNSplitViewControllerPresenter.mm b/lib/ios/RNNSplitViewControllerPresenter.mm → ...enters/RNNSplitViewControllerPresenter.mm
diff --git a/lib/ios/RNNStackPresenter.h → lib/ios/Presenters/RNNStackPresenter.h b/lib/ios/RNNStackPresenter.h → lib/ios/Presenters/RNNStackPresenter.h
diff --git a/lib/ios/RNNStackPresenter.mm → lib/ios/Presenters/RNNStackPresenter.mm b/lib/ios/RNNStackPresenter.mm → lib/ios/Presenters/RNNStackPresenter.mm
diff --git a/lib/ios/TopBarAppearancePresenter.h → ...os/Presenters/TopBarAppearancePresenter.h b/lib/ios/TopBarAppearancePresenter.h → ...os/Presenters/TopBarAppearancePresenter.h
diff --git a/lib/ios/TopBarAppearancePresenter.mm → ...s/Presenters/TopBarAppearancePresenter.mm b/lib/ios/TopBarAppearancePresenter.mm → ...s/Presenters/TopBarAppearancePresenter.mm
diff --git a/lib/ios/TopBarPresenter.h → lib/ios/Presenters/TopBarPresenter.h b/lib/ios/TopBarPresenter.h → lib/ios/Presenters/TopBarPresenter.h
diff --git a/lib/ios/TopBarPresenter.mm → lib/ios/Presenters/TopBarPresenter.mm b/lib/ios/TopBarPresenter.mm → lib/ios/Presenters/TopBarPresenter.mm
diff --git a/lib/ios/TopBarTitlePresenter.h → lib/ios/Presenters/TopBarTitlePresenter.h b/lib/ios/TopBarTitlePresenter.h → lib/ios/Presenters/TopBarTitlePresenter.h
diff --git a/lib/ios/TopBarTitlePresenter.mm → lib/ios/Presenters/TopBarTitlePresenter.mm b/lib/ios/TopBarTitlePresenter.mm → lib/ios/Presenters/TopBarTitlePresenter.mm
diff --git a/lib/ios/RNNElement.h b/lib/ios/RNNElement.h
diff --git a/lib/ios/RNNElement.mm b/lib/ios/RNNElement.mm
diff --git a/lib/ios/RNNElementView.h b/lib/ios/RNNElementView.h
diff --git a/lib/ios/RNNElementView.mm b/lib/ios/RNNElementView.mm
diff --git a/lib/ios/RNNLeafProtocol.h b/lib/ios/RNNLeafProtocol.h
diff --git a/lib/ios/RNNSwizzles.h b/lib/ios/RNNSwizzles.h
diff --git a/lib/ios/RNNSwizzles.m b/lib/ios/RNNSwizzles.m
diff --git a/lib/ios/ReactNativeNavigation.mm b/lib/ios/ReactNativeNavigation.mm
@@ -4,7 +4,7 @@
 
 #import "RNNBridgeManager.h"
 #import "RNNLayoutManager.h"
-#import "RNNSplashScreen.h"
+#import "RNNSplashScreenViewController.h"
 
 @interface ReactNativeNavigation ()
 
@@ -47,7 +47,7 @@ + (void)registerExternalHostComponent:(NSString *)name callback:(RNNExternalHost
 
 - (void)bootstrapWithHost:(RCTHost *)host {
     self.turboManager = [[RNNTurboManager alloc] initWithHost:host mainWindow:[self mainWindow]];
-    [RNNSplashScreen showOnWindow:[self mainWindow]];
+    [RNNSplashScreenViewController showOnWindow:[self mainWindow]];
 }
 
 + (RCTHost *)getHost {
@@ -84,7 +84,7 @@ - (RNNBridgeManager *)getBridgeManagerForBridge:(RCTBridge *)bridge {
 }
 
 - (void)bootstrapWithBridge:(RCTBridge *)bridge {
-    [RNNSplashScreen showOnWindow:[self mainWindow]];
+    [RNNSplashScreenViewController showOnWindow:[self mainWindow]];
 }
 
 #pragma mark - instance

diff --git a/...MDrawerController/MMDrawerBarButtonItem.h → ...MDrawerController/MMDrawerBarButtonItem.h b/...MDrawerController/MMDrawerBarButtonItem.h → ...MDrawerController/MMDrawerBarButtonItem.h
diff --git a/...DrawerController/MMDrawerBarButtonItem.mm → ...DrawerController/MMDrawerBarButtonItem.mm b/...DrawerController/MMDrawerBarButtonItem.mm → ...DrawerController/MMDrawerBarButtonItem.mm
diff --git a/...rController/MMDrawerController+Subclass.h → ...rController/MMDrawerController+Subclass.h b/...rController/MMDrawerController+Subclass.h → ...rController/MMDrawerController+Subclass.h
diff --git a/...u/MMDrawerController/MMDrawerController.h → ...u/MMDrawerController/MMDrawerController.h b/...u/MMDrawerController/MMDrawerController.h → ...u/MMDrawerController/MMDrawerController.h
diff --git a/.../MMDrawerController/MMDrawerController.mm → .../MMDrawerController/MMDrawerController.mm b/.../MMDrawerController/MMDrawerController.mm → .../MMDrawerController/MMDrawerController.mm
diff --git a/.../MMDrawerController/MMDrawerVisualState.h → .../MMDrawerController/MMDrawerVisualState.h b/.../MMDrawerController/MMDrawerVisualState.h → .../MMDrawerController/MMDrawerVisualState.h
diff --git a/...MMDrawerController/MMDrawerVisualState.mm → ...MMDrawerController/MMDrawerVisualState.mm b/...MMDrawerController/MMDrawerVisualState.mm → ...MMDrawerController/MMDrawerVisualState.mm
diff --git a/...oller/MMExampleDrawerVisualStateManager.h → ...oller/MMExampleDrawerVisualStateManager.h b/...oller/MMExampleDrawerVisualStateManager.h → ...oller/MMExampleDrawerVisualStateManager.h
diff --git a/...ller/MMExampleDrawerVisualStateManager.mm → ...ller/MMExampleDrawerVisualStateManager.mm b/...ller/MMExampleDrawerVisualStateManager.mm → ...ller/MMExampleDrawerVisualStateManager.mm
diff --git a/...ler/UIViewController+MMDrawerController.h → ...ler/UIViewController+MMDrawerController.h b/...ler/UIViewController+MMDrawerController.h → ...ler/UIViewController+MMDrawerController.h
diff --git a/...er/UIViewController+MMDrawerController.mm → ...er/UIViewController+MMDrawerController.mm b/...er/UIViewController+MMDrawerController.mm → ...er/UIViewController+MMDrawerController.mm
diff --git a/lib/ios/SideMenuOpenMode.h → lib/ios/SideMenu/SideMenuOpenMode.h b/lib/ios/SideMenuOpenMode.h → lib/ios/SideMenu/SideMenuOpenMode.h
@@ -1,4 +1,4 @@
-#import "Number.h"
+#import "ReactNativeNavigation/Number.h"
 
 @interface SideMenuOpenMode : Number