diff --git a/app-root.xml b/app/app-root.xml
similarity index 100%
rename from app-root.xml
rename to app/app-root.xml
diff --git a/app.css b/app/app.css
similarity index 100%
rename from app.css
rename to app/app.css
diff --git a/app.ts b/app/app.ts
similarity index 100%
rename from app.ts
rename to app/app.ts
diff --git a/bundle-app-root.xml b/app/bundle-app-root.xml
similarity index 100%
rename from bundle-app-root.xml
rename to app/bundle-app-root.xml
diff --git a/bundle-app.ts b/app/bundle-app.ts
similarity index 100%
rename from bundle-app.ts
rename to app/bundle-app.ts
diff --git a/bundle-main-page.ts b/app/bundle-main-page.ts
similarity index 100%
rename from bundle-main-page.ts
rename to app/bundle-main-page.ts
diff --git a/bundle-main-page.xml b/app/bundle-main-page.xml
similarity index 100%
rename from bundle-main-page.xml
rename to app/bundle-main-page.xml
diff --git a/main-page.ts b/app/main-page.ts
similarity index 100%
rename from main-page.ts
rename to app/main-page.ts
diff --git a/main-page.xml b/app/main-page.xml
similarity index 100%
rename from main-page.xml
rename to app/main-page.xml
diff --git a/main-view-model.ts b/app/main-view-model.ts
similarity index 99%
rename from main-view-model.ts
rename to app/main-view-model.ts
index 6160f79..076212c 100644
--- a/main-view-model.ts
+++ b/app/main-view-model.ts
@@ -1,4 +1,4 @@
-/// <reference path="./declarations.d.ts"/>
+/// <reference path="../declarations.d.ts"/>
 import { Observable } from "tns-core-modules/data/observable";
 import { ObservableArray } from "tns-core-modules/data/observable-array";
 import * as http from "tns-core-modules/http";
@@ -21,7 +21,7 @@ function enableSocketIoDebugging() {
     global.window = global;
 }
 
-var config: INetworkConfiguration = require('./config');
+var config: INetworkConfiguration = require('../config');
 config.options = config.options || {};
 if (!config.options.appDirectoryRelativePath) {
     config.options.appDirectoryRelativePath = "app";
@@ -207,7 +207,7 @@ export class TestBrokerViewModel extends Observable {
         };
 
         this.updateView({ serverInfo: `connecting to ${this.baseUrl}`});
-        let io = require('./socket.io');
+        let io = require('../socket.io');
         const socket = this.socket = io.connect(this.baseUrl, { forceBase64: true });
 
         socket.on('connect', err => {
diff --git a/nativescript.png b/app/nativescript.png
similarity index 100%
rename from nativescript.png
rename to app/nativescript.png
diff --git a/run-details.ts b/app/run-details.ts
similarity index 100%
rename from run-details.ts
rename to app/run-details.ts
diff --git a/run-details.xml b/app/run-details.xml
similarity index 100%
rename from run-details.xml
rename to app/run-details.xml
diff --git a/services/karma-files-service.ts b/app/services/karma-files-service.ts
similarity index 100%
rename from services/karma-files-service.ts
rename to app/services/karma-files-service.ts
diff --git a/services/karma-host-resolver.ts b/app/services/karma-host-resolver.ts
similarity index 100%
rename from services/karma-host-resolver.ts
rename to app/services/karma-host-resolver.ts
diff --git a/services/test-execution-service.ts b/app/services/test-execution-service.ts
similarity index 100%
rename from services/test-execution-service.ts
rename to app/services/test-execution-service.ts
diff --git a/stop-process.android.ts b/app/stop-process.android.ts
similarity index 100%
rename from stop-process.android.ts
rename to app/stop-process.android.ts
diff --git a/stop-process.d.ts b/app/stop-process.d.ts
similarity index 100%
rename from stop-process.d.ts
rename to app/stop-process.d.ts
diff --git a/stop-process.ios.ts b/app/stop-process.ios.ts
similarity index 100%
rename from stop-process.ios.ts
rename to app/stop-process.ios.ts
diff --git a/test-run-page.ts b/app/test-run-page.ts
similarity index 100%
rename from test-run-page.ts
rename to app/test-run-page.ts
diff --git a/test-run-page.xml b/app/test-run-page.xml
similarity index 100%
rename from test-run-page.xml
rename to app/test-run-page.xml
diff --git a/lib/before-liveSync.ts b/lib/before-liveSync.ts
new file mode 100644
index 0000000..e3ef5f7
--- /dev/null
+++ b/lib/before-liveSync.ts
@@ -0,0 +1,13 @@
+module.exports = function ($staticConfig, $errors, hookArgs) {
+    var majorVersionMatch = ($staticConfig.version || '').match(/^(\d+)\./);
+    var majorVersion = majorVersionMatch && majorVersionMatch[1] && +majorVersionMatch[1];
+    if (majorVersion && majorVersion < 6) {
+        var isUsingBundleWorkflow = hookArgs &&
+            hookArgs.liveSyncData &&
+            hookArgs.liveSyncData.bundle;
+        if (isUsingBundleWorkflow) {
+            var packageJsonData = require("../package.json");
+            throw new Error("The current version of " + packageJsonData.name + " (" + packageJsonData.version + ") is not compatible with the used CLI: " + $staticConfig.version + ". Please upgrade your NativeScript CLI version (npm i -g nativescript).");
+        }
+    }
+};
diff --git a/package.json b/package.json
index 6e63bfd..51a8af8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-unit-test-runner",
-  "version": "0.6.4",
+  "version": "0.7.0",
   "description": "NativeScript unit test runner component.",
   "main": "app.js",
   "scripts": {
@@ -29,7 +29,12 @@
       {
         "type": "after-prepare",
         "script": "./lib/after-prepare.js",
-        "inject": "true"
+        "inject": true
+      },
+      {
+        "type": "before-liveSync",
+        "script": "lib/before-liveSync.js",
+        "inject": true
       }
     ]
   },