diff --git a/Assets/WebGLTemplates/WebVR/index.html b/Assets/WebGLTemplates/WebVR/index.html
index a1225be..067e079 100755
--- a/Assets/WebGLTemplates/WebVR/index.html
+++ b/Assets/WebGLTemplates/WebVR/index.html
@@ -10,7 +10,14 @@
     <title>%UNITY_CUSTOM_NAME% | %UNITY_WEB_NAME%</title>
     <meta name="description" content="%UNITY_CUSTOM_DESCRIPTION%">
     <link rel="icon" href="favicon.ico">
-    <link rel="stylesheet" type="text/css" href="webvr.css">
+    <link rel="stylesheet" type="text/css" href="styles/webvr.css">
+    <script src="lib/telemetry.js"></script>
+    <script>
+      MozillaResearch.telemetry.start({
+        analytics: true,
+        errorLogging: true        
+      });
+    </script>
     <script src="%UNITY_WEBGL_LOADER_URL%"></script>
     <script>
       /* global UnityLoader */
@@ -76,8 +83,8 @@ <h3>You&rsquo;ll need a <a href="https://webvr.rocks/">WebVR-enabled browser</a>
       <button id="entervr" value="Enter VR"></button>
     </div>
 
-    <script src="gl-matrix-min.js"></script>
-    <script src="webvr-polyfill.min.js"></script>
+    <script src="vendor/gl-matrix-min.js"></script>
+    <script src="vendor/webvr-polyfill.min.js"></script>
     <script src="webvr.js"></script>
   </body>
 
diff --git a/Assets/WebGLTemplates/WebVR/lib.meta b/Assets/WebGLTemplates/WebVR/lib.meta
new file mode 100644
index 0000000..f55c325
--- /dev/null
+++ b/Assets/WebGLTemplates/WebVR/lib.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: d2a6d0a7586c8134ba35c449d97a8ba6
+folderAsset: yes
+timeCreated: 1519985767
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/WebGLTemplates/WebVR/lib/telemetry.js b/Assets/WebGLTemplates/WebVR/lib/telemetry.js
new file mode 100644
index 0000000..50d496c
--- /dev/null
+++ b/Assets/WebGLTemplates/WebVR/lib/telemetry.js
@@ -0,0 +1,108 @@
+/* global localStorage, location, Raven */
+(function (window) {
+'use strict';
+
+if (!('MozillaResearch' in window)) {
+  window.MozillaResearch = {};
+}
+
+if (!('telemetry' in window.MozillaResearch)) {
+  window.MozillaResearch.telemetry = {};
+}
+
+var navigator = window.navigator;
+var telemetry = window.MozillaResearch.telemetry;
+
+telemetry.ga = {
+  create: function (trackingId, cookieDomain, name, fieldsObject) {
+    window.ga('create', trackingId, cookieDomain, name, fieldsObject);
+    return function (command) {
+      if (navigator.doNotTrack === '1') { return; }
+      var args = Array.prototype.slice.call(arguments);
+      if (name && command !== 'provide') {
+        command = name + '.' + command;
+        args[0] = command;
+      }
+      window.ga.apply(undefined, args);
+    };
+  }
+};
+
+telemetry.start = function (config) {
+  config = config || {};
+  if (navigator.doNotTrack === '1') {
+    return;
+  }
+  if (config.errorLogging) {
+    startErrorLogging();
+  }
+  if (config.analytics) {
+    startAnalytics();
+  }
+};
+
+setupAnalytics();
+
+function setupAnalytics() {
+  window.ga = window.ga || function () {
+    (window.ga.q = (window.ga.q || [])).push(arguments)
+  };
+  window.ga.l = +(new Date());
+
+  if (navigator.doNotTrack === '1') {
+    return;
+  }
+  injectScript('https://www.google-analytics.com/analytics.js', function (err) {
+    if (err) {
+      console.warn('Could not load Analytics.js script:', err);
+      return;
+    }
+  });  
+}
+
+function startErrorLogging() {
+  injectScript('https://cdn.ravenjs.com/3.22.3/console/raven.min.js', function (err) {
+    if (err) {
+      console.warn('Could not load Raven.js script:', err);
+      return;
+    }
+    if (!('Raven' in window)) {
+      console.warn('Could not find `window.Raven` global');
+      return;
+    }
+    configureRaven();
+  });
+
+  function configureRaven () {
+    console.log('Raven.js script loaded');
+    Raven.config('https://e359be9fb9324addb0dc97b664cf5ee6@sentry.io/294878')
+         .install();
+  }
+};
+
+function startAnalytics() {
+  var CURRENT_VERSION = '1.0.1';
+  var ga = telemetry.ga.create('UA-77033033-6', 'auto', 'mozillaResearch');
+  ga('set', 'dimension1', CURRENT_VERSION);
+  ga('send', 'pageview');
+}
+
+function injectScript (src, callback) {
+  var script = document.createElement('script');
+  script.src = src;
+  script.crossorigin = 'anonymous';
+  script.addEventListener('load', function () {
+    if (callback) {
+      callback(null, true);
+    }
+  });
+  script.addEventListener('error', function (err) {
+    if (callback) {
+      callback(err);
+    }
+  });
+  document.head.appendChild(script);
+  return script;
+}
+
+})(window);
diff --git a/Assets/WebGLTemplates/WebVR/lib/telemetry.js.meta b/Assets/WebGLTemplates/WebVR/lib/telemetry.js.meta
new file mode 100644
index 0000000..574560e
--- /dev/null
+++ b/Assets/WebGLTemplates/WebVR/lib/telemetry.js.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: c633f0bb019160240890f318c0892720
+timeCreated: 1519985767
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/WebGLTemplates/WebVR/vendor.meta b/Assets/WebGLTemplates/WebVR/vendor.meta
new file mode 100644
index 0000000..3f6dd3b
--- /dev/null
+++ b/Assets/WebGLTemplates/WebVR/vendor.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: d0df3df31b907984d94fb1f937b5d179
+folderAsset: yes
+timeCreated: 1520325169
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/WebGLTemplates/WebVR/gl-matrix-min.js b/Assets/WebGLTemplates/WebVR/vendor/gl-matrix-min.js
old mode 100755
new mode 100644
similarity index 100%
rename from Assets/WebGLTemplates/WebVR/gl-matrix-min.js
rename to Assets/WebGLTemplates/WebVR/vendor/gl-matrix-min.js
diff --git a/Assets/WebGLTemplates/WebVR/gl-matrix-min.js.meta b/Assets/WebGLTemplates/WebVR/vendor/gl-matrix-min.js.meta
similarity index 68%
rename from Assets/WebGLTemplates/WebVR/gl-matrix-min.js.meta
rename to Assets/WebGLTemplates/WebVR/vendor/gl-matrix-min.js.meta
index 354b4cf..dbde4c0 100644
--- a/Assets/WebGLTemplates/WebVR/gl-matrix-min.js.meta
+++ b/Assets/WebGLTemplates/WebVR/vendor/gl-matrix-min.js.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 7e17ecd3f3a0d4b70a7062cfe1e2e42e
-timeCreated: 1512279285
+guid: 1f358a6f04ff58044bb7f744fdec9215
+timeCreated: 1519985767
 licenseType: Free
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js b/Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js
old mode 100755
new mode 100644
similarity index 100%
rename from Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js
rename to Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js
diff --git a/Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.map b/Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.map
old mode 100755
new mode 100644
similarity index 100%
rename from Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.map
rename to Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.map
diff --git a/Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.map.meta b/Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.map.meta
similarity index 68%
rename from Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.map.meta
rename to Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.map.meta
index fbef821..20cbc79 100644
--- a/Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.map.meta
+++ b/Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.map.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 39192c959a0274749a8c164615c3df7d
-timeCreated: 1517989736
+guid: bb535c0e44190994091ac028d9a09849
+timeCreated: 1519985767
 licenseType: Free
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.meta b/Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.meta
similarity index 68%
rename from Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.meta
rename to Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.meta
index c8a2f77..b2d9bda 100644
--- a/Assets/WebGLTemplates/WebVR/webvr-polyfill.min.js.meta
+++ b/Assets/WebGLTemplates/WebVR/vendor/webvr-polyfill.min.js.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: b1e8beae11600499b919f18981b44d94
-timeCreated: 1517973444
+guid: 396dffe588e5d0a4d836c8ca14054823
+timeCreated: 1519985767
 licenseType: Free
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/WebGLTemplates/WebVR/webvr.css b/Assets/WebGLTemplates/WebVR/webvr.css
old mode 100755
new mode 100644
diff --git a/Assets/WebGLTemplates/WebVR/webvr.css.meta b/Assets/WebGLTemplates/WebVR/webvr.css.meta
old mode 100755
new mode 100644
index 16f6c4a..e093489
--- a/Assets/WebGLTemplates/WebVR/webvr.css.meta
+++ b/Assets/WebGLTemplates/WebVR/webvr.css.meta
@@ -1,8 +1,9 @@
 fileFormatVersion: 2
 guid: 8445918f772914f72915553df837da19
-timeCreated: 1494698833
-licenseType: Pro
+timeCreated: 1520350787
+licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: