diff --git a/.vscode/settings.json b/.vscode/settings.json
index bef2423..7a73a41 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,11 +1,2 @@
 {
-    "xml.fileAssociations": [
-        {
-            "systemId": "/Volumes/data/dev/nativescript/nativescript-background-gps/schema/tns.xsd",
-            "pattern": "**/**/*.xml"
-        }
-    ],
-    "files.exclude": {
-        "schema": true
-    }
 }
\ No newline at end of file
diff --git a/demo-snippets/package.json b/demo-snippets/package.json
index f2a48a7..229d68b 100644
--- a/demo-snippets/package.json
+++ b/demo-snippets/package.json
@@ -3,6 +3,12 @@
     "private": true,
     "version": "0.0.1",
     "dependencies": {
-        "@nativescript-community/gps": "file:../packages/gps"
+        "@nativescript-community/gps": "3.1.8"
+    },
+    "nativescript": {
+        "platforms": {
+            "android": "2.3.0",
+            "ios": "2.3.0"
+        }
     }
 }
diff --git a/demo-snippets/platforms/android/AndroidManifest.xml b/demo-snippets/platforms/android/AndroidManifest.xml
new file mode 100755
index 0000000..9e71921
--- /dev/null
+++ b/demo-snippets/platforms/android/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-feature android:name="android.hardware.location.gps" />
+</manifest>
diff --git a/demo-snippets/platforms/android/template_snippet.aar b/demo-snippets/platforms/android/template_snippet.aar
new file mode 100644
index 0000000..c97ebb9
Binary files /dev/null and b/demo-snippets/platforms/android/template_snippet.aar differ
diff --git a/demo/app/App_Resources/iOS/Info.plist b/demo-snippets/platforms/ios/Info.plist
old mode 100644
new mode 100755
similarity index 81%
rename from demo/app/App_Resources/iOS/Info.plist
rename to demo-snippets/platforms/ios/Info.plist
index ea3e3ea..3b3fe2b
--- a/demo/app/App_Resources/iOS/Info.plist
+++ b/demo-snippets/platforms/ios/Info.plist
@@ -24,8 +24,6 @@
 	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
-	<key>UIRequiresFullScreen</key>
-	<true/>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -43,5 +41,16 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+  <key>NSAppTransportSecurity</key>  
+  <dict>  
+      <key>NSAllowsArbitraryLoads</key>
+      <true />  
+  </dict>
+  <key>UIBackgroundModes</key>
+  <array>
+    <string>audio</string>
+  </array>
+  <key>NSMicrophoneUsageDescription</key>
+  <string>The Audio Recorder needs to access your Microphone to record.</string>
 </dict>
 </plist>
diff --git a/demo-snippets/vue/Basic.vue b/demo-snippets/vue/Basic.vue
index 250394a..582743b 100644
--- a/demo-snippets/vue/Basic.vue
+++ b/demo-snippets/vue/Basic.vue
@@ -5,22 +5,23 @@
         </ActionBar>
 
         <StackLayout>
-    <Label :text="message" class="message" textWrap="true"/>
+            <Label :text="message" class="message" textWrap="true" />
 
-    <ListView :items="gpsPoints">
-      <ListView.itemTemplate>
-        <Label :text="item.name"  />
-      </ListView.itemTemplate>
-    </ListView>
-  </StackLayout>
+            <ListView :items="gpsPoints">
+                <v-template>
+                    <Label :text="item.name" />
+                </v-template>
+            </ListView>
+        </StackLayout>
     </Page>
 </template>
 
-<script lang="typescript">
-import { ObservableArray } from '@nativescript/core/data/observable-array';
+<script lang="ts">
+import Vue from 'vue';
+import { ObservableArray } from '@nativescript/core';
 import { GPS } from '@nativescript-community/gps';
 const gps = new GPS();
-export default {
+export default Vue.extend({
     mounted() {
         this.gpsPoints = new ObservableArray([]);
         gps.on(GPS.gps_status_event, (e) => {
@@ -36,76 +37,73 @@ export default {
                 }).then((watchId) => (this.watchId = watchId));
             })
             .catch(this.error);
-    
     },
-    computed: {
-        message() {
-            return 'Blank {N}-Vue app';
-        },
-        items() {
-            return new Array(100).fill({ title: 'My profile' });
+    destroyed() {
+        if (this.watchId) {
+            console.log('clearWatch');
+            gps.clearWatch(this.watchId);
         }
     },
-    data:function( ) {
+    data() {
         return {
-            message:'Tracking location',
-            gpsPoints:[]
-        }
+            watchId: null,
+            message: 'Tracking location',
+            gpsPoints: []
+        };
     },
     methods: {
+        enableLocation() {
+            if (!gps.isEnabled()) {
+                console.log('Location not enabled, requesting.');
+                return gps.authorize(true).then(() => gps.enable());
+            } else {
+                return Promise.resolve(true);
+            }
+        },
 
-    enableLocation() {
-        if (!gps.isEnabled()) {
-            console.log('Location not enabled, requesting.');
-            return gps.authorize(true).then(() => gps.enable());
-        } else {
-            return Promise.resolve(true);
-        }
-    },
-
-    getLocation() {
-        if (gps.isEnabled()) {
-            return gps.getCurrentLocation({
-                minimumUpdateTime: 1000
-            });
-        }
-        return Promise.reject('Geolocation not enabled.');
-    },
+        getLocation() {
+            if (gps.isEnabled()) {
+                return gps.getCurrentLocation({
+                    minimumUpdateTime: 1000
+                });
+            }
+            return Promise.reject('Geolocation not enabled.');
+        },
 
-    locationReceived (position: any) {
-        console.log('GPS Update Received');
-        // {
-        //   "latitude": 33.52077361638753,
-        //   "longitude": -111.89930240833577,
-        //   "altitude": 384.0000915527344,
-        //   "horizontalAccuracy": 65,
-        //   "verticalAccuracy": 10,
-        //   "speed": -1,
-        //   "direction": -1,
-        //   "timestamp": "2016-10-04T00:22:59.316Z",
-        //   "ios": {}
-        // }
+        locationReceived(position: any) {
+            console.log('GPS Update Received');
+            // {
+            //   "latitude": 33.52077361638753,
+            //   "longitude": -111.89930240833577,
+            //   "altitude": 384.0000915527344,
+            //   "horizontalAccuracy": 65,
+            //   "verticalAccuracy": 10,
+            //   "speed": -1,
+            //   "direction": -1,
+            //   "timestamp": "2016-10-04T00:22:59.316Z",
+            //   "ios": {}
+            // }
 
-        console.log(JSON.stringify(position));
-        console.log(JSON.stringify(position.latitude));
-        console.log(JSON.stringify(position.longitude));
+            console.log(JSON.stringify(position));
+            console.log(JSON.stringify(position.latitude));
+            console.log(JSON.stringify(position.longitude));
 
-        const gpsTime: Date = new Date(position.timestamp);
-        const logTime: Date = new Date();
-        const difference: number = (logTime.getTime() - gpsTime.getTime()) / 1000;
-        this.message = `last location:${difference},${position.latitude},${position.longitude}`;
-        this.gpsPoints.unshift({ name: gpsTime });
-    },
+            const gpsTime: Date = new Date(position.timestamp);
+            const logTime: Date = new Date();
+            const difference: number = (logTime.getTime() - gpsTime.getTime()) / 1000;
+            this.message = `last location:${difference},${position.latitude},${position.longitude}`;
+            this.gpsPoints.unshift({ name: gpsTime });
+        },
 
-    error(err) {
-        console.log('Error: ' + JSON.stringify(err));
-    },
+        error(err) {
+            alert(err);
+        },
 
-    formatDate(date: Date) {
-        return date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
-    }
+        formatDate(date: Date) {
+            return date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
+        }
     }
-};
+});
 </script>
 
 <style scoped lang="scss">
@@ -117,35 +115,4 @@ Button {
     background-color: #42b883;
     color: white;
 }
-.avatar {
-    background-color: #42b883;
-    border-radius: 40;
-    height: 80;
-    vertical-align: middle;
-    Label {
-        vertical-align: middle;
-        horizontal-align: center;
-        font-size: 30;
-        color: white;
-    }
-}
-.drawer {
-    Button {
-        background-color: transparent;
-        margin: 0;
-        padding: 0;
-        border-color: #ccc;
-        z-index: 0;
-        border-width: 0 0 0.5 0;
-        color: #222222;
-        text-align: left;
-        padding-left: 25;
-        height: 50;
-        font-size: 14;
-    }
-    Button:highlighted {
-        background-color: #eeeeee;
-        color: #222222;
-    }
-}
 </style>
diff --git a/demo/app/App_Resources/Android/app.gradle b/demo/app/App_Resources/Android/app.gradle
deleted file mode 100644
index 362732d..0000000
--- a/demo/app/App_Resources/Android/app.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-// Add your native dependencies here:
-
-// Uncomment to add recyclerview-v7 dependency
-//dependencies {
-//	compile 'com.android.support:recyclerview-v7:+'
-//}
-
-android {  
-  defaultConfig {  
-    generatedDensities = []
-    applicationId = "org.nativescript.gpsdemo"  
-  }  
-  aaptOptions {  
-    additionalParameters "--no-version-vectors"  
-  }  
-} 
diff --git a/demo/app/App_Resources/Android/src/main/AndroidManifest.xml b/demo/app/App_Resources/Android/src/main/AndroidManifest.xml
deleted file mode 100644
index 9266733..0000000
--- a/demo/app/App_Resources/Android/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-	package="__PACKAGE__"
-	android:versionCode="1"
-	android:versionName="1.0">
-    <supports-screens
-		android:smallScreens="true"
-		android:normalScreens="true"
-		android:largeScreens="true"
-		android:xlargeScreens="true"/>
-    <uses-sdk
-		android:minSdkVersion="17"
-		android:targetSdkVersion="__APILEVEL__"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <application
-		android:name="com.tns.NativeScriptApplication"
-		android:allowBackup="true"
-		android:icon="@drawable/icon"
-		android:label="@string/app_name"
-		android:theme="@style/AppTheme">
-        <activity
-			android:name="com.tns.NativeScriptActivity"
-			android:label="@string/title_activity_kimera"
-			android:configChanges="keyboardHidden|orientation|screenSize"
-			android:theme="@style/LaunchScreenTheme"
-			android:exported="true">
-            <meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.tns.ErrorReportActivity" android:exported="false"/>
-    </application>
-</manifest>
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png
deleted file mode 100644
index eb381c2..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png
deleted file mode 100755
index 1034356..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png
deleted file mode 100644
index 5218f4c..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-hdpi/logo.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png
deleted file mode 100644
index 748b2ad..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/background.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png
deleted file mode 100755
index ddfc17a..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png
deleted file mode 100644
index b9e102a..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-ldpi/logo.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png
deleted file mode 100644
index efeaf29..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/background.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png
deleted file mode 100755
index 486e410..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png
deleted file mode 100644
index 6263387..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-mdpi/logo.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml b/demo/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
deleted file mode 100644
index ada77f9..0000000
--- a/demo/app/App_Resources/Android/src/main/res/drawable-nodpi/splash_screen.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="fill">
-    <item>
-        <bitmap android:gravity="fill" android:src="@drawable/background" />
-    </item>
-    <item>
-        <bitmap android:gravity="center" android:src="@drawable/logo" />
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png
deleted file mode 100644
index 612bbd0..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/background.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png
deleted file mode 100644
index f291882..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/icon.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png
deleted file mode 100644
index ad8ee2f..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-xhdpi/logo.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png
deleted file mode 100644
index 0fa88e2..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/background.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png
deleted file mode 100644
index 4f69cb2..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/icon.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png
deleted file mode 100644
index 6683278..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-xxhdpi/logo.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png
deleted file mode 100644
index c650f64..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/background.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png
deleted file mode 100644
index 50887a8..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/icon.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png b/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png
deleted file mode 100644
index fa6331c..0000000
Binary files a/demo/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/logo.png and /dev/null differ
diff --git a/demo/app/App_Resources/Android/src/main/res/values-v21/colors.xml b/demo/app/App_Resources/Android/src/main/res/values-v21/colors.xml
deleted file mode 100644
index a64641a..0000000
--- a/demo/app/App_Resources/Android/src/main/res/values-v21/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<color name="ns_accent">#3d5afe</color>
-</resources>
\ No newline at end of file
diff --git a/demo/app/App_Resources/Android/src/main/res/values-v21/styles.xml b/demo/app/App_Resources/Android/src/main/res/values-v21/styles.xml
deleted file mode 100644
index dac8727..0000000
--- a/demo/app/App_Resources/Android/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Application theme -->
-    <style name="AppTheme" parent="AppThemeBase">
-        <item name="android:datePickerStyle">@style/SpinnerDatePicker</item>
-        <item name="android:timePickerStyle">@style/SpinnerTimePicker</item>
-    </style>
-
-    <!-- Default style for DatePicker - in spinner mode -->
-    <style name="SpinnerDatePicker" parent="android:Widget.Material.Light.DatePicker">
-        <item name="android:datePickerMode">spinner</item>
-    </style>
-
-    <!-- Default style for TimePicker - in spinner mode -->
-    <style name="SpinnerTimePicker" parent="android:Widget.Material.Light.TimePicker">
-        <item name="android:timePickerMode">spinner</item>
-    </style>
-
-    <style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
-        <item name="android:elevation">4dp</item>
-    </style>    
-</resources>
\ No newline at end of file
diff --git a/demo/app/App_Resources/Android/src/main/res/values/colors.xml b/demo/app/App_Resources/Android/src/main/res/values/colors.xml
deleted file mode 100644
index 74ad882..0000000
--- a/demo/app/App_Resources/Android/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ns_primary">#F5F5F5</color>
-	<color name="ns_primaryDark">#757575</color>
-	<color name="ns_accent">#33B5E5</color>
-    <color name="ns_blue">#272734</color>
-</resources>
\ No newline at end of file
diff --git a/demo/app/App_Resources/Android/src/main/res/values/styles.xml b/demo/app/App_Resources/Android/src/main/res/values/styles.xml
deleted file mode 100644
index 1e8c7f2..0000000
--- a/demo/app/App_Resources/Android/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- theme to use FOR launch screen-->
-    <style name="LaunchScreenThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
-
-        <item name="colorPrimary">@color/ns_primary</item>
-        <item name="colorPrimaryDark">@color/ns_primaryDark</item>
-        <item name="colorAccent">@color/ns_accent</item>
-
-        <item name="android:windowBackground">@drawable/splash_screen</item>
-        
-        <item name="android:windowActionBarOverlay">true</item>  
-        <item name="android:windowTranslucentStatus">true</item>
-
-    </style>
-
-    <style name="LaunchScreenTheme" parent="LaunchScreenThemeBase">
-    </style>
-
-    <!-- theme to use AFTER launch screen is loaded-->
-    <style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
-
-        <item name="colorPrimary">@color/ns_primary</item>
-        <item name="colorPrimaryDark">@color/ns_primaryDark</item>
-        <item name="colorAccent">@color/ns_accent</item>
-
-    </style>
-
-    <style name="AppTheme" parent="AppThemeBase">
-    </style>
-
-    <!-- theme for actioon-bar -->
-    <style name="NativeScriptToolbarStyleBase" parent="Widget.AppCompat.Toolbar">
-        <item name="android:background">@color/ns_primary</item>
-        <item name="theme">@style/ThemeOverlay.AppCompat.ActionBar</item>
-        <item name="popupTheme">@style/ThemeOverlay.AppCompat</item>
-
-    </style>
-
-    <style name="NativeScriptToolbarStyle" parent="NativeScriptToolbarStyleBase">
-    </style>
-</resources> 
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 5f53593..0000000
--- a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "images" : [
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "icon-29.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "icon-29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "icon-29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "icon-40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "icon-40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "icon-57.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "57x57",
-      "idiom" : "iphone",
-      "filename" : "icon-57@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "icon-60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "icon-60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "icon-29.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "icon-29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "icon-40.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "icon-40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "50x50",
-      "idiom" : "ipad",
-      "filename" : "icon-50.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "50x50",
-      "idiom" : "ipad",
-      "filename" : "icon-50@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "72x72",
-      "idiom" : "ipad",
-      "filename" : "icon-72.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "72x72",
-      "idiom" : "ipad",
-      "filename" : "icon-72@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "icon-76.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "icon-76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "icon-83.5@2x.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png
deleted file mode 100644
index 9e15af0..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
deleted file mode 100644
index 7b9e555..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
deleted file mode 100644
index 76f61ec..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png
deleted file mode 100644
index 15b06db..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
deleted file mode 100644
index 585065f..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
deleted file mode 100644
index a450c42..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50.png
deleted file mode 100755
index 4a62478..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50@2x.png
deleted file mode 100755
index 01ff7c1..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-50@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57.png
deleted file mode 100755
index beea819..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57@2x.png
deleted file mode 100755
index c3dc7b0..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-57@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
deleted file mode 100644
index 457b6d9..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
deleted file mode 100644
index fa5a6ac..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72.png
deleted file mode 100755
index 556bdd6..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png
deleted file mode 100755
index 4f69cb2..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-72@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png
deleted file mode 100644
index 94abcf7..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
deleted file mode 100644
index 2e71dd3..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
deleted file mode 100644
index 4abc9ec..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/Contents.json b/demo/app/App_Resources/iOS/Assets.xcassets/Contents.json
deleted file mode 100644
index da4a164..0000000
--- a/demo/app/App_Resources/iOS/Assets.xcassets/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
deleted file mode 100644
index 4414bad..0000000
--- a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ /dev/null
@@ -1,158 +0,0 @@
-{
-  "images" : [
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "736h",
-      "filename" : "Default-736h@3x.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "portrait",
-      "scale" : "3x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "736h",
-      "filename" : "Default-Landscape@3x.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "landscape",
-      "scale" : "3x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "667h",
-      "filename" : "Default-667h@2x.png",
-      "minimum-system-version" : "8.0",
-      "orientation" : "portrait",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "Default@2x.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "retina4",
-      "filename" : "Default-568h@2x.png",
-      "minimum-system-version" : "7.0",
-      "orientation" : "portrait",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "filename" : "Default-Portrait.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "filename" : "Default-Landscape.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "filename" : "Default-Portrait@2x.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "filename" : "Default-Landscape@2x.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "Default.png",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "Default@2x.png",
-      "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "Default-568h@2x.png",
-      "extent" : "full-screen",
-      "subtype" : "retina4",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "to-status-bar",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "filename" : "Default-Portrait.png",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "to-status-bar",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "filename" : "Default-Landscape.png",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "to-status-bar",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "filename" : "Default-Portrait@2x.png",
-      "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "to-status-bar",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "filename" : "Default-Landscape@2x.png",
-      "extent" : "full-screen",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png
deleted file mode 100644
index d7f17fc..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-568h@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png
deleted file mode 100644
index b884154..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-667h@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png
deleted file mode 100644
index faab4b6..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-736h@3x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png
deleted file mode 100644
index 3365ba3..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png
deleted file mode 100644
index a44945c..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png
deleted file mode 100644
index e6dca62..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Landscape@3x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png
deleted file mode 100644
index 1a50079..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png
deleted file mode 100644
index 73d8b92..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default-Portrait@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png
deleted file mode 100644
index 9f1f6ce..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png
deleted file mode 100644
index 514fc5c..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchImage.launchimage/Default@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json
deleted file mode 100644
index 4f4e9c5..0000000
--- a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchScreen-AspectFill.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchScreen-AspectFill@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png
deleted file mode 100644
index c293f9c..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png
deleted file mode 100644
index 233693a..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.AspectFill.imageset/LaunchScreen-AspectFill@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json
deleted file mode 100644
index 23c0ffd..0000000
--- a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/Contents.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchScreen-Center.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "LaunchScreen-Center@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png
deleted file mode 100644
index a5a775a..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png b/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png
deleted file mode 100644
index 154c193..0000000
Binary files a/demo/app/App_Resources/iOS/Assets.xcassets/LaunchScreen.Center.imageset/LaunchScreen-Center@2x.png and /dev/null differ
diff --git a/demo/app/App_Resources/iOS/LaunchScreen.storyboard b/demo/app/App_Resources/iOS/LaunchScreen.storyboard
deleted file mode 100644
index 2ad9471..0000000
--- a/demo/app/App_Resources/iOS/LaunchScreen.storyboard
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="EHf-IW-A2E">
-            <objects>
-                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
-                        <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchScreen.AspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="wtH-rr-YfP">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
-                            </imageView>
-                            <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchScreen.Center" translatesAutoresizingMaskIntoConstraints="NO" id="s1z-aa-wYv">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
-                            </imageView>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="wtH-rr-YfP" secondAttribute="bottom" id="5FO-pR-qKb"/>
-                            <constraint firstItem="wtH-rr-YfP" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="Awn-b8-xf1"/>
-                            <constraint firstItem="s1z-aa-wYv" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="CiP-yX-1sg"/>
-                            <constraint firstAttribute="trailing" secondItem="wtH-rr-YfP" secondAttribute="trailing" id="RXg-rW-UK8"/>
-                            <constraint firstItem="s1z-aa-wYv" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="agC-wa-3bd"/>
-                            <constraint firstItem="wtH-rr-YfP" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="cch-8E-tYu"/>
-                            <constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="s1z-aa-wYv" secondAttribute="bottom" id="fNc-Ro-KaG"/>
-                            <constraint firstAttribute="trailing" secondItem="s1z-aa-wYv" secondAttribute="trailing" id="qoI-OC-Zk7"/>
-                        </constraints>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="510" y="238"/>
-        </scene>
-    </scenes>
-    <resources>
-        <image name="LaunchScreen.AspectFill" width="768" height="1024"/>
-        <image name="LaunchScreen.Center" width="40" height="40"/>
-    </resources>
-</document>
diff --git a/demo/app/App_Resources/iOS/build.xcconfig b/demo/app/App_Resources/iOS/build.xcconfig
deleted file mode 100644
index 0562055..0000000
--- a/demo/app/App_Resources/iOS/build.xcconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-// You can add custom settings here
-// for example you can uncomment the following line to force distribution code signing
-// CODE_SIGN_IDENTITY = iPhone Distribution 
-ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
diff --git a/demo/app/app.css b/demo/app/app.css
deleted file mode 100644
index 61bfb40..0000000
--- a/demo/app/app.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.message {
-  color: #000;
-  font-size: 20;
-  horizontal-align: center;
-  padding:20;
-}
diff --git a/demo/app/app.ts b/demo/app/app.ts
deleted file mode 100644
index 7993125..0000000
--- a/demo/app/app.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Trace } from '@nativescript/core';
-import * as application from '@nativescript/core/application';
-import {GPSTraceCategory }from '@nativescript-community/gps';
-
-Trace.addCategories(GPSTraceCategory)
-Trace.enable()
-application.run({ moduleName: 'main-page' });
diff --git a/demo/app/main-page.ts b/demo/app/main-page.ts
deleted file mode 100644
index cbad0dc..0000000
--- a/demo/app/main-page.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import * as observable from '@nativescript/core/data/observable';
-import * as pages from '@nativescript/core/ui/page';
-import { HelloWorldModel } from './main-view-model';
-
-// Event handler for Page "loaded" event attached in main-page.xml
-export function pageLoaded(args: observable.EventData) {
-    // Get the event sender
-    const page = args.object as pages.Page;
-    if (!page.bindingContext) {
-        page.bindingContext = new HelloWorldModel();
-
-    }
-}
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
deleted file mode 100644
index 0b3067e..0000000
--- a/demo/app/main-page.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded">
-  <StackLayout>
-    <Label text="{{ message }}" class="message" textWrap="true"/>
-
-    <ListView items="{{ gpsPoints }}">
-      <ListView.itemTemplate>
-        <Label text="{{ name }}"  />
-      </ListView.itemTemplate>
-    </ListView>
-  </StackLayout>
-</Page>
\ No newline at end of file
diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
deleted file mode 100644
index 48f9fbf..0000000
--- a/demo/app/main-view-model.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { Observable } from '@nativescript/core/data/observable';
-import { ObservableArray } from '@nativescript/core/data/observable-array';
-import { GPS } from '@nativescript-community/gps';
-const gps = new GPS();
-export class HelloWorldModel extends Observable {
-    public message: string;
-    public gpsPoints: ObservableArray<any>;
-    private watchId: number;
-    private uiApplication: any;
-
-    constructor() {
-        super();
-        console.log('HelloWorldModel');
-
-        this.message = 'Tracking location';
-
-        this.gpsPoints = new ObservableArray([]);
-
-        this.enableLocation()
-            .then(() => {
-                console.log('enableLocation done');
-                gps.watchLocation(this.locationReceived, this.error, {
-                    provider: 'gps',
-                    minimumUpdateTime: 1000
-                }).then((watchId) => (this.watchId = watchId));
-            })
-            .catch(this.error);
-    }
-
-    enableLocation() {
-        if (!gps.isEnabled()) {
-            console.log('Location not enabled, requesting.');
-            return gps.authorize(true).then(() => gps.enable());
-        } else {
-            return Promise.resolve(true);
-        }
-    }
-
-    getLocation() {
-        if (gps.isEnabled()) {
-            return gps.getCurrentLocation({
-                minimumUpdateTime: 1000
-            });
-        }
-        return Promise.reject('Geolocation not enabled.');
-    }
-
-    locationReceived = (position: any) => {
-        console.log('GPS Update Received');
-        // {
-        //   "latitude": 33.52077361638753,
-        //   "longitude": -111.89930240833577,
-        //   "altitude": 384.0000915527344,
-        //   "horizontalAccuracy": 65,
-        //   "verticalAccuracy": 10,
-        //   "speed": -1,
-        //   "direction": -1,
-        //   "timestamp": "2016-10-04T00:22:59.316Z",
-        //   "ios": {}
-        // }
-
-        console.log(JSON.stringify(position));
-        console.log(JSON.stringify(position.latitude));
-        console.log(JSON.stringify(position.longitude));
-
-        const gpsTime: Date = new Date(position.timestamp);
-        const logTime: Date = new Date();
-        const difference: number = (logTime.getTime() - gpsTime.getTime()) / 1000;
-        this.message = `last location:${difference},${position.latitude},${position.longitude}`;
-        this.gpsPoints.unshift({ name: gpsTime });
-    };
-
-    error(err) {
-        console.log('Error: ' + JSON.stringify(err));
-    }
-
-    formatDate(date: Date) {
-        return date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
-    }
-}
diff --git a/demo/nativescript.config.ts b/demo/nativescript.config.ts
deleted file mode 100644
index d64a44c..0000000
--- a/demo/nativescript.config.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { NativeScriptConfig } from '@nativescript/core';
-
-export default {
-    id: 'org.nativescript.gpsdemo',
-    appPath: 'app',
-    appResourcesPath: 'app/App_Resources',
-    android: {
-        v8Flags: '--expose_gc',
-        markingMode: 'none'
-    }
-} as NativeScriptConfig;
diff --git a/demo/package.json b/demo/package.json
deleted file mode 100644
index ea69c53..0000000
--- a/demo/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "dependencies": {
-        "@nativescript-community/gps": "link:../plugin",
-        "@nativescript/core": "8.4.1"
-    },
-    "devDependencies": {
-        "@nativescript/android": "8.4.0",
-        "@nativescript/webpack": "5.0.12",
-        "typescript": "4.8.4"
-    },
-    "main": "app/app"
-}
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
deleted file mode 100644
index 1671cbd..0000000
--- a/demo/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "esnext",
-        "target": "es2017",
-        "experimentalDecorators": true,
-        "noEmitHelpers": true,
-        "lib": [
-            "es6",
-            "dom",
-            "es2017"
-        ],
-        "baseUrl": ".",
-        "paths": {
-            "~/*": [
-                "app/*"
-            ]
-        },
-        "moduleResolution": "node",
-        "removeComments": false
-    },
-    "exclude": [
-        "node_modules",
-        "platforms"
-    ]
-}
\ No newline at end of file
diff --git a/demo/webpack.config.js b/demo/webpack.config.js
deleted file mode 100644
index c99a500..0000000
--- a/demo/webpack.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const webpack = require('@nativescript/webpack');
-module.exports = (env) => {
-    webpack.init(env);
-    return webpack.resolveConfig();
-};
diff --git a/package.json b/package.json
index 9736c81..9945d56 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,8 @@
     "homepage": "https://github.com/nativescript-community/gps",
     "readmeFilename": "../README.md",
     "devDependencies": {
+        "@nativescript-community/observable": "^2.0.11",
+        "@nativescript-community/perms": "^2.2.21",
         "@nativescript-community/plugin-seed-tools": "file:tools",
         "@nativescript-community/template-snippet": "file:demo-snippets"
     },
diff --git a/src/gps/index.android.ts b/src/gps/index.android.ts
index ea4b5a9..de4fd60 100644
--- a/src/gps/index.android.ts
+++ b/src/gps/index.android.ts
@@ -2,8 +2,8 @@ import { request } from '@nativescript-community/perms';
 import { AndroidActivityResultEventData, Application, CoreTypes, Trace, Utils } from '@nativescript/core';
 import { AndroidApplication } from '@nativescript/core/application';
 import { AltitudeKey, CLog, CLogTypes, GPSCommon, GenericGeoLocation, LatitudeKey, LongitudeKey, defaultGetLocationTimeout } from './index.common';
-import { DefaultLatLonKeys } from './location';
-import { LocationMonitor as LocationMonitorDef, Options, errorCallbackType, successCallbackType } from './location-monitor';
+import type { DefaultLatLonKeys } from './location';
+import type { LocationMonitor as LocationMonitorDef, Options, errorCallbackType, successCallbackType } from './location-monitor';
 
 export * from './index.common';
 
diff --git a/src/gps/index.ios.ts b/src/gps/index.ios.ts
index 7fa04e4..0c2c7de 100644
--- a/src/gps/index.ios.ts
+++ b/src/gps/index.ios.ts
@@ -1,8 +1,8 @@
 import { request } from '@nativescript-community/perms';
 import { Application, CoreTypes, Trace } from '@nativescript/core';
 import { AltitudeKey, CLog, CLogTypes, GPSCommon, LatitudeKey, LongitudeKey } from './index.common';
-import { DefaultLatLonKeys, GenericGeoLocation } from './location';
-import { LocationMonitor as LocationMonitorDef, Options, deferredCallbackType, errorCallbackType, successCallbackType } from './location-monitor';
+import type { DefaultLatLonKeys, GenericGeoLocation } from './location';
+import type { LocationMonitor as LocationMonitorDef, Options, deferredCallbackType, errorCallbackType, successCallbackType } from './location-monitor';
 export * from './index.common';
 export { Options, successCallbackType, errorCallbackType, deferredCallbackType };
 
diff --git a/svelte.config.js b/svelte.config.js
new file mode 100644
index 0000000..5c7d758
--- /dev/null
+++ b/svelte.config.js
@@ -0,0 +1,18 @@
+const sveltePreprocess = require('svelte-preprocess');
+// const svelteNativePreprocessor = require('svelte-native-preprocessor');
+
+module.exports = {
+    compilerOptions: {
+        namespace: 'foreign'
+    },
+    preprocess: [
+        sveltePreprocess({
+            typescript: {
+                compilerOptions: {
+                    target: 'es2020'
+                }
+            }
+        })
+        // svelteNativePreprocessor()
+    ]
+};
diff --git a/yarn.lock b/yarn.lock
index 039b55f..5d6b648 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2191,27 +2191,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nativescript-community/gps@file:../packages/gps::locator=%40nativescript-community%2Ftemplate-snippet%40file%3Ademo-snippets%23demo-snippets%3A%3Ahash%3D4a9d86%26locator%3Droot-workspace-0b6124%2540workspace%253A.":
-  version: 3.1.8
-  resolution: "@nativescript-community/gps@file:../packages/gps#../packages/gps::hash=74254b&locator=%40nativescript-community%2Ftemplate-snippet%40file%3Ademo-snippets%23demo-snippets%3A%3Ahash%3D4a9d86%26locator%3Droot-workspace-0b6124%2540workspace%253A."
-  dependencies:
-    "@nativescript-community/observable": ^2.0.11
-    "@nativescript-community/perms": ^2.2.21
-  checksum: ae6672ac7aca41dc33ba2e4b63f3aef087edaf323f8e6d323e7c307363ab6376e43dd617980dd257f57e5e4b6a269b0fe393236e2a17a2a0646e097074bb6041
-  languageName: node
-  linkType: hard
-
-"@nativescript-community/gps@file:../packages/gps::locator=%40nativescript-community%2Ftemplate-snippet%40workspace%3Ademo-snippets":
-  version: 3.1.8
-  resolution: "@nativescript-community/gps@file:../packages/gps#../packages/gps::hash=74254b&locator=%40nativescript-community%2Ftemplate-snippet%40workspace%3Ademo-snippets"
-  dependencies:
-    "@nativescript-community/observable": ^2.0.11
-    "@nativescript-community/perms": ^2.2.21
-  checksum: ae6672ac7aca41dc33ba2e4b63f3aef087edaf323f8e6d323e7c307363ab6376e43dd617980dd257f57e5e4b6a269b0fe393236e2a17a2a0646e097074bb6041
-  languageName: node
-  linkType: hard
-
-"@nativescript-community/gps@workspace:packages/gps":
+"@nativescript-community/gps@3.1.8, @nativescript-community/gps@workspace:packages/gps":
   version: 0.0.0-use.local
   resolution: "@nativescript-community/gps@workspace:packages/gps"
   dependencies:
@@ -2302,16 +2282,16 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@nativescript-community/template-snippet@workspace:demo-snippets"
   dependencies:
-    "@nativescript-community/gps": "file:../packages/gps"
+    "@nativescript-community/gps": 3.1.8
   languageName: unknown
   linkType: soft
 
 "@nativescript-community/template-snippet@file:demo-snippets::locator=root-workspace-0b6124%40workspace%3A.":
   version: 0.0.1
-  resolution: "@nativescript-community/template-snippet@file:demo-snippets#demo-snippets::hash=4a9d86&locator=root-workspace-0b6124%40workspace%3A."
+  resolution: "@nativescript-community/template-snippet@file:demo-snippets#demo-snippets::hash=2a3af0&locator=root-workspace-0b6124%40workspace%3A."
   dependencies:
-    "@nativescript-community/gps": "file:../packages/gps"
-  checksum: f2142a0ad8d46f57074b488b6fa5f5574ecc7ea1cd28e92392a29d2956361bbeefbf62a80e363e398d4311cbaa644ca7c4c994c90d0720e18a86760019fcd351
+    "@nativescript-community/gps": 3.1.8
+  checksum: d4e442764dab77cc3b29645974a458797a33b1a080ede0c92311547e16172280ed42656329e4951fb2813c6e8fc544a9d563ce9e5033ec9042a74b0e890a769a
   languageName: node
   linkType: hard
 
@@ -13271,6 +13251,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "root-workspace-0b6124@workspace:."
   dependencies:
+    "@nativescript-community/observable": ^2.0.11
+    "@nativescript-community/perms": ^2.2.21
     "@nativescript-community/plugin-seed-tools": "file:tools"
     "@nativescript-community/template-snippet": "file:demo-snippets"
   languageName: unknown