diff --git a/.gitignore b/.gitignore
index ca81c11f6f7463ea67276360e262747dfa2899df..00c5396c76ffe6fa5ac187bc41006d10514949b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,11 @@ npm-debug.log
 #####
 # Android
 
-android/local.properties
-android/*.iml
+lib/android/local.properties
+lib/android/*.iml
+lib/android/.idea
+lib/android/build
+lib/android/.gradle
 
 #####
 # OS X temporary files that should never be committed
@@ -187,10 +190,6 @@ coverage/
 package-lock.json
 
 .history
-android/.idea
-android/build
 
 # Typescript build
 lib/dist/
-
-android/.gradle
\ No newline at end of file
diff --git a/docs_old/installation.md b/docs_old/installation.md
index fea49f869f43648730f014c7979f63ca87817ce8..0bf20b4f8248978b95288b6ff2924b757fcbf83f 100644
--- a/docs_old/installation.md
+++ b/docs_old/installation.md
@@ -54,7 +54,7 @@ Add a reference to the library's native code in your global `settings.gradle`:
 
 ```gradle
 include ':reactnativenotifications'
-project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android/app')
+project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/lib/android/app')
 ```
 
 Declare the library as a dependency in your **app-project's** `build.gradle`:
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
index 8e11e07977ef2c2b523d9634448ee393b32c5492..ac64752eb16eaf7e95e264b658f241d92480a7b9 100644
--- a/example/android/settings.gradle
+++ b/example/android/settings.gradle
@@ -1,4 +1,4 @@
 include ':myapplication'
 
 include ':react-native-notifications'
-project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../../android/app')
\ No newline at end of file
+project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../../lib/android/app')
\ No newline at end of file
diff --git a/example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj b/example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj
index 8925461ff1a79ce7fc8b79e5e78300183aaad788..d3b1070605a4777a4415dd748ce2f0595bb328f1 100644
--- a/example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj
+++ b/example/ios/NotificationsExampleApp.xcodeproj/project.pbxproj
@@ -304,7 +304,7 @@
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
 		832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
 		D84861172267695100E9103D /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
-		D85498C21D97B31100DEEE06 /* RNNotifications.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNNotifications.xcodeproj; path = ../../RNNotifications/RNNotifications.xcodeproj; sourceTree = "<group>"; };
+		D85498C21D97B31100DEEE06 /* RNNotifications.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNNotifications.xcodeproj; path = ../../lib/ios/RNNotifications.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -936,7 +936,7 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../node_modules/react-native/React/**",
-					"$(SRCROOT)/../node_modules/react-native-notifications/RNNotifications/**",
+					"$(SRCROOT)/../node_modules/react-native-notifications/lib/ios/**",
 				);
 				INFOPLIST_FILE = NotificationsExampleApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -961,7 +961,7 @@
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../node_modules/react-native/React/**",
-					"$(SRCROOT)/../node_modules/react-native-notifications/RNNotifications/**",
+					"$(SRCROOT)/../node_modules/react-native-notifications/lib/ios/**",
 				);
 				INFOPLIST_FILE = NotificationsExampleApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
diff --git a/example/ios/NotificationsExampleApp.xcodeproj/xcshareddata/xcschemes/NotificationsExampleApp.xcscheme b/example/ios/NotificationsExampleApp.xcodeproj/xcshareddata/xcschemes/NotificationsExampleApp.xcscheme
index 871fd852f03bd0290822b44411485cc5b87e70d6..f4ed799229d8d7fcd93ae4641f7878cd1496395c 100644
--- a/example/ios/NotificationsExampleApp.xcodeproj/xcshareddata/xcschemes/NotificationsExampleApp.xcscheme
+++ b/example/ios/NotificationsExampleApp.xcodeproj/xcshareddata/xcschemes/NotificationsExampleApp.xcscheme
@@ -70,7 +70,7 @@
             BlueprintIdentifier = "508CE7C722D12B2600357815"
             BuildableName = "RNNotificationsTests.xctest"
             BlueprintName = "RNNotificationsTests"
-            ReferencedContainer = "container:../../RNNotifications/RNNotifications.xcodeproj">
+            ReferencedContainer = "container:../../lib/ios/RNNotifications.xcodeproj">
          </BuildableReference>
       </CodeCoverageTargets>
       <Testables>
@@ -81,7 +81,7 @@
                BlueprintIdentifier = "508CE7C722D12B2600357815"
                BuildableName = "RNNotificationsTests.xctest"
                BlueprintName = "RNNotificationsTests"
-               ReferencedContainer = "container:../../RNNotifications/RNNotifications.xcodeproj">
+               ReferencedContainer = "container:../../lib/ios/RNNotifications.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
diff --git a/android/.project b/lib/android/.project
similarity index 100%
rename from android/.project
rename to lib/android/.project
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/lib/android/.settings/org.eclipse.buildship.core.prefs
similarity index 100%
rename from android/.settings/org.eclipse.buildship.core.prefs
rename to lib/android/.settings/org.eclipse.buildship.core.prefs
diff --git a/android/app/.gitignore b/lib/android/app/.gitignore
similarity index 100%
rename from android/app/.gitignore
rename to lib/android/app/.gitignore
diff --git a/android/app/.gradle/4.10/fileChanges/last-build.bin b/lib/android/app/.gradle/4.10/fileChanges/last-build.bin
similarity index 100%
rename from android/app/.gradle/4.10/fileChanges/last-build.bin
rename to lib/android/app/.gradle/4.10/fileChanges/last-build.bin
diff --git a/android/app/.gradle/4.10/fileHashes/fileHashes.bin b/lib/android/app/.gradle/4.10/fileHashes/fileHashes.bin
similarity index 100%
rename from android/app/.gradle/4.10/fileHashes/fileHashes.bin
rename to lib/android/app/.gradle/4.10/fileHashes/fileHashes.bin
diff --git a/android/app/.gradle/4.10/gc.properties b/lib/android/app/.gradle/4.10/gc.properties
similarity index 100%
rename from android/app/.gradle/4.10/gc.properties
rename to lib/android/app/.gradle/4.10/gc.properties
diff --git a/android/app/.gradle/5.5.1/fileChanges/last-build.bin b/lib/android/app/.gradle/5.5.1/fileChanges/last-build.bin
similarity index 100%
rename from android/app/.gradle/5.5.1/fileChanges/last-build.bin
rename to lib/android/app/.gradle/5.5.1/fileChanges/last-build.bin
diff --git a/android/app/.gradle/5.5.1/gc.properties b/lib/android/app/.gradle/5.5.1/gc.properties
similarity index 100%
rename from android/app/.gradle/5.5.1/gc.properties
rename to lib/android/app/.gradle/5.5.1/gc.properties
diff --git a/android/app/build.gradle b/lib/android/app/build.gradle
similarity index 100%
rename from android/app/build.gradle
rename to lib/android/app/build.gradle
diff --git a/android/app/local.properties b/lib/android/app/local.properties
similarity index 100%
rename from android/app/local.properties
rename to lib/android/app/local.properties
diff --git a/android/app/proguard-rules.pro b/lib/android/app/proguard-rules.pro
similarity index 100%
rename from android/app/proguard-rules.pro
rename to lib/android/app/proguard-rules.pro
diff --git a/android/app/src/main/AndroidManifest.xml b/lib/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from android/app/src/main/AndroidManifest.xml
rename to lib/android/app/src/main/AndroidManifest.xml
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/Defs.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/Defs.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/Defs.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/Defs.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/AppLaunchHelper.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/AppLaunchHelper.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/AppLaunchHelper.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/AppLaunchHelper.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacade.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacade.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacade.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacade.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacadeHolder.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacadeHolder.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacadeHolder.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/AppLifecycleFacadeHolder.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/InitialNotificationHolder.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/InitialNotificationHolder.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/InitialNotificationHolder.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/InitialNotificationHolder.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/JsIOHelper.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/JsIOHelper.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/JsIOHelper.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/JsIOHelper.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/ProxyService.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/ProxyService.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/ProxyService.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/ProxyService.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/ReactAppLifecycleFacade.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/INotificationsApplication.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/INotificationsApplication.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/notification/INotificationsApplication.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/INotificationsApplication.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/IPushNotification.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/IPushNotification.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/notification/IPushNotification.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/IPushNotification.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/INotificationsDrawerApplication.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/INotificationsDrawerApplication.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/INotificationsDrawerApplication.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/INotificationsDrawerApplication.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/IPushNotificationsDrawer.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/IPushNotificationsDrawer.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/IPushNotificationsDrawer.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/IPushNotificationsDrawer.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawer.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawer.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawer.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawer.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmInstanceIdListenerService.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmInstanceIdListenerService.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmInstanceIdListenerService.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmInstanceIdListenerService.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmInstanceIdRefreshHandlerService.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmInstanceIdRefreshHandlerService.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmInstanceIdRefreshHandlerService.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmInstanceIdRefreshHandlerService.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/fcm/IFcmToken.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/IFcmToken.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/fcm/IFcmToken.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/IFcmToken.java
diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/fcm/INotificationsFcmApplication.java b/lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/INotificationsFcmApplication.java
similarity index 100%
rename from android/app/src/main/java/com/wix/reactnativenotifications/fcm/INotificationsFcmApplication.java
rename to lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/INotificationsFcmApplication.java
diff --git a/android/app/src/test/java/com/wix/reactnativenotifications/core/AppLaunchHelperTest.java b/lib/android/app/src/test/java/com/wix/reactnativenotifications/core/AppLaunchHelperTest.java
similarity index 100%
rename from android/app/src/test/java/com/wix/reactnativenotifications/core/AppLaunchHelperTest.java
rename to lib/android/app/src/test/java/com/wix/reactnativenotifications/core/AppLaunchHelperTest.java
diff --git a/android/app/src/test/java/com/wix/reactnativenotifications/core/InitialNotificationHolderTest.java b/lib/android/app/src/test/java/com/wix/reactnativenotifications/core/InitialNotificationHolderTest.java
similarity index 100%
rename from android/app/src/test/java/com/wix/reactnativenotifications/core/InitialNotificationHolderTest.java
rename to lib/android/app/src/test/java/com/wix/reactnativenotifications/core/InitialNotificationHolderTest.java
diff --git a/android/app/src/test/java/com/wix/reactnativenotifications/core/JsIOHelperTest.java b/lib/android/app/src/test/java/com/wix/reactnativenotifications/core/JsIOHelperTest.java
similarity index 100%
rename from android/app/src/test/java/com/wix/reactnativenotifications/core/JsIOHelperTest.java
rename to lib/android/app/src/test/java/com/wix/reactnativenotifications/core/JsIOHelperTest.java
diff --git a/android/app/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java b/lib/android/app/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java
similarity index 100%
rename from android/app/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java
rename to lib/android/app/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java
diff --git a/android/app/src/test/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawerTest.java b/lib/android/app/src/test/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawerTest.java
similarity index 100%
rename from android/app/src/test/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawerTest.java
rename to lib/android/app/src/test/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawerTest.java
diff --git a/android/build.gradle b/lib/android/build.gradle
similarity index 91%
rename from android/build.gradle
rename to lib/android/build.gradle
index e3c64c96688465f5b592c2a046397b3b94c21477..0973eabfb20f62f4c97237c1f001cfa0b833535c 100644
--- a/android/build.gradle
+++ b/lib/android/build.gradle
@@ -23,7 +23,7 @@ allprojects {
         jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url "$rootDir/../node_modules/react-native/android"
+            url "$rootDir/../../node_modules/react-native/android"
         }
     }
 }
diff --git a/android/gradle.properties b/lib/android/gradle.properties
similarity index 100%
rename from android/gradle.properties
rename to lib/android/gradle.properties
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/lib/android/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from android/gradle/wrapper/gradle-wrapper.jar
rename to lib/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/lib/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from android/gradle/wrapper/gradle-wrapper.properties
rename to lib/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/android/gradlew b/lib/android/gradlew
similarity index 100%
rename from android/gradlew
rename to lib/android/gradlew
diff --git a/android/gradlew.bat b/lib/android/gradlew.bat
similarity index 100%
rename from android/gradlew.bat
rename to lib/android/gradlew.bat
diff --git a/android/prepare-robolectric.gradle b/lib/android/prepare-robolectric.gradle
similarity index 100%
rename from android/prepare-robolectric.gradle
rename to lib/android/prepare-robolectric.gradle
diff --git a/android/settings.gradle b/lib/android/settings.gradle
similarity index 100%
rename from android/settings.gradle
rename to lib/android/settings.gradle
diff --git a/RNNotifications/OCMock/NSNotificationCenter+OCMAdditions.h b/lib/ios/OCMock/NSNotificationCenter+OCMAdditions.h
similarity index 100%
rename from RNNotifications/OCMock/NSNotificationCenter+OCMAdditions.h
rename to lib/ios/OCMock/NSNotificationCenter+OCMAdditions.h
diff --git a/RNNotifications/OCMock/OCMArg.h b/lib/ios/OCMock/OCMArg.h
similarity index 100%
rename from RNNotifications/OCMock/OCMArg.h
rename to lib/ios/OCMock/OCMArg.h
diff --git a/RNNotifications/OCMock/OCMConstraint.h b/lib/ios/OCMock/OCMConstraint.h
similarity index 100%
rename from RNNotifications/OCMock/OCMConstraint.h
rename to lib/ios/OCMock/OCMConstraint.h
diff --git a/RNNotifications/OCMock/OCMFunctions.h b/lib/ios/OCMock/OCMFunctions.h
similarity index 100%
rename from RNNotifications/OCMock/OCMFunctions.h
rename to lib/ios/OCMock/OCMFunctions.h
diff --git a/RNNotifications/OCMock/OCMLocation.h b/lib/ios/OCMock/OCMLocation.h
similarity index 100%
rename from RNNotifications/OCMock/OCMLocation.h
rename to lib/ios/OCMock/OCMLocation.h
diff --git a/RNNotifications/OCMock/OCMMacroState.h b/lib/ios/OCMock/OCMMacroState.h
similarity index 100%
rename from RNNotifications/OCMock/OCMMacroState.h
rename to lib/ios/OCMock/OCMMacroState.h
diff --git a/RNNotifications/OCMock/OCMRecorder.h b/lib/ios/OCMock/OCMRecorder.h
similarity index 100%
rename from RNNotifications/OCMock/OCMRecorder.h
rename to lib/ios/OCMock/OCMRecorder.h
diff --git a/RNNotifications/OCMock/OCMStubRecorder.h b/lib/ios/OCMock/OCMStubRecorder.h
similarity index 100%
rename from RNNotifications/OCMock/OCMStubRecorder.h
rename to lib/ios/OCMock/OCMStubRecorder.h
diff --git a/RNNotifications/OCMock/OCMock.h b/lib/ios/OCMock/OCMock.h
similarity index 100%
rename from RNNotifications/OCMock/OCMock.h
rename to lib/ios/OCMock/OCMock.h
diff --git a/RNNotifications/OCMock/OCMockObject.h b/lib/ios/OCMock/OCMockObject.h
similarity index 100%
rename from RNNotifications/OCMock/OCMockObject.h
rename to lib/ios/OCMock/OCMockObject.h
diff --git a/RNNotifications/RCTConvert+RNNotifications.h b/lib/ios/RCTConvert+RNNotifications.h
similarity index 100%
rename from RNNotifications/RCTConvert+RNNotifications.h
rename to lib/ios/RCTConvert+RNNotifications.h
diff --git a/RNNotifications/RCTConvert+RNNotifications.m b/lib/ios/RCTConvert+RNNotifications.m
similarity index 100%
rename from RNNotifications/RCTConvert+RNNotifications.m
rename to lib/ios/RCTConvert+RNNotifications.m
diff --git a/RNNotifications/RNBridgeModule.h b/lib/ios/RNBridgeModule.h
similarity index 100%
rename from RNNotifications/RNBridgeModule.h
rename to lib/ios/RNBridgeModule.h
diff --git a/RNNotifications/RNBridgeModule.m b/lib/ios/RNBridgeModule.m
similarity index 100%
rename from RNNotifications/RNBridgeModule.m
rename to lib/ios/RNBridgeModule.m
diff --git a/RNNotifications/RNCommandsHandler.h b/lib/ios/RNCommandsHandler.h
similarity index 100%
rename from RNNotifications/RNCommandsHandler.h
rename to lib/ios/RNCommandsHandler.h
diff --git a/RNNotifications/RNCommandsHandler.m b/lib/ios/RNCommandsHandler.m
similarity index 100%
rename from RNNotifications/RNCommandsHandler.m
rename to lib/ios/RNCommandsHandler.m
diff --git a/RNNotifications/RNEventEmitter.h b/lib/ios/RNEventEmitter.h
similarity index 100%
rename from RNNotifications/RNEventEmitter.h
rename to lib/ios/RNEventEmitter.h
diff --git a/RNNotifications/RNEventEmitter.m b/lib/ios/RNEventEmitter.m
similarity index 100%
rename from RNNotifications/RNEventEmitter.m
rename to lib/ios/RNEventEmitter.m
diff --git a/RNNotifications/RNNotificationCenter.h b/lib/ios/RNNotificationCenter.h
similarity index 100%
rename from RNNotifications/RNNotificationCenter.h
rename to lib/ios/RNNotificationCenter.h
diff --git a/RNNotifications/RNNotificationCenter.m b/lib/ios/RNNotificationCenter.m
similarity index 100%
rename from RNNotifications/RNNotificationCenter.m
rename to lib/ios/RNNotificationCenter.m
diff --git a/RNNotifications/RNNotificationCenterListener.h b/lib/ios/RNNotificationCenterListener.h
similarity index 100%
rename from RNNotifications/RNNotificationCenterListener.h
rename to lib/ios/RNNotificationCenterListener.h
diff --git a/RNNotifications/RNNotificationCenterListener.m b/lib/ios/RNNotificationCenterListener.m
similarity index 100%
rename from RNNotifications/RNNotificationCenterListener.m
rename to lib/ios/RNNotificationCenterListener.m
diff --git a/RNNotifications/RNNotificationEventHandler.h b/lib/ios/RNNotificationEventHandler.h
similarity index 100%
rename from RNNotifications/RNNotificationEventHandler.h
rename to lib/ios/RNNotificationEventHandler.h
diff --git a/RNNotifications/RNNotificationEventHandler.m b/lib/ios/RNNotificationEventHandler.m
similarity index 100%
rename from RNNotifications/RNNotificationEventHandler.m
rename to lib/ios/RNNotificationEventHandler.m
diff --git a/RNNotifications/RNNotificationParser.h b/lib/ios/RNNotificationParser.h
similarity index 100%
rename from RNNotifications/RNNotificationParser.h
rename to lib/ios/RNNotificationParser.h
diff --git a/RNNotifications/RNNotificationParser.m b/lib/ios/RNNotificationParser.m
similarity index 100%
rename from RNNotifications/RNNotificationParser.m
rename to lib/ios/RNNotificationParser.m
diff --git a/RNNotifications/RNNotificationUtils.h b/lib/ios/RNNotificationUtils.h
similarity index 100%
rename from RNNotifications/RNNotificationUtils.h
rename to lib/ios/RNNotificationUtils.h
diff --git a/RNNotifications/RNNotificationUtils.m b/lib/ios/RNNotificationUtils.m
similarity index 100%
rename from RNNotifications/RNNotificationUtils.m
rename to lib/ios/RNNotificationUtils.m
diff --git a/RNNotifications/RNNotifications.h b/lib/ios/RNNotifications.h
similarity index 100%
rename from RNNotifications/RNNotifications.h
rename to lib/ios/RNNotifications.h
diff --git a/RNNotifications/RNNotifications.m b/lib/ios/RNNotifications.m
similarity index 100%
rename from RNNotifications/RNNotifications.m
rename to lib/ios/RNNotifications.m
diff --git a/RNNotifications/RNNotifications.xcodeproj/project.pbxproj b/lib/ios/RNNotifications.xcodeproj/project.pbxproj
similarity index 100%
rename from RNNotifications/RNNotifications.xcodeproj/project.pbxproj
rename to lib/ios/RNNotifications.xcodeproj/project.pbxproj
diff --git a/RNNotifications/RNNotifications.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/lib/ios/RNNotifications.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from RNNotifications/RNNotifications.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to lib/ios/RNNotifications.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/RNNotifications/RNNotifications.xcodeproj/xcshareddata/xcschemes/RNNotifications.xcscheme b/lib/ios/RNNotifications.xcodeproj/xcshareddata/xcschemes/RNNotifications.xcscheme
similarity index 100%
rename from RNNotifications/RNNotifications.xcodeproj/xcshareddata/xcschemes/RNNotifications.xcscheme
rename to lib/ios/RNNotifications.xcodeproj/xcshareddata/xcschemes/RNNotifications.xcscheme
diff --git a/RNNotifications/RNNotificationsStore.h b/lib/ios/RNNotificationsStore.h
similarity index 100%
rename from RNNotifications/RNNotificationsStore.h
rename to lib/ios/RNNotificationsStore.h
diff --git a/RNNotifications/RNNotificationsStore.m b/lib/ios/RNNotificationsStore.m
similarity index 100%
rename from RNNotifications/RNNotificationsStore.m
rename to lib/ios/RNNotificationsStore.m
diff --git a/RNNotifications/RNNotificationsTests/Info.plist b/lib/ios/RNNotificationsTests/Info.plist
similarity index 100%
rename from RNNotifications/RNNotificationsTests/Info.plist
rename to lib/ios/RNNotificationsTests/Info.plist
diff --git a/RNNotifications/RNNotificationsTests/Integration/RNBridgeModuleIntegrationTest.m b/lib/ios/RNNotificationsTests/Integration/RNBridgeModuleIntegrationTest.m
similarity index 100%
rename from RNNotifications/RNNotificationsTests/Integration/RNBridgeModuleIntegrationTest.m
rename to lib/ios/RNNotificationsTests/Integration/RNBridgeModuleIntegrationTest.m
diff --git a/RNNotifications/RNNotificationsTests/Integration/RNCommandsHandlerIntegrationTest.m b/lib/ios/RNNotificationsTests/Integration/RNCommandsHandlerIntegrationTest.m
similarity index 100%
rename from RNNotifications/RNNotificationsTests/Integration/RNCommandsHandlerIntegrationTest.m
rename to lib/ios/RNNotificationsTests/Integration/RNCommandsHandlerIntegrationTest.m
diff --git a/RNNotifications/RNNotificationsTests/RNNotificationEventHandlerTests.m b/lib/ios/RNNotificationsTests/RNNotificationEventHandlerTests.m
similarity index 100%
rename from RNNotifications/RNNotificationsTests/RNNotificationEventHandlerTests.m
rename to lib/ios/RNNotificationsTests/RNNotificationEventHandlerTests.m
diff --git a/RNNotifications/RNNotificationsTests/RNNotificationsStoreTests.m b/lib/ios/RNNotificationsTests/RNNotificationsStoreTests.m
similarity index 100%
rename from RNNotifications/RNNotificationsTests/RNNotificationsStoreTests.m
rename to lib/ios/RNNotificationsTests/RNNotificationsStoreTests.m
diff --git a/RNNotifications/RNNotificationsTests/RNNotificationsTests.m b/lib/ios/RNNotificationsTests/RNNotificationsTests.m
similarity index 100%
rename from RNNotifications/RNNotificationsTests/RNNotificationsTests.m
rename to lib/ios/RNNotificationsTests/RNNotificationsTests.m
diff --git a/RNNotifications/RNPushKit.h b/lib/ios/RNPushKit.h
similarity index 100%
rename from RNNotifications/RNPushKit.h
rename to lib/ios/RNPushKit.h
diff --git a/RNNotifications/RNPushKit.m b/lib/ios/RNPushKit.m
similarity index 100%
rename from RNNotifications/RNPushKit.m
rename to lib/ios/RNPushKit.m
diff --git a/RNNotifications/RNPushKitEventHandler.h b/lib/ios/RNPushKitEventHandler.h
similarity index 100%
rename from RNNotifications/RNPushKitEventHandler.h
rename to lib/ios/RNPushKitEventHandler.h
diff --git a/RNNotifications/RNPushKitEventHandler.m b/lib/ios/RNPushKitEventHandler.m
similarity index 100%
rename from RNNotifications/RNPushKitEventHandler.m
rename to lib/ios/RNPushKitEventHandler.m
diff --git a/RNNotifications/RNPushKitEventListener.h b/lib/ios/RNPushKitEventListener.h
similarity index 100%
rename from RNNotifications/RNPushKitEventListener.h
rename to lib/ios/RNPushKitEventListener.h
diff --git a/RNNotifications/RNPushKitEventListener.m b/lib/ios/RNPushKitEventListener.m
similarity index 100%
rename from RNNotifications/RNPushKitEventListener.m
rename to lib/ios/RNPushKitEventListener.m
diff --git a/RNNotifications/libOCMock.a b/lib/ios/libOCMock.a
similarity index 100%
rename from RNNotifications/libOCMock.a
rename to lib/ios/libOCMock.a
diff --git a/package.json b/package.json
index 28c6b621319e24816ca6749ff4d69db04dd57459..264680ba79705e68e02e909335c2627514b2557c 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,8 @@
     "test-e2e-ios-release": "node ./scripts/test-e2e --ios --release",
     "test-unit-ios": "node ./scripts/test-unit --ios",
     "test-unit-android": "node ./scripts/test-unit --android",
-    "test-js": "node ./scripts/test-js"
+    "test-js": "node ./scripts/test-js",
+    "xcode": "open example/ios/NotificationsExampleApp.xcodeproj"
   },
   "nativePackage": true,
   "dependencies": {
diff --git a/scripts/test-unit.js b/scripts/test-unit.js
index dcc8f88968ad957895237c5262a42f0b735480b9..fe103d3f6f9ed9c2ed4decc488c930f5f669a3f6 100644
--- a/scripts/test-unit.js
+++ b/scripts/test-unit.js
@@ -19,7 +19,7 @@ function runAndroidUnitTests() {
     exec.execSync(`yes | ${sdkmanager} --licenses`);
     // exec.execSync(`echo y | ${sdkmanager} --update && echo y | ${sdkmanager} --licenses`);
   }
-  exec.execSync(`cd android && ./gradlew ${conf}`);
+  exec.execSync(`cd lib/android && ./gradlew ${conf}`);
 }
 
 function runIosUnitTests() {