diff --git a/.gitignore b/.gitignore
index 9902c78..c44bdb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -179,3 +179,4 @@ xcuserdata
 
 dist
 www/libs
+/www/
diff --git a/www/css/app.css b/app/css/app.css
similarity index 100%
rename from www/css/app.css
rename to app/css/app.css
diff --git a/www/css/index.css b/app/css/index.css
similarity index 100%
rename from www/css/index.css
rename to app/css/index.css
diff --git a/www/css/material-icons.css b/app/css/material-icons.css
similarity index 100%
rename from www/css/material-icons.css
rename to app/css/material-icons.css
diff --git a/www/css/mui.css b/app/css/mui.css
similarity index 100%
rename from www/css/mui.css
rename to app/css/mui.css
diff --git a/www/css/mui.custom.css b/app/css/mui.custom.css
similarity index 100%
rename from www/css/mui.custom.css
rename to app/css/mui.custom.css
diff --git a/www/css/mui.min.css b/app/css/mui.min.css
similarity index 100%
rename from www/css/mui.min.css
rename to app/css/mui.min.css
diff --git a/www/css/progress.css b/app/css/progress.css
similarity index 100%
rename from www/css/progress.css
rename to app/css/progress.css
diff --git a/www/css/ripple.css b/app/css/ripple.css
similarity index 100%
rename from www/css/ripple.css
rename to app/css/ripple.css
diff --git a/www/fonts/Material_Icons-normal-400.woff b/app/fonts/Material_Icons-normal-400.woff
similarity index 100%
rename from www/fonts/Material_Icons-normal-400.woff
rename to app/fonts/Material_Icons-normal-400.woff
diff --git a/www/fonts/Ubuntu-normal-300.woff b/app/fonts/Ubuntu-normal-300.woff
similarity index 100%
rename from www/fonts/Ubuntu-normal-300.woff
rename to app/fonts/Ubuntu-normal-300.woff
diff --git a/www/fonts/Ubuntu-normal-400.woff b/app/fonts/Ubuntu-normal-400.woff
similarity index 100%
rename from www/fonts/Ubuntu-normal-400.woff
rename to app/fonts/Ubuntu-normal-400.woff
diff --git a/www/fonts/Ubuntu-normal-500.woff b/app/fonts/Ubuntu-normal-500.woff
similarity index 100%
rename from www/fonts/Ubuntu-normal-500.woff
rename to app/fonts/Ubuntu-normal-500.woff
diff --git a/www/fonts/Ubuntu-normal-700.woff b/app/fonts/Ubuntu-normal-700.woff
similarity index 100%
rename from www/fonts/Ubuntu-normal-700.woff
rename to app/fonts/Ubuntu-normal-700.woff
diff --git a/www/fonts/Ubuntu_Condensed-normal-400.woff b/app/fonts/Ubuntu_Condensed-normal-400.woff
similarity index 100%
rename from www/fonts/Ubuntu_Condensed-normal-400.woff
rename to app/fonts/Ubuntu_Condensed-normal-400.woff
diff --git a/www/fonts/fonts.css b/app/fonts/fonts.css
similarity index 100%
rename from www/fonts/fonts.css
rename to app/fonts/fonts.css
diff --git a/www/img/logo.png b/app/img/logo.png
similarity index 100%
rename from www/img/logo.png
rename to app/img/logo.png
diff --git a/www/index.html b/app/index.html
similarity index 100%
rename from www/index.html
rename to app/index.html
diff --git a/www/js/device/CC2650/cc2650_accelerometer.js b/app/js/device/CC2650/cc2650_accelerometer.js
similarity index 94%
rename from www/js/device/CC2650/cc2650_accelerometer.js
rename to app/js/device/CC2650/cc2650_accelerometer.js
index 1bcd4a0..653abfa 100644
--- a/www/js/device/CC2650/cc2650_accelerometer.js
+++ b/app/js/device/CC2650/cc2650_accelerometer.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY, inheritsFrom */
+/* global CAPABILITY, inheritsFrom, capabilityManager */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
@@ -44,15 +44,15 @@ var CC2650_ACCEL = function(p) {
           var message;
           var a = new Int16Array(data);
 
-          //0 gyro x
-          //1 gyro y
-          //2 gyro z
-          //3 accel x
-          //4 accel y
-          //5 accel z
-          //6 mag x
-          //7 mag y
-          //8 mag z
+          // 0 gyro x
+          // 1 gyro y
+          // 2 gyro z
+          // 3 accel x
+          // 4 accel y
+          // 5 accel z
+          // 6 mag x
+          // 7 mag y
+          // 8 mag z
 
           // TODO get a template to line this up
           // TODO round or format numbers for better display
@@ -87,7 +87,7 @@ var CC2650_ACCEL = function(p) {
         };
 
   this.startService = function() {
-    'use strict';
+
     if (this.deviceID !== null) {
 
       console.log('Starting CC2650 Accelerometer Service on ', this.deviceID);
@@ -172,4 +172,4 @@ var CC2650_ACCEL = function(p) {
 
 inheritsFrom(CC2650_ACCEL, CAPABILITY);
 
-capabilityManager.register({id:'F000AA80-0451-4000-B000-000000000000', module:CC2650_ACCEL});
+capabilityManager.register({id: 'F000AA80-0451-4000-B000-000000000000', module: CC2650_ACCEL});
diff --git a/www/js/device/CC2650/cc2650_barometer.js b/app/js/device/CC2650/cc2650_barometer.js
similarity index 84%
rename from www/js/device/CC2650/cc2650_barometer.js
rename to app/js/device/CC2650/cc2650_barometer.js
index 05c33c4..2b957a6 100644
--- a/www/js/device/CC2650/cc2650_barometer.js
+++ b/app/js/device/CC2650/cc2650_barometer.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY, inheritsFrom */
+/* global CAPABILITY, inheritsFrom, capabilityManager */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
@@ -29,7 +29,7 @@ var CC2650_BAR = function(p) {
   this.setFrame();
 
   this.startService = function() {
-    'use strict';
+
     if (this.deviceID !== null) {
 
       console.log('Starting CC2650 Barometer Service on ', this.deviceID);
@@ -38,7 +38,7 @@ var CC2650_BAR = function(p) {
 
       ble.startNotification(this.deviceID, this.serviceDef.service, this.serviceDef.data, this.onBarometerData.bind(this), this.onError);
 
-      //Turn on barometer
+      // Turn on barometer
       var barometerConfig = new Uint8Array(1);
       barometerConfig[0] = 0x01;
       ble.write(this.deviceID, this.serviceDef.service, this.serviceDef.configuration, barometerConfig.buffer,
@@ -59,8 +59,8 @@ var CC2650_BAR = function(p) {
           var message;
           var a = new Uint8Array(data);
 
-          //0-2 Temp
-          //3-5 Pressure
+          // 0-2 Temp
+          // 3-5 Pressure
           var temp, pressure;
           temp = this.sensorBarometerConvert(a[0] | (a[1] << 8) | (a[2] << 16));
           pressure = this.sensorBarometerConvert(a[3] | (a[4] << 8) | (a[5] << 16));
@@ -111,18 +111,18 @@ var CC2650_BAR = function(p) {
     this.$id.append(row);
 
     var tabBody = $('<ul>',{class: 'mui-tabs__bar mui-tabs__bar--justified'});
-    $('<li>',{class: 'mui--is-active tabOnWhite'}).append($('<a>',{text:'Temperature','data-mui-toggle': 'tab', 'data-mui-controls': (temp + '-pane')})).appendTo(tabBody);
-    $('<li>',{class: 'tabOnWhite'}).append($('<a>',{text:'Pressure','data-mui-toggle': 'tab', 'data-mui-controls': (pressure + '-pane')})).appendTo(tabBody);
+    $('<li>',{class: 'mui--is-active tabOnWhite'}).append($('<a>',{text: 'Temperature','data-mui-toggle': 'tab', 'data-mui-controls': (temp + '-pane')})).appendTo(tabBody);
+    $('<li>',{class: 'tabOnWhite'}).append($('<a>',{text: 'Pressure','data-mui-toggle': 'tab', 'data-mui-controls': (pressure + '-pane')})).appendTo(tabBody);
 
     this.$id.append(tabBody);
 
     blankChart = this.generateBlankGraph('temp');
 
-    this.$id.append($('<div>',{'class':'mui-tabs__pane mui--is-active',id:(temp + '-pane')}).append(blankChart));
+    this.$id.append($('<div>',{class: 'mui-tabs__pane mui--is-active',id: (temp + '-pane')}).append(blankChart));
 
     blankChart = this.generateBlankGraph('pressure');
 
-    this.$id.append($('<div>',{'class':'mui-tabs__pane',id:(pressure + '-pane')}).append(blankChart));
+    this.$id.append($('<div>',{class: 'mui-tabs__pane',id: (pressure + '-pane')}).append(blankChart));
 
     this.$result.temp = $('#' + temp);
     this.$result.pressure = $('#' + pressure);
@@ -134,4 +134,4 @@ var CC2650_BAR = function(p) {
 
 inheritsFrom(CC2650_BAR, CAPABILITY);
 
-capabilityManager.register({id:'F000AA40-0451-4000-B000-000000000000', module:CC2650_BAR});
+capabilityManager.register({id: 'F000AA40-0451-4000-B000-000000000000', module: CC2650_BAR});
diff --git a/www/js/device/CC2650/cc2650_humidity.js b/app/js/device/CC2650/cc2650_humidity.js
similarity index 93%
rename from www/js/device/CC2650/cc2650_humidity.js
rename to app/js/device/CC2650/cc2650_humidity.js
index d9416e0..6318b82 100644
--- a/www/js/device/CC2650/cc2650_humidity.js
+++ b/app/js/device/CC2650/cc2650_humidity.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY, inheritsFrom */
+/* global CAPABILITY, inheritsFrom, capabilityManager */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
@@ -29,7 +29,7 @@ var CC2650_HUM = function(p) {
   this.setFrame();
 
   this.startService = function() {
-    'use strict';
+
     if (this.deviceID !== null) {
 
       console.log('Starting CC2650 Humidity Service on ', this.deviceID);
@@ -42,7 +42,7 @@ var CC2650_HUM = function(p) {
         this.onHumidityData.bind(this),
         this.onError);
 
-      //Turn on barometer
+      // Turn on barometer
       var humidityConfig = new Uint8Array(1);
       humidityConfig[0] = 0x01;
       ble.write(this.deviceID,
@@ -63,17 +63,17 @@ var CC2650_HUM = function(p) {
     var message;
     var raw = new Uint16Array(data);
 
-    //-- calculate temperature [°C]
+    // -- calculate temperature [°C]
     var temp = (raw[0] / 65536) * 165 - 40;
 
-    //-- calculate relative humidity [%RH]
+    // -- calculate relative humidity [%RH]
     var hum = (raw[1] / 65536) * 100;
 
     tStr = temp.toFixed(2) + '°C';
     hStr = hum.toFixed(2) + '%RH';
 
     message = 'Temperature <br/>' + tStr + 'Humidity <br/>' + hStr;
-    
+
     this.data.temp = this.storeData(temp, this.data.temp);
     this.data.humidity = this.storeData(hum, this.data.humidity);
 
@@ -141,4 +141,4 @@ var CC2650_HUM = function(p) {
 
 inheritsFrom(CC2650_HUM, CAPABILITY);
 
-capabilityManager.register({id:'F000AA20-0451-4000-B000-000000000000', module:CC2650_HUM});
+capabilityManager.register({id: 'F000AA20-0451-4000-B000-000000000000', module: CC2650_HUM});
diff --git a/www/js/device/CC2650/cc2650_luxometer.js b/app/js/device/CC2650/cc2650_luxometer.js
similarity index 93%
rename from www/js/device/CC2650/cc2650_luxometer.js
rename to app/js/device/CC2650/cc2650_luxometer.js
index 7644769..0ca86c5 100644
--- a/www/js/device/CC2650/cc2650_luxometer.js
+++ b/app/js/device/CC2650/cc2650_luxometer.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY, inheritsFrom */
+/* global CAPABILITY, inheritsFrom, capabilityManager */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
@@ -30,7 +30,7 @@ var CC2650_LUX = function(p) {
   this.setFrame();
 
   this.startService = function() {
-    'use strict';
+
     if (this.deviceID !== null) {
 
       console.log('Starting CC2650 Luxometer Service on ', this.deviceID);
@@ -43,7 +43,7 @@ var CC2650_LUX = function(p) {
         this.onLuxData.bind(this),
         this.onError);
 
-      //Turn on luxometer
+      // Turn on luxometer
       var luxConfig = new Uint8Array(1);
       luxConfig[0] = 0x01;
       ble.write(this.deviceID,
@@ -110,4 +110,4 @@ var CC2650_LUX = function(p) {
 };
 
 inheritsFrom(CC2650_LUX, CAPABILITY);
-capabilityManager.register({id:'F000AA70-0451-4000-B000-000000000000', module:CC2650_LUX});
+capabilityManager.register({id: 'F000AA70-0451-4000-B000-000000000000', module: CC2650_LUX});
diff --git a/www/js/device/CC2650/cc2650_thermopile.js b/app/js/device/CC2650/cc2650_thermopile.js
similarity index 97%
rename from www/js/device/CC2650/cc2650_thermopile.js
rename to app/js/device/CC2650/cc2650_thermopile.js
index 0c12e9d..79fc33e 100644
--- a/www/js/device/CC2650/cc2650_thermopile.js
+++ b/app/js/device/CC2650/cc2650_thermopile.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY, inheritsFrom */
+/* global CAPABILITY, inheritsFrom, capabilityManager */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
@@ -30,7 +30,7 @@ var CC2650_TMP = function(p) {
   this.setFrame();
 
   this.startService = function() {
-    'use strict';
+
     if (this.deviceID !== null) {
 
       console.log('Starting CC2650 Thermopile Service on ', this.deviceID);
@@ -43,7 +43,7 @@ var CC2650_TMP = function(p) {
         this.onThermData.bind(this),
         this.onError);
 
-      //Turn on thermopile
+      // Turn on thermopile
       var tmpConfig = new Uint8Array(1);
       tmpConfig[0] = 0x01;
       ble.write(this.deviceID,
@@ -83,7 +83,7 @@ var CC2650_TMP = function(p) {
 
     this.$result.temp.text(tStr);
     this.$result.ambient.text(aStr);
-    
+
   };
 
   this.animateGraph = function() {
diff --git a/app/js/index.js b/app/js/index.js
new file mode 100644
index 0000000..6b13452
--- /dev/null
+++ b/app/js/index.js
@@ -0,0 +1,529 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* global mui, bt_company_ids, ble, LocalFileSystem, capabilityManager, MANUFACTUREDECODER */
+
+var app = {
+  stop: false,
+  log: {},
+  activeServices: {},
+
+  list: {},
+  foundDevices: {},
+
+  manufactureDecoder: new MANUFACTUREDECODER(),
+  // Application Constructor
+  initialize: function() {
+    this.bindEvents();
+  },
+
+  arrayBufferToIntArray: function(buffer) {
+      var result;
+
+      if (buffer) {
+        var typedArray = new Uint8Array(buffer);
+        result = [];
+        for (var i = 0; i < typedArray.length; i++) {
+          result[i] = typedArray[i];
+        }
+      }
+
+      return result;
+    },
+
+  parseAdvertisingData: function(bytes) {
+    var length, type, data, i = 0, advertisementData = {};
+
+    while (length !== 0) {
+
+      length = bytes[i] & 0xFF;
+      i++;
+
+      type = bytes[i] & 0xFF;
+      i++;
+
+      data = bytes.slice(i, i + length - 1); // Length includes type byte, but not length byte
+      i += length - 2;  // Move to end of data
+      i++;
+
+      advertisementData[type] = data;
+    }
+
+    return advertisementData;
+  },
+  handle255: function(buffer) {
+    'use strict';
+
+    var company;
+    var cid;
+    var manID;
+    var bin = buffer;
+    var decoded = {};
+
+    console.log('Block255', bin);
+/*
+    var manSpec = bin.map(function(i) {
+
+      return i.toString(16) + ' ';
+    });
+
+    console.log('manSpec: ', manSpec);
+*/
+    manID = app.manufactureDecoder.getManID(bin);
+
+    console.log('ManID:', manID);
+
+    cid = '0x' + manID;
+
+    company = bt_company_ids.find(cid);
+
+    switch (manID) {
+      case '004c': {
+        decoded = app.manufactureDecoder.decodeIbeacon(bin);
+        decoded.company = company;
+        break;
+      }
+      case '1235': {
+        decoded = app.manufactureDecoder.decodeSiliconLabsSensorPuck(bin);
+        decoded.company = company;
+        break;
+
+      }
+      case '0060': {
+        decoded = app.manufactureDecoder.decodeSansible(bin);
+        decoded.company = company;
+        break;
+
+      }
+      default: {
+        console.log('Unknown manID: ', manID);
+        decoded = {company: company};
+
+      }
+    }
+    return decoded;
+  },
+  makeHexBuffer: function(buffer) {
+    'use strict';
+    var hexBuffer = buffer.map(function(i) {
+              return ('00' + i.toString(16)).slice(-2) + ',';
+            });
+    return hexBuffer;
+  },
+  makeChars: function(buffer) {
+    'use strict';
+    var output = buffer.map(function(i) {
+
+              return String.fromCharCode(i);
+            });
+
+    return output;
+  },
+  buildNewDeviceResultPanel: function(device) {
+    'use strict';
+    var newPanel, newRow;
+    var otherData = device.otherData;
+    var newId = 'd-' + device.id.replace(/:/g, '');
+    var title = device.hasOwnProperty('name') ? device.name : '*** Unknown';
+
+    newPanel = $('<div>',{id: newId,class: 'mui-panel deviceRow', style: 'min-height:75px;'});
+
+
+    newRow = $('<div>',{class: 'mui-row'});
+
+    newRow.append($('<div>',{class: 'mui-col-xs-12 mui--text-title',text: device.id}));
+
+    newPanel.append(newRow);
+
+
+    newRow = $('<div>',{class: 'mui-row'});
+    newRow.append($('<div>',{class: 'mui-col-xs-3',text: 'Title:'}));
+    newRow.append($('<div>',{class: 'mui-col-xs-3',text: title}));
+    newRow.append($('<div>',{class: 'mui-col-xs-3',text: 'RSSI:'}));
+    newRow.append($('<div>',{class: 'mui-col-xs-3',text: device.rssi}));
+
+    newPanel.append(newRow);
+
+    if (typeof otherData !== 'undefined' && otherData !== null) {
+      if (otherData.hasOwnProperty('msg')) {
+        newRow = $('<div>',{class: 'mui-row'});
+        newRow.append($('<div>',{class: 'mui-col-xs-3',text: 'Data:'}));
+        newRow.append($('<div>',{class: 'mui-col-xs-8',text: otherData.msg}));
+        newPanel.append(newRow);
+      }
+    }
+
+    return newPanel;
+  },
+  extractPData: function(prev) {
+    'use strict';
+
+    if (typeof prev === 'undefined' || prev === null) {
+      return {};
+    }
+    return prev.pData;
+
+  },
+
+  processPData: function(newData, oldData) {
+    'use strict';
+    var output = {};
+    var wa = [];
+    if (newData.data === null) {
+      return {};
+    }
+
+    for (var key in newData.data) {
+
+      if (newData.data.hasOwnProperty(key)) {
+
+        if (Object.keys(oldData).indexOf(key) !== -1) {
+          wa = oldData[key];
+        }
+
+        if (wa.length === 99) {
+          wa = wa.slice(1);
+        }
+
+        wa.push(newData.data[key]);
+
+        output[key] = wa;
+      }
+    }
+
+    return output;
+  },
+  doScan: function(mode) {
+    'use strict';
+
+    $('#ripple').show();
+    if (mode !== 2) {
+      $('#tbody').empty();
+    }
+
+    var otherData = null;
+    var msgText = '';
+    ble.startScan([], function(device) {
+      var parsed;
+      var hexBuffer;
+      var advertBuffer;
+      var newTR;
+      var newId;
+      var _device = device;
+      var $newID;
+
+      _device.pData = {};
+
+      otherData = null;
+      msgText = '';
+
+      newId = 'd-' + _device.id.replace(/:/g, '');
+
+      this.list[newId] = _device.id;
+
+      if (_device.hasOwnProperty('advertising')) {
+
+        advertBuffer = app.arrayBufferToIntArray(_device.advertising);
+
+        hexBuffer = app.makeHexBuffer(advertBuffer);
+
+        parsed = app.parseAdvertisingData(advertBuffer);
+
+        // Console.log(parsed);
+
+        if (parsed.hasOwnProperty('9')) {
+
+          var name = app.makeChars(parsed['9']);
+
+          _device.name = name.join('');
+          console.log('Name: ', name.join(''));
+
+        }
+
+        if (parsed.hasOwnProperty('255')) {
+
+          otherData = app.handle255(parsed['255']);
+          console.log(otherData);
+          _device.otherData = otherData;
+        }
+        _device.advertBuffer = advertBuffer;
+        _device.hexBuffer = hexBuffer;
+        _device.parsed = parsed;
+      }
+
+      newTR = app.buildNewDeviceResultPanel(device);
+
+      $newID = $('div#' + newId);
+      if ($newID.length > 0) {
+        $newID.replaceWith(newTR);
+      } else {
+        $('#scanResults').append(newTR);
+      }
+
+      // $('#output').append(JSON.stringify(device) + '<br/>');
+
+      var oldPdata = app.extractPData(app.log[newId]);
+
+      var newPData = app.processPData(otherData, oldPdata);
+
+      //  Console.log(newPData);
+      _device.pData = newPData;
+
+      app.log[newId] = _device;
+      app.foundDevices[newId] = _device;
+
+      //  Console.log(JSON.stringify(_device));
+
+    }.bind(this), function(e) {
+      console.error(e);
+    });
+
+    var _t = [5000,60000,200][mode];
+
+    setTimeout(ble.stopScan,
+      _t,
+      function() { console.log('Scan complete');
+
+        if (mode === 1) {
+          app.saveLog();
+          $('#ripple').hide();
+        }
+
+        if (mode === 2) {
+          if (!app.stop) {
+            setTimeout(function() {
+                        app.doScan(2);
+                      }.bind(this), 200);
+          } else {
+            app.saveLog();
+            $('#ripple').hide();
+          }
+
+        }
+      },
+      function() { console.log('stopScan failed');
+        $('#ripple').hide();
+      });
+
+  },
+  writeFile: function(fileEntry, dataObj) {
+      // Create a FileWriter object for our FileEntry (log.txt).
+      fileEntry.createWriter(function(fileWriter) {
+
+          fileWriter.onwriteend = function() {
+              console.log('Successful file write...');
+              //  ReadFile(fileEntry);
+            };
+
+          fileWriter.onerror = function(e) {
+              console.error('Failed file write: ' + e.toString());
+            };
+
+          // If data object is not passed in,
+          // create a new Blob instead.
+          if (!dataObj) {
+            dataObj = new Blob(['some file data'], { type: 'text/plain' });
+          }
+
+          fileWriter.write(dataObj);
+        });
+    },
+  saveLog: function() {
+    'use strict';
+    var dt = new Date().toISOString().replace(/:|-/g,'').replace(/(\.\w+)/g,'');
+    var payload = JSON.stringify(app.log);
+    var filename = 'sensortoy-' + dt + '.json';
+
+    // Var dataObj = new Blob(payload, { type: 'text/plain' });
+    window.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function(fs) {
+
+        console.log('file system open: ' + fs.name);
+        fs.root.getFile(filename, { create: true, exclusive: false }, function(fileEntry) {
+
+            console.log('fileEntry is file?' + fileEntry.isFile.toString());
+            // FileEntry.name == 'someFile.txt'
+            // fileEntry.fullPath == '/someFile.txt'
+            console.log('Path: ', fileEntry.fullPath);
+            app.writeFile(fileEntry, payload);
+
+            app.log = [];
+
+          }, app.onError);
+
+      }, app.onError);
+  },
+  forceStop: function() {
+    'use strict';
+    app.stop = true;
+    $('#scan').show();
+    $('#stop').hide();
+  },
+
+  // Bind Event Listeners
+  //
+  // Bind any events that are required on startup. Common events are:
+  // 'load', 'deviceready', 'offline', and 'online'.
+  bindEvents: function() {
+    var self = this;
+    document.addEventListener('deviceready', this.onDeviceReady, false);
+    $('#scan').on('click', function() {
+      'use strict';
+      this.stop = false;
+      this.doScan(2);
+      $('#scan').hide();
+      $('#stop').show();
+    }.bind(this));
+
+    $('#stop').on('click', function() {
+          'use strict';
+          app.forceStop();
+
+        }.bind(this));
+
+    $('#longScan').on('click', function() {
+      'use strict';
+      this.doScan(1);
+    }.bind(this));
+
+    $('#scanResults').on('click', 'div.mui-panel.deviceRow', function() {
+      'use strict';
+      var tID = $(this).context.id;
+      var id = self.list[tID];
+
+      console.log(tID, id);
+
+      app.forceStop();
+      self.connect(id);
+    });
+
+  },
+  addTab: function(tID) {
+    var appTabs = $('#app-tabs');
+    var panes = $('#tab-panes');
+
+    var paneID = 'pane-' + tID;
+
+    var _device = app.foundDevices[tID];
+    var _name = _device.name || _device.id;
+
+    console.log('Found:', _device);
+
+    $('<div>', {class: 'mui-tabs__pane', id: paneID}).appendTo(panes);
+
+
+    var li = $('<li>').append($('<a>',{'data-mui-toggle': 'tab', 'data-mui-controls': paneID, text: _name }));
+
+    appTabs.append(li);
+
+    return paneID;
+
+  },
+
+  // Deviceready Event Handler
+  //
+  // The scope of 'this' is the event. In order to call the 'receivedEvent'
+  // function, we must explicitly call 'app.receivedEvent(...);'
+  onDeviceReady: function() {
+
+  },
+
+  doAnimate: function() {
+    'use strict';
+    // Console.log('Animate..');
+    for (var t = 0; t < app.activeServices.length;t++) {
+      app.activeServices[t].animateGraph();
+    }
+
+    window.requestAnimFrame(app.doAnimate.bind(this));
+  },
+  connect: function(deviceId) {
+
+    $('#results').slideUp();
+    console.log('Connect to ', deviceId);
+
+    var tID = 'd-' + deviceId.replace(/:/g, '');
+
+    var onConnect = function(a) {
+      var services = [];
+
+      services = a.services;
+
+
+      console.log('Searching services for ', tID);
+      var usedServices = [];
+
+      var target = app.addTab(tID);
+
+      var _params = {
+            deviceID: deviceId,
+            target: target
+          };
+
+      for (var t = 0; t < services.length; t++) {
+
+        var ident = services[t].toUpperCase();
+
+        var SERVICE = capabilityManager.discover(ident);
+
+        if (SERVICE !== null) {
+
+          var newService = new SERVICE(_params);
+          newService.startService();
+          usedServices.push(newService);
+        } else {
+          console.error('Unknown service: ', ident);
+        }
+
+      }
+
+      app.activeServices[tID] = usedServices;
+
+      mui.tabs.activate(target);
+      window.requestAnimFrame(app.doAnimate.bind(this));
+    };
+
+    if (!app.activeServices.hasOwnProperty(tID)) {
+
+      ble.connect(deviceId, onConnect, function(e) {
+            'use strict';
+            console.log(e);
+            console.error(e);
+
+          });
+
+    }
+
+  }, onError: function(reason) {
+    console.error('ERROR: ' + reason); // Real apps should use notification.alert
+  }, updateGyro: function(g) {
+    'use strict';
+
+  }
+};
+
+window.requestAnimFrame = (function() {
+  return window.requestAnimationFrame       ||
+          window.webkitRequestAnimationFrame ||
+          window.mozRequestAnimationFrame    ||
+          function(callback) {
+            window.setTimeout(callback, 1000 / 60);
+          };
+})();
+
+app.initialize();
diff --git a/www/js/mandecoder.js b/app/js/mandecoder.js
similarity index 100%
rename from www/js/mandecoder.js
rename to app/js/mandecoder.js
diff --git a/www/js/standards/battery.js b/app/js/standards/battery.js
similarity index 96%
rename from www/js/standards/battery.js
rename to app/js/standards/battery.js
index 8b56bc6..b588a36 100644
--- a/www/js/standards/battery.js
+++ b/app/js/standards/battery.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY */
+/* global CAPABILITY, inheritsFrom, capabilityManager */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
diff --git a/www/js/standards/bluetooth_company_identifiers.js b/app/js/standards/bluetooth_company_identifiers.js
similarity index 100%
rename from www/js/standards/bluetooth_company_identifiers.js
rename to app/js/standards/bluetooth_company_identifiers.js
diff --git a/www/js/standards/button.js b/app/js/standards/button.js
similarity index 97%
rename from www/js/standards/button.js
rename to app/js/standards/button.js
index a143800..002060a 100644
--- a/www/js/standards/button.js
+++ b/app/js/standards/button.js
@@ -5,7 +5,7 @@
  * Time: 10:13
  *
  */
-/* global CAPABILITY, inheritsFrom */
+/* global CAPABILITY, inheritsFrom, capabilityManager */
 /* global ble  */
 /* jshint browser: true , devel: true*/
 
diff --git a/www/js/standards/capability.js b/app/js/standards/capability.js
similarity index 100%
rename from www/js/standards/capability.js
rename to app/js/standards/capability.js
diff --git a/www/js/standards/gadget.js b/app/js/standards/gadget.js
similarity index 100%
rename from www/js/standards/gadget.js
rename to app/js/standards/gadget.js
diff --git a/www/js/test.js b/app/js/test.js
similarity index 100%
rename from www/js/test.js
rename to app/js/test.js
diff --git a/www/libs/bluebird/.bower.json b/app/libs/bluebird/.bower.json
similarity index 100%
rename from www/libs/bluebird/.bower.json
rename to app/libs/bluebird/.bower.json
diff --git a/www/libs/bluebird/API.md b/app/libs/bluebird/API.md
similarity index 100%
rename from www/libs/bluebird/API.md
rename to app/libs/bluebird/API.md
diff --git a/www/libs/bluebird/CONTRIBUTING.md b/app/libs/bluebird/CONTRIBUTING.md
similarity index 100%
rename from www/libs/bluebird/CONTRIBUTING.md
rename to app/libs/bluebird/CONTRIBUTING.md
diff --git a/www/libs/bluebird/LICENSE b/app/libs/bluebird/LICENSE
similarity index 100%
rename from www/libs/bluebird/LICENSE
rename to app/libs/bluebird/LICENSE
diff --git a/www/libs/bluebird/README.md b/app/libs/bluebird/README.md
similarity index 100%
rename from www/libs/bluebird/README.md
rename to app/libs/bluebird/README.md
diff --git a/www/libs/bluebird/bench b/app/libs/bluebird/bench
similarity index 100%
rename from www/libs/bluebird/bench
rename to app/libs/bluebird/bench
diff --git a/www/libs/bluebird/bower.json b/app/libs/bluebird/bower.json
similarity index 100%
rename from www/libs/bluebird/bower.json
rename to app/libs/bluebird/bower.json
diff --git a/www/libs/bluebird/build b/app/libs/bluebird/build
similarity index 100%
rename from www/libs/bluebird/build
rename to app/libs/bluebird/build
diff --git a/www/libs/bluebird/changelog.md b/app/libs/bluebird/changelog.md
similarity index 100%
rename from www/libs/bluebird/changelog.md
rename to app/libs/bluebird/changelog.md
diff --git a/www/libs/bluebird/deprecated_apis.md b/app/libs/bluebird/deprecated_apis.md
similarity index 100%
rename from www/libs/bluebird/deprecated_apis.md
rename to app/libs/bluebird/deprecated_apis.md
diff --git a/www/libs/bluebird/docs/Gemfile b/app/libs/bluebird/docs/Gemfile
similarity index 100%
rename from www/libs/bluebird/docs/Gemfile
rename to app/libs/bluebird/docs/Gemfile
diff --git a/www/libs/bluebird/docs/README.md b/app/libs/bluebird/docs/README.md
similarity index 100%
rename from www/libs/bluebird/docs/README.md
rename to app/libs/bluebird/docs/README.md
diff --git a/www/libs/bluebird/docs/_config.yml b/app/libs/bluebird/docs/_config.yml
similarity index 100%
rename from www/libs/bluebird/docs/_config.yml
rename to app/libs/bluebird/docs/_config.yml
diff --git a/www/libs/bluebird/docs/_layouts/api.html b/app/libs/bluebird/docs/_layouts/api.html
similarity index 100%
rename from www/libs/bluebird/docs/_layouts/api.html
rename to app/libs/bluebird/docs/_layouts/api.html
diff --git a/www/libs/bluebird/docs/_layouts/default.html b/app/libs/bluebird/docs/_layouts/default.html
similarity index 100%
rename from www/libs/bluebird/docs/_layouts/default.html
rename to app/libs/bluebird/docs/_layouts/default.html
diff --git a/www/libs/bluebird/docs/_layouts/page.html b/app/libs/bluebird/docs/_layouts/page.html
similarity index 100%
rename from www/libs/bluebird/docs/_layouts/page.html
rename to app/libs/bluebird/docs/_layouts/page.html
diff --git a/www/libs/bluebird/docs/_plugins/mdate.rb b/app/libs/bluebird/docs/_plugins/mdate.rb
similarity index 100%
rename from www/libs/bluebird/docs/_plugins/mdate.rb
rename to app/libs/bluebird/docs/_plugins/mdate.rb
diff --git a/www/libs/bluebird/docs/_plugins/plugin.rb b/app/libs/bluebird/docs/_plugins/plugin.rb
similarity index 100%
rename from www/libs/bluebird/docs/_plugins/plugin.rb
rename to app/libs/bluebird/docs/_plugins/plugin.rb
diff --git a/www/libs/bluebird/docs/css/main.css b/app/libs/bluebird/docs/css/main.css
similarity index 100%
rename from www/libs/bluebird/docs/css/main.css
rename to app/libs/bluebird/docs/css/main.css
diff --git a/www/libs/bluebird/docs/css/mono-blue.css b/app/libs/bluebird/docs/css/mono-blue.css
similarity index 100%
rename from www/libs/bluebird/docs/css/mono-blue.css
rename to app/libs/bluebird/docs/css/mono-blue.css
diff --git a/www/libs/bluebird/docs/docs/anti-patterns.md b/app/libs/bluebird/docs/docs/anti-patterns.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/anti-patterns.md
rename to app/libs/bluebird/docs/docs/anti-patterns.md
diff --git a/www/libs/bluebird/docs/docs/api-reference.md b/app/libs/bluebird/docs/docs/api-reference.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api-reference.md
rename to app/libs/bluebird/docs/docs/api-reference.md
diff --git a/www/libs/bluebird/docs/docs/api/aggregateerror.md b/app/libs/bluebird/docs/docs/api/aggregateerror.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/aggregateerror.md
rename to app/libs/bluebird/docs/docs/api/aggregateerror.md
diff --git a/www/libs/bluebird/docs/docs/api/all.md b/app/libs/bluebird/docs/docs/api/all.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/all.md
rename to app/libs/bluebird/docs/docs/api/all.md
diff --git a/www/libs/bluebird/docs/docs/api/any.md b/app/libs/bluebird/docs/docs/api/any.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/any.md
rename to app/libs/bluebird/docs/docs/api/any.md
diff --git a/www/libs/bluebird/docs/docs/api/ascallback.md b/app/libs/bluebird/docs/docs/api/ascallback.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/ascallback.md
rename to app/libs/bluebird/docs/docs/api/ascallback.md
diff --git a/www/libs/bluebird/docs/docs/api/bind.md b/app/libs/bluebird/docs/docs/api/bind.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/bind.md
rename to app/libs/bluebird/docs/docs/api/bind.md
diff --git a/www/libs/bluebird/docs/docs/api/built-in-error-types.md b/app/libs/bluebird/docs/docs/api/built-in-error-types.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/built-in-error-types.md
rename to app/libs/bluebird/docs/docs/api/built-in-error-types.md
diff --git a/www/libs/bluebird/docs/docs/api/call.md b/app/libs/bluebird/docs/docs/api/call.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/call.md
rename to app/libs/bluebird/docs/docs/api/call.md
diff --git a/www/libs/bluebird/docs/docs/api/cancel.md b/app/libs/bluebird/docs/docs/api/cancel.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/cancel.md
rename to app/libs/bluebird/docs/docs/api/cancel.md
diff --git a/www/libs/bluebird/docs/docs/api/cancellation.md b/app/libs/bluebird/docs/docs/api/cancellation.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/cancellation.md
rename to app/libs/bluebird/docs/docs/api/cancellation.md
diff --git a/www/libs/bluebird/docs/docs/api/cancellationerror.md b/app/libs/bluebird/docs/docs/api/cancellationerror.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/cancellationerror.md
rename to app/libs/bluebird/docs/docs/api/cancellationerror.md
diff --git a/www/libs/bluebird/docs/docs/api/catch.md b/app/libs/bluebird/docs/docs/api/catch.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/catch.md
rename to app/libs/bluebird/docs/docs/api/catch.md
diff --git a/www/libs/bluebird/docs/docs/api/catchreturn.md b/app/libs/bluebird/docs/docs/api/catchreturn.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/catchreturn.md
rename to app/libs/bluebird/docs/docs/api/catchreturn.md
diff --git a/www/libs/bluebird/docs/docs/api/catchthrow.md b/app/libs/bluebird/docs/docs/api/catchthrow.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/catchthrow.md
rename to app/libs/bluebird/docs/docs/api/catchthrow.md
diff --git a/www/libs/bluebird/docs/docs/api/collections.md b/app/libs/bluebird/docs/docs/api/collections.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/collections.md
rename to app/libs/bluebird/docs/docs/api/collections.md
diff --git a/www/libs/bluebird/docs/docs/api/core.md b/app/libs/bluebird/docs/docs/api/core.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/core.md
rename to app/libs/bluebird/docs/docs/api/core.md
diff --git a/www/libs/bluebird/docs/docs/api/deferred-migration.md b/app/libs/bluebird/docs/docs/api/deferred-migration.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/deferred-migration.md
rename to app/libs/bluebird/docs/docs/api/deferred-migration.md
diff --git a/www/libs/bluebird/docs/docs/api/delay.md b/app/libs/bluebird/docs/docs/api/delay.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/delay.md
rename to app/libs/bluebird/docs/docs/api/delay.md
diff --git a/www/libs/bluebird/docs/docs/api/disposer.md b/app/libs/bluebird/docs/docs/api/disposer.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/disposer.md
rename to app/libs/bluebird/docs/docs/api/disposer.md
diff --git a/www/libs/bluebird/docs/docs/api/done.md b/app/libs/bluebird/docs/docs/api/done.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/done.md
rename to app/libs/bluebird/docs/docs/api/done.md
diff --git a/www/libs/bluebird/docs/docs/api/each.md b/app/libs/bluebird/docs/docs/api/each.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/each.md
rename to app/libs/bluebird/docs/docs/api/each.md
diff --git a/www/libs/bluebird/docs/docs/api/environment-variables.md b/app/libs/bluebird/docs/docs/api/environment-variables.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/environment-variables.md
rename to app/libs/bluebird/docs/docs/api/environment-variables.md
diff --git a/www/libs/bluebird/docs/docs/api/error-management-configuration.md b/app/libs/bluebird/docs/docs/api/error-management-configuration.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/error-management-configuration.md
rename to app/libs/bluebird/docs/docs/api/error-management-configuration.md
diff --git a/www/libs/bluebird/docs/docs/api/error.md b/app/libs/bluebird/docs/docs/api/error.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/error.md
rename to app/libs/bluebird/docs/docs/api/error.md
diff --git a/www/libs/bluebird/docs/docs/api/filter.md b/app/libs/bluebird/docs/docs/api/filter.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/filter.md
rename to app/libs/bluebird/docs/docs/api/filter.md
diff --git a/www/libs/bluebird/docs/docs/api/finally.md b/app/libs/bluebird/docs/docs/api/finally.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/finally.md
rename to app/libs/bluebird/docs/docs/api/finally.md
diff --git a/www/libs/bluebird/docs/docs/api/generators.md b/app/libs/bluebird/docs/docs/api/generators.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/generators.md
rename to app/libs/bluebird/docs/docs/api/generators.md
diff --git a/www/libs/bluebird/docs/docs/api/get.md b/app/libs/bluebird/docs/docs/api/get.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/get.md
rename to app/libs/bluebird/docs/docs/api/get.md
diff --git a/www/libs/bluebird/docs/docs/api/iscancelled.md b/app/libs/bluebird/docs/docs/api/iscancelled.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/iscancelled.md
rename to app/libs/bluebird/docs/docs/api/iscancelled.md
diff --git a/www/libs/bluebird/docs/docs/api/isfulfilled.md b/app/libs/bluebird/docs/docs/api/isfulfilled.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/isfulfilled.md
rename to app/libs/bluebird/docs/docs/api/isfulfilled.md
diff --git a/www/libs/bluebird/docs/docs/api/ispending.md b/app/libs/bluebird/docs/docs/api/ispending.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/ispending.md
rename to app/libs/bluebird/docs/docs/api/ispending.md
diff --git a/www/libs/bluebird/docs/docs/api/isrejected.md b/app/libs/bluebird/docs/docs/api/isrejected.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/isrejected.md
rename to app/libs/bluebird/docs/docs/api/isrejected.md
diff --git a/www/libs/bluebird/docs/docs/api/map.md b/app/libs/bluebird/docs/docs/api/map.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/map.md
rename to app/libs/bluebird/docs/docs/api/map.md
diff --git a/www/libs/bluebird/docs/docs/api/mapseries.md b/app/libs/bluebird/docs/docs/api/mapseries.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/mapseries.md
rename to app/libs/bluebird/docs/docs/api/mapseries.md
diff --git a/www/libs/bluebird/docs/docs/api/new-promise.md b/app/libs/bluebird/docs/docs/api/new-promise.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/new-promise.md
rename to app/libs/bluebird/docs/docs/api/new-promise.md
diff --git a/www/libs/bluebird/docs/docs/api/operationalerror.md b/app/libs/bluebird/docs/docs/api/operationalerror.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/operationalerror.md
rename to app/libs/bluebird/docs/docs/api/operationalerror.md
diff --git a/www/libs/bluebird/docs/docs/api/progression-migration.md b/app/libs/bluebird/docs/docs/api/progression-migration.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/progression-migration.md
rename to app/libs/bluebird/docs/docs/api/progression-migration.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.all.md b/app/libs/bluebird/docs/docs/api/promise.all.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.all.md
rename to app/libs/bluebird/docs/docs/api/promise.all.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.any.md b/app/libs/bluebird/docs/docs/api/promise.any.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.any.md
rename to app/libs/bluebird/docs/docs/api/promise.any.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.bind.md b/app/libs/bluebird/docs/docs/api/promise.bind.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.bind.md
rename to app/libs/bluebird/docs/docs/api/promise.bind.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.config.md b/app/libs/bluebird/docs/docs/api/promise.config.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.config.md
rename to app/libs/bluebird/docs/docs/api/promise.config.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.coroutine.addyieldhandler.md b/app/libs/bluebird/docs/docs/api/promise.coroutine.addyieldhandler.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.coroutine.addyieldhandler.md
rename to app/libs/bluebird/docs/docs/api/promise.coroutine.addyieldhandler.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.coroutine.md b/app/libs/bluebird/docs/docs/api/promise.coroutine.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.coroutine.md
rename to app/libs/bluebird/docs/docs/api/promise.coroutine.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.delay.md b/app/libs/bluebird/docs/docs/api/promise.delay.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.delay.md
rename to app/libs/bluebird/docs/docs/api/promise.delay.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.each.md b/app/libs/bluebird/docs/docs/api/promise.each.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.each.md
rename to app/libs/bluebird/docs/docs/api/promise.each.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.filter.md b/app/libs/bluebird/docs/docs/api/promise.filter.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.filter.md
rename to app/libs/bluebird/docs/docs/api/promise.filter.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.fromcallback.md b/app/libs/bluebird/docs/docs/api/promise.fromcallback.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.fromcallback.md
rename to app/libs/bluebird/docs/docs/api/promise.fromcallback.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.join.md b/app/libs/bluebird/docs/docs/api/promise.join.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.join.md
rename to app/libs/bluebird/docs/docs/api/promise.join.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.longstacktraces.md b/app/libs/bluebird/docs/docs/api/promise.longstacktraces.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.longstacktraces.md
rename to app/libs/bluebird/docs/docs/api/promise.longstacktraces.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.map.md b/app/libs/bluebird/docs/docs/api/promise.map.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.map.md
rename to app/libs/bluebird/docs/docs/api/promise.map.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.mapseries.md b/app/libs/bluebird/docs/docs/api/promise.mapseries.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.mapseries.md
rename to app/libs/bluebird/docs/docs/api/promise.mapseries.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.method.md b/app/libs/bluebird/docs/docs/api/promise.method.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.method.md
rename to app/libs/bluebird/docs/docs/api/promise.method.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.noconflict.md b/app/libs/bluebird/docs/docs/api/promise.noconflict.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.noconflict.md
rename to app/libs/bluebird/docs/docs/api/promise.noconflict.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.onpossiblyunhandledrejection.md b/app/libs/bluebird/docs/docs/api/promise.onpossiblyunhandledrejection.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.onpossiblyunhandledrejection.md
rename to app/libs/bluebird/docs/docs/api/promise.onpossiblyunhandledrejection.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.onunhandledrejectionhandled.md b/app/libs/bluebird/docs/docs/api/promise.onunhandledrejectionhandled.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.onunhandledrejectionhandled.md
rename to app/libs/bluebird/docs/docs/api/promise.onunhandledrejectionhandled.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.promisify.md b/app/libs/bluebird/docs/docs/api/promise.promisify.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.promisify.md
rename to app/libs/bluebird/docs/docs/api/promise.promisify.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.promisifyall.md b/app/libs/bluebird/docs/docs/api/promise.promisifyall.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.promisifyall.md
rename to app/libs/bluebird/docs/docs/api/promise.promisifyall.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.props.md b/app/libs/bluebird/docs/docs/api/promise.props.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.props.md
rename to app/libs/bluebird/docs/docs/api/promise.props.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.race.md b/app/libs/bluebird/docs/docs/api/promise.race.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.race.md
rename to app/libs/bluebird/docs/docs/api/promise.race.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.reduce.md b/app/libs/bluebird/docs/docs/api/promise.reduce.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.reduce.md
rename to app/libs/bluebird/docs/docs/api/promise.reduce.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.reject.md b/app/libs/bluebird/docs/docs/api/promise.reject.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.reject.md
rename to app/libs/bluebird/docs/docs/api/promise.reject.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.resolve.md b/app/libs/bluebird/docs/docs/api/promise.resolve.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.resolve.md
rename to app/libs/bluebird/docs/docs/api/promise.resolve.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.setscheduler.md b/app/libs/bluebird/docs/docs/api/promise.setscheduler.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.setscheduler.md
rename to app/libs/bluebird/docs/docs/api/promise.setscheduler.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.some.md b/app/libs/bluebird/docs/docs/api/promise.some.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.some.md
rename to app/libs/bluebird/docs/docs/api/promise.some.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.try.md b/app/libs/bluebird/docs/docs/api/promise.try.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.try.md
rename to app/libs/bluebird/docs/docs/api/promise.try.md
diff --git a/www/libs/bluebird/docs/docs/api/promise.using.md b/app/libs/bluebird/docs/docs/api/promise.using.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promise.using.md
rename to app/libs/bluebird/docs/docs/api/promise.using.md
diff --git a/www/libs/bluebird/docs/docs/api/promiseinspection.md b/app/libs/bluebird/docs/docs/api/promiseinspection.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promiseinspection.md
rename to app/libs/bluebird/docs/docs/api/promiseinspection.md
diff --git a/www/libs/bluebird/docs/docs/api/promisification.md b/app/libs/bluebird/docs/docs/api/promisification.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/promisification.md
rename to app/libs/bluebird/docs/docs/api/promisification.md
diff --git a/www/libs/bluebird/docs/docs/api/props.md b/app/libs/bluebird/docs/docs/api/props.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/props.md
rename to app/libs/bluebird/docs/docs/api/props.md
diff --git a/www/libs/bluebird/docs/docs/api/race.md b/app/libs/bluebird/docs/docs/api/race.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/race.md
rename to app/libs/bluebird/docs/docs/api/race.md
diff --git a/www/libs/bluebird/docs/docs/api/reason.md b/app/libs/bluebird/docs/docs/api/reason.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/reason.md
rename to app/libs/bluebird/docs/docs/api/reason.md
diff --git a/www/libs/bluebird/docs/docs/api/reduce.md b/app/libs/bluebird/docs/docs/api/reduce.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/reduce.md
rename to app/libs/bluebird/docs/docs/api/reduce.md
diff --git a/www/libs/bluebird/docs/docs/api/reflect.md b/app/libs/bluebird/docs/docs/api/reflect.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/reflect.md
rename to app/libs/bluebird/docs/docs/api/reflect.md
diff --git a/www/libs/bluebird/docs/docs/api/resource-management.md b/app/libs/bluebird/docs/docs/api/resource-management.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/resource-management.md
rename to app/libs/bluebird/docs/docs/api/resource-management.md
diff --git a/www/libs/bluebird/docs/docs/api/return.md b/app/libs/bluebird/docs/docs/api/return.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/return.md
rename to app/libs/bluebird/docs/docs/api/return.md
diff --git a/www/libs/bluebird/docs/docs/api/some.md b/app/libs/bluebird/docs/docs/api/some.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/some.md
rename to app/libs/bluebird/docs/docs/api/some.md
diff --git a/www/libs/bluebird/docs/docs/api/spread.md b/app/libs/bluebird/docs/docs/api/spread.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/spread.md
rename to app/libs/bluebird/docs/docs/api/spread.md
diff --git a/www/libs/bluebird/docs/docs/api/suppressunhandledrejections.md b/app/libs/bluebird/docs/docs/api/suppressunhandledrejections.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/suppressunhandledrejections.md
rename to app/libs/bluebird/docs/docs/api/suppressunhandledrejections.md
diff --git a/www/libs/bluebird/docs/docs/api/synchronous-inspection.md b/app/libs/bluebird/docs/docs/api/synchronous-inspection.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/synchronous-inspection.md
rename to app/libs/bluebird/docs/docs/api/synchronous-inspection.md
diff --git a/www/libs/bluebird/docs/docs/api/tap.md b/app/libs/bluebird/docs/docs/api/tap.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/tap.md
rename to app/libs/bluebird/docs/docs/api/tap.md
diff --git a/www/libs/bluebird/docs/docs/api/then.md b/app/libs/bluebird/docs/docs/api/then.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/then.md
rename to app/libs/bluebird/docs/docs/api/then.md
diff --git a/www/libs/bluebird/docs/docs/api/throw.md b/app/libs/bluebird/docs/docs/api/throw.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/throw.md
rename to app/libs/bluebird/docs/docs/api/throw.md
diff --git a/www/libs/bluebird/docs/docs/api/timeout.md b/app/libs/bluebird/docs/docs/api/timeout.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/timeout.md
rename to app/libs/bluebird/docs/docs/api/timeout.md
diff --git a/www/libs/bluebird/docs/docs/api/timeouterror.md b/app/libs/bluebird/docs/docs/api/timeouterror.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/timeouterror.md
rename to app/libs/bluebird/docs/docs/api/timeouterror.md
diff --git a/www/libs/bluebird/docs/docs/api/timers.md b/app/libs/bluebird/docs/docs/api/timers.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/timers.md
rename to app/libs/bluebird/docs/docs/api/timers.md
diff --git a/www/libs/bluebird/docs/docs/api/utility.md b/app/libs/bluebird/docs/docs/api/utility.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/utility.md
rename to app/libs/bluebird/docs/docs/api/utility.md
diff --git a/www/libs/bluebird/docs/docs/api/value.md b/app/libs/bluebird/docs/docs/api/value.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/api/value.md
rename to app/libs/bluebird/docs/docs/api/value.md
diff --git a/www/libs/bluebird/docs/docs/async-dialogs.md b/app/libs/bluebird/docs/docs/async-dialogs.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/async-dialogs.md
rename to app/libs/bluebird/docs/docs/async-dialogs.md
diff --git a/www/libs/bluebird/docs/docs/beginners-guide.md b/app/libs/bluebird/docs/docs/beginners-guide.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/beginners-guide.md
rename to app/libs/bluebird/docs/docs/beginners-guide.md
diff --git a/www/libs/bluebird/docs/docs/benchmarks.md b/app/libs/bluebird/docs/docs/benchmarks.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/benchmarks.md
rename to app/libs/bluebird/docs/docs/benchmarks.md
diff --git a/www/libs/bluebird/docs/docs/changelog.md b/app/libs/bluebird/docs/docs/changelog.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/changelog.md
rename to app/libs/bluebird/docs/docs/changelog.md
diff --git a/www/libs/bluebird/docs/docs/coming-from-other-languages.md b/app/libs/bluebird/docs/docs/coming-from-other-languages.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/coming-from-other-languages.md
rename to app/libs/bluebird/docs/docs/coming-from-other-languages.md
diff --git a/www/libs/bluebird/docs/docs/coming-from-other-libraries.md b/app/libs/bluebird/docs/docs/coming-from-other-libraries.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/coming-from-other-libraries.md
rename to app/libs/bluebird/docs/docs/coming-from-other-libraries.md
diff --git a/www/libs/bluebird/docs/docs/contribute.md b/app/libs/bluebird/docs/docs/contribute.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/contribute.md
rename to app/libs/bluebird/docs/docs/contribute.md
diff --git a/www/libs/bluebird/docs/docs/deprecated-apis.md b/app/libs/bluebird/docs/docs/deprecated-apis.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/deprecated-apis.md
rename to app/libs/bluebird/docs/docs/deprecated-apis.md
diff --git a/www/libs/bluebird/docs/docs/deprecated_apis.md b/app/libs/bluebird/docs/docs/deprecated_apis.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/deprecated_apis.md
rename to app/libs/bluebird/docs/docs/deprecated_apis.md
diff --git a/www/libs/bluebird/docs/docs/download-api-reference.md b/app/libs/bluebird/docs/docs/download-api-reference.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/download-api-reference.md
rename to app/libs/bluebird/docs/docs/download-api-reference.md
diff --git a/www/libs/bluebird/docs/docs/error-explanations.md b/app/libs/bluebird/docs/docs/error-explanations.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/error-explanations.md
rename to app/libs/bluebird/docs/docs/error-explanations.md
diff --git a/www/libs/bluebird/docs/docs/features.md b/app/libs/bluebird/docs/docs/features.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/features.md
rename to app/libs/bluebird/docs/docs/features.md
diff --git a/www/libs/bluebird/docs/docs/getting-started.md b/app/libs/bluebird/docs/docs/getting-started.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/getting-started.md
rename to app/libs/bluebird/docs/docs/getting-started.md
diff --git a/www/libs/bluebird/docs/docs/install.md b/app/libs/bluebird/docs/docs/install.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/install.md
rename to app/libs/bluebird/docs/docs/install.md
diff --git a/www/libs/bluebird/docs/docs/new-in-bluebird-3.md b/app/libs/bluebird/docs/docs/new-in-bluebird-3.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/new-in-bluebird-3.md
rename to app/libs/bluebird/docs/docs/new-in-bluebird-3.md
diff --git a/www/libs/bluebird/docs/docs/support.md b/app/libs/bluebird/docs/docs/support.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/support.md
rename to app/libs/bluebird/docs/docs/support.md
diff --git a/www/libs/bluebird/docs/docs/warning-explanations.md b/app/libs/bluebird/docs/docs/warning-explanations.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/warning-explanations.md
rename to app/libs/bluebird/docs/docs/warning-explanations.md
diff --git a/www/libs/bluebird/docs/docs/what-about-generators.md b/app/libs/bluebird/docs/docs/what-about-generators.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/what-about-generators.md
rename to app/libs/bluebird/docs/docs/what-about-generators.md
diff --git a/www/libs/bluebird/docs/docs/why-bluebird.md b/app/libs/bluebird/docs/docs/why-bluebird.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/why-bluebird.md
rename to app/libs/bluebird/docs/docs/why-bluebird.md
diff --git a/www/libs/bluebird/docs/docs/why-performance.md b/app/libs/bluebird/docs/docs/why-performance.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/why-performance.md
rename to app/libs/bluebird/docs/docs/why-performance.md
diff --git a/www/libs/bluebird/docs/docs/why-promises.md b/app/libs/bluebird/docs/docs/why-promises.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/why-promises.md
rename to app/libs/bluebird/docs/docs/why-promises.md
diff --git a/www/libs/bluebird/docs/docs/working-with-callbacks.md b/app/libs/bluebird/docs/docs/working-with-callbacks.md
similarity index 100%
rename from www/libs/bluebird/docs/docs/working-with-callbacks.md
rename to app/libs/bluebird/docs/docs/working-with-callbacks.md
diff --git a/www/libs/bluebird/docs/helpers.rb b/app/libs/bluebird/docs/helpers.rb
similarity index 100%
rename from www/libs/bluebird/docs/helpers.rb
rename to app/libs/bluebird/docs/helpers.rb
diff --git a/www/libs/bluebird/docs/img/favicon.png b/app/libs/bluebird/docs/img/favicon.png
similarity index 100%
rename from www/libs/bluebird/docs/img/favicon.png
rename to app/libs/bluebird/docs/img/favicon.png
diff --git a/www/libs/bluebird/docs/img/logo.png b/app/libs/bluebird/docs/img/logo.png
similarity index 100%
rename from www/libs/bluebird/docs/img/logo.png
rename to app/libs/bluebird/docs/img/logo.png
diff --git a/www/libs/bluebird/docs/index.html b/app/libs/bluebird/docs/index.html
similarity index 100%
rename from www/libs/bluebird/docs/index.html
rename to app/libs/bluebird/docs/index.html
diff --git a/www/libs/bluebird/issue_template.md b/app/libs/bluebird/issue_template.md
similarity index 100%
rename from www/libs/bluebird/issue_template.md
rename to app/libs/bluebird/issue_template.md
diff --git a/www/libs/bluebird/js/browser/bluebird.core.js b/app/libs/bluebird/js/browser/bluebird.core.js
similarity index 100%
rename from www/libs/bluebird/js/browser/bluebird.core.js
rename to app/libs/bluebird/js/browser/bluebird.core.js
diff --git a/www/libs/bluebird/js/browser/bluebird.core.min.js b/app/libs/bluebird/js/browser/bluebird.core.min.js
similarity index 100%
rename from www/libs/bluebird/js/browser/bluebird.core.min.js
rename to app/libs/bluebird/js/browser/bluebird.core.min.js
diff --git a/www/libs/bluebird/js/browser/bluebird.js b/app/libs/bluebird/js/browser/bluebird.js
similarity index 100%
rename from www/libs/bluebird/js/browser/bluebird.js
rename to app/libs/bluebird/js/browser/bluebird.js
diff --git a/www/libs/bluebird/js/browser/bluebird.min.js b/app/libs/bluebird/js/browser/bluebird.min.js
similarity index 100%
rename from www/libs/bluebird/js/browser/bluebird.min.js
rename to app/libs/bluebird/js/browser/bluebird.min.js
diff --git a/www/libs/bluebird/package.json b/app/libs/bluebird/package.json
similarity index 100%
rename from www/libs/bluebird/package.json
rename to app/libs/bluebird/package.json
diff --git a/www/libs/bluebird/src/any.js b/app/libs/bluebird/src/any.js
similarity index 100%
rename from www/libs/bluebird/src/any.js
rename to app/libs/bluebird/src/any.js
diff --git a/www/libs/bluebird/src/assert.js b/app/libs/bluebird/src/assert.js
similarity index 100%
rename from www/libs/bluebird/src/assert.js
rename to app/libs/bluebird/src/assert.js
diff --git a/www/libs/bluebird/src/async.js b/app/libs/bluebird/src/async.js
similarity index 100%
rename from www/libs/bluebird/src/async.js
rename to app/libs/bluebird/src/async.js
diff --git a/www/libs/bluebird/src/bind.js b/app/libs/bluebird/src/bind.js
similarity index 100%
rename from www/libs/bluebird/src/bind.js
rename to app/libs/bluebird/src/bind.js
diff --git a/www/libs/bluebird/src/bluebird.js b/app/libs/bluebird/src/bluebird.js
similarity index 100%
rename from www/libs/bluebird/src/bluebird.js
rename to app/libs/bluebird/src/bluebird.js
diff --git a/www/libs/bluebird/src/call_get.js b/app/libs/bluebird/src/call_get.js
similarity index 100%
rename from www/libs/bluebird/src/call_get.js
rename to app/libs/bluebird/src/call_get.js
diff --git a/www/libs/bluebird/src/cancel.js b/app/libs/bluebird/src/cancel.js
similarity index 100%
rename from www/libs/bluebird/src/cancel.js
rename to app/libs/bluebird/src/cancel.js
diff --git a/www/libs/bluebird/src/catch_filter.js b/app/libs/bluebird/src/catch_filter.js
similarity index 100%
rename from www/libs/bluebird/src/catch_filter.js
rename to app/libs/bluebird/src/catch_filter.js
diff --git a/www/libs/bluebird/src/constants.js b/app/libs/bluebird/src/constants.js
similarity index 100%
rename from www/libs/bluebird/src/constants.js
rename to app/libs/bluebird/src/constants.js
diff --git a/www/libs/bluebird/src/context.js b/app/libs/bluebird/src/context.js
similarity index 100%
rename from www/libs/bluebird/src/context.js
rename to app/libs/bluebird/src/context.js
diff --git a/www/libs/bluebird/src/debuggability.js b/app/libs/bluebird/src/debuggability.js
similarity index 100%
rename from www/libs/bluebird/src/debuggability.js
rename to app/libs/bluebird/src/debuggability.js
diff --git a/www/libs/bluebird/src/direct_resolve.js b/app/libs/bluebird/src/direct_resolve.js
similarity index 100%
rename from www/libs/bluebird/src/direct_resolve.js
rename to app/libs/bluebird/src/direct_resolve.js
diff --git a/www/libs/bluebird/src/each.js b/app/libs/bluebird/src/each.js
similarity index 100%
rename from www/libs/bluebird/src/each.js
rename to app/libs/bluebird/src/each.js
diff --git a/www/libs/bluebird/src/errors.js b/app/libs/bluebird/src/errors.js
similarity index 100%
rename from www/libs/bluebird/src/errors.js
rename to app/libs/bluebird/src/errors.js
diff --git a/www/libs/bluebird/src/es5.js b/app/libs/bluebird/src/es5.js
similarity index 100%
rename from www/libs/bluebird/src/es5.js
rename to app/libs/bluebird/src/es5.js
diff --git a/www/libs/bluebird/src/filter.js b/app/libs/bluebird/src/filter.js
similarity index 100%
rename from www/libs/bluebird/src/filter.js
rename to app/libs/bluebird/src/filter.js
diff --git a/www/libs/bluebird/src/finally.js b/app/libs/bluebird/src/finally.js
similarity index 100%
rename from www/libs/bluebird/src/finally.js
rename to app/libs/bluebird/src/finally.js
diff --git a/www/libs/bluebird/src/generators.js b/app/libs/bluebird/src/generators.js
similarity index 100%
rename from www/libs/bluebird/src/generators.js
rename to app/libs/bluebird/src/generators.js
diff --git a/www/libs/bluebird/src/join.js b/app/libs/bluebird/src/join.js
similarity index 100%
rename from www/libs/bluebird/src/join.js
rename to app/libs/bluebird/src/join.js
diff --git a/www/libs/bluebird/src/map.js b/app/libs/bluebird/src/map.js
similarity index 100%
rename from www/libs/bluebird/src/map.js
rename to app/libs/bluebird/src/map.js
diff --git a/www/libs/bluebird/src/method.js b/app/libs/bluebird/src/method.js
similarity index 100%
rename from www/libs/bluebird/src/method.js
rename to app/libs/bluebird/src/method.js
diff --git a/www/libs/bluebird/src/nodeback.js b/app/libs/bluebird/src/nodeback.js
similarity index 100%
rename from www/libs/bluebird/src/nodeback.js
rename to app/libs/bluebird/src/nodeback.js
diff --git a/www/libs/bluebird/src/nodeify.js b/app/libs/bluebird/src/nodeify.js
similarity index 100%
rename from www/libs/bluebird/src/nodeify.js
rename to app/libs/bluebird/src/nodeify.js
diff --git a/www/libs/bluebird/src/promise.js b/app/libs/bluebird/src/promise.js
similarity index 100%
rename from www/libs/bluebird/src/promise.js
rename to app/libs/bluebird/src/promise.js
diff --git a/www/libs/bluebird/src/promise_array.js b/app/libs/bluebird/src/promise_array.js
similarity index 100%
rename from www/libs/bluebird/src/promise_array.js
rename to app/libs/bluebird/src/promise_array.js
diff --git a/www/libs/bluebird/src/promisify.js b/app/libs/bluebird/src/promisify.js
similarity index 100%
rename from www/libs/bluebird/src/promisify.js
rename to app/libs/bluebird/src/promisify.js
diff --git a/www/libs/bluebird/src/props.js b/app/libs/bluebird/src/props.js
similarity index 100%
rename from www/libs/bluebird/src/props.js
rename to app/libs/bluebird/src/props.js
diff --git a/www/libs/bluebird/src/queue.js b/app/libs/bluebird/src/queue.js
similarity index 100%
rename from www/libs/bluebird/src/queue.js
rename to app/libs/bluebird/src/queue.js
diff --git a/www/libs/bluebird/src/race.js b/app/libs/bluebird/src/race.js
similarity index 100%
rename from www/libs/bluebird/src/race.js
rename to app/libs/bluebird/src/race.js
diff --git a/www/libs/bluebird/src/reduce.js b/app/libs/bluebird/src/reduce.js
similarity index 100%
rename from www/libs/bluebird/src/reduce.js
rename to app/libs/bluebird/src/reduce.js
diff --git a/www/libs/bluebird/src/schedule.js b/app/libs/bluebird/src/schedule.js
similarity index 100%
rename from www/libs/bluebird/src/schedule.js
rename to app/libs/bluebird/src/schedule.js
diff --git a/www/libs/bluebird/src/settle.js b/app/libs/bluebird/src/settle.js
similarity index 100%
rename from www/libs/bluebird/src/settle.js
rename to app/libs/bluebird/src/settle.js
diff --git a/www/libs/bluebird/src/some.js b/app/libs/bluebird/src/some.js
similarity index 100%
rename from www/libs/bluebird/src/some.js
rename to app/libs/bluebird/src/some.js
diff --git a/www/libs/bluebird/src/synchronous_inspection.js b/app/libs/bluebird/src/synchronous_inspection.js
similarity index 100%
rename from www/libs/bluebird/src/synchronous_inspection.js
rename to app/libs/bluebird/src/synchronous_inspection.js
diff --git a/www/libs/bluebird/src/thenables.js b/app/libs/bluebird/src/thenables.js
similarity index 100%
rename from www/libs/bluebird/src/thenables.js
rename to app/libs/bluebird/src/thenables.js
diff --git a/www/libs/bluebird/src/timers.js b/app/libs/bluebird/src/timers.js
similarity index 100%
rename from www/libs/bluebird/src/timers.js
rename to app/libs/bluebird/src/timers.js
diff --git a/www/libs/bluebird/src/using.js b/app/libs/bluebird/src/using.js
similarity index 100%
rename from www/libs/bluebird/src/using.js
rename to app/libs/bluebird/src/using.js
diff --git a/www/libs/bluebird/src/util.js b/app/libs/bluebird/src/util.js
similarity index 100%
rename from www/libs/bluebird/src/util.js
rename to app/libs/bluebird/src/util.js
diff --git a/www/libs/bluebird/tests b/app/libs/bluebird/tests
similarity index 100%
rename from www/libs/bluebird/tests
rename to app/libs/bluebird/tests
diff --git a/www/libs/bluebird/tools/README.md b/app/libs/bluebird/tools/README.md
similarity index 100%
rename from www/libs/bluebird/tools/README.md
rename to app/libs/bluebird/tools/README.md
diff --git a/www/libs/bluebird/tools/ast_passes.js b/app/libs/bluebird/tools/ast_passes.js
similarity index 100%
rename from www/libs/bluebird/tools/ast_passes.js
rename to app/libs/bluebird/tools/ast_passes.js
diff --git a/www/libs/bluebird/tools/browser_test_generator.js b/app/libs/bluebird/tools/browser_test_generator.js
similarity index 100%
rename from www/libs/bluebird/tools/browser_test_generator.js
rename to app/libs/bluebird/tools/browser_test_generator.js
diff --git a/www/libs/bluebird/tools/browser_test_runner.js b/app/libs/bluebird/tools/browser_test_runner.js
similarity index 100%
rename from www/libs/bluebird/tools/browser_test_runner.js
rename to app/libs/bluebird/tools/browser_test_runner.js
diff --git a/www/libs/bluebird/tools/build.js b/app/libs/bluebird/tools/build.js
similarity index 100%
rename from www/libs/bluebird/tools/build.js
rename to app/libs/bluebird/tools/build.js
diff --git a/www/libs/bluebird/tools/job-runner/job-runner.js b/app/libs/bluebird/tools/job-runner/job-runner.js
similarity index 100%
rename from www/libs/bluebird/tools/job-runner/job-runner.js
rename to app/libs/bluebird/tools/job-runner/job-runner.js
diff --git a/www/libs/bluebird/tools/jshint.js b/app/libs/bluebird/tools/jshint.js
similarity index 100%
rename from www/libs/bluebird/tools/jshint.js
rename to app/libs/bluebird/tools/jshint.js
diff --git a/www/libs/bluebird/tools/jshintrc_generator.js b/app/libs/bluebird/tools/jshintrc_generator.js
similarity index 100%
rename from www/libs/bluebird/tools/jshintrc_generator.js
rename to app/libs/bluebird/tools/jshintrc_generator.js
diff --git a/www/libs/bluebird/tools/mocha_runner.js b/app/libs/bluebird/tools/mocha_runner.js
similarity index 100%
rename from www/libs/bluebird/tools/mocha_runner.js
rename to app/libs/bluebird/tools/mocha_runner.js
diff --git a/www/libs/bluebird/tools/saucelabs_runner.js b/app/libs/bluebird/tools/saucelabs_runner.js
similarity index 100%
rename from www/libs/bluebird/tools/saucelabs_runner.js
rename to app/libs/bluebird/tools/saucelabs_runner.js
diff --git a/www/libs/bluebird/tools/test.js b/app/libs/bluebird/tools/test.js
similarity index 100%
rename from www/libs/bluebird/tools/test.js
rename to app/libs/bluebird/tools/test.js
diff --git a/www/libs/bluebird/tools/utils.js b/app/libs/bluebird/tools/utils.js
similarity index 100%
rename from www/libs/bluebird/tools/utils.js
rename to app/libs/bluebird/tools/utils.js
diff --git a/www/libs/jquery/.bower.json b/app/libs/jquery/.bower.json
similarity index 100%
rename from www/libs/jquery/.bower.json
rename to app/libs/jquery/.bower.json
diff --git a/www/libs/jquery/AUTHORS.txt b/app/libs/jquery/AUTHORS.txt
similarity index 100%
rename from www/libs/jquery/AUTHORS.txt
rename to app/libs/jquery/AUTHORS.txt
diff --git a/www/libs/jquery/LICENSE.txt b/app/libs/jquery/LICENSE.txt
similarity index 100%
rename from www/libs/jquery/LICENSE.txt
rename to app/libs/jquery/LICENSE.txt
diff --git a/www/libs/jquery/README.md b/app/libs/jquery/README.md
similarity index 100%
rename from www/libs/jquery/README.md
rename to app/libs/jquery/README.md
diff --git a/www/libs/jquery/bower.json b/app/libs/jquery/bower.json
similarity index 100%
rename from www/libs/jquery/bower.json
rename to app/libs/jquery/bower.json
diff --git a/www/libs/jquery/sizzle/LICENSE.txt b/app/libs/jquery/sizzle/LICENSE.txt
similarity index 100%
rename from www/libs/jquery/sizzle/LICENSE.txt
rename to app/libs/jquery/sizzle/LICENSE.txt
diff --git a/www/libs/jquery/src/.jshintrc b/app/libs/jquery/src/.jshintrc
similarity index 100%
rename from www/libs/jquery/src/.jshintrc
rename to app/libs/jquery/src/.jshintrc
diff --git a/www/libs/jquery/src/ajax.js b/app/libs/jquery/src/ajax.js
similarity index 100%
rename from www/libs/jquery/src/ajax.js
rename to app/libs/jquery/src/ajax.js
diff --git a/www/libs/jquery/src/ajax/jsonp.js b/app/libs/jquery/src/ajax/jsonp.js
similarity index 100%
rename from www/libs/jquery/src/ajax/jsonp.js
rename to app/libs/jquery/src/ajax/jsonp.js
diff --git a/www/libs/jquery/src/ajax/load.js b/app/libs/jquery/src/ajax/load.js
similarity index 100%
rename from www/libs/jquery/src/ajax/load.js
rename to app/libs/jquery/src/ajax/load.js
diff --git a/www/libs/jquery/src/ajax/parseJSON.js b/app/libs/jquery/src/ajax/parseJSON.js
similarity index 100%
rename from www/libs/jquery/src/ajax/parseJSON.js
rename to app/libs/jquery/src/ajax/parseJSON.js
diff --git a/www/libs/jquery/src/ajax/parseXML.js b/app/libs/jquery/src/ajax/parseXML.js
similarity index 100%
rename from www/libs/jquery/src/ajax/parseXML.js
rename to app/libs/jquery/src/ajax/parseXML.js
diff --git a/www/libs/jquery/src/ajax/script.js b/app/libs/jquery/src/ajax/script.js
similarity index 100%
rename from www/libs/jquery/src/ajax/script.js
rename to app/libs/jquery/src/ajax/script.js
diff --git a/www/libs/jquery/src/ajax/var/location.js b/app/libs/jquery/src/ajax/var/location.js
similarity index 100%
rename from www/libs/jquery/src/ajax/var/location.js
rename to app/libs/jquery/src/ajax/var/location.js
diff --git a/www/libs/jquery/src/ajax/var/nonce.js b/app/libs/jquery/src/ajax/var/nonce.js
similarity index 100%
rename from www/libs/jquery/src/ajax/var/nonce.js
rename to app/libs/jquery/src/ajax/var/nonce.js
diff --git a/www/libs/jquery/src/ajax/var/rquery.js b/app/libs/jquery/src/ajax/var/rquery.js
similarity index 100%
rename from www/libs/jquery/src/ajax/var/rquery.js
rename to app/libs/jquery/src/ajax/var/rquery.js
diff --git a/www/libs/jquery/src/ajax/xhr.js b/app/libs/jquery/src/ajax/xhr.js
similarity index 100%
rename from www/libs/jquery/src/ajax/xhr.js
rename to app/libs/jquery/src/ajax/xhr.js
diff --git a/www/libs/jquery/src/attributes.js b/app/libs/jquery/src/attributes.js
similarity index 100%
rename from www/libs/jquery/src/attributes.js
rename to app/libs/jquery/src/attributes.js
diff --git a/www/libs/jquery/src/attributes/attr.js b/app/libs/jquery/src/attributes/attr.js
similarity index 100%
rename from www/libs/jquery/src/attributes/attr.js
rename to app/libs/jquery/src/attributes/attr.js
diff --git a/www/libs/jquery/src/attributes/classes.js b/app/libs/jquery/src/attributes/classes.js
similarity index 100%
rename from www/libs/jquery/src/attributes/classes.js
rename to app/libs/jquery/src/attributes/classes.js
diff --git a/www/libs/jquery/src/attributes/prop.js b/app/libs/jquery/src/attributes/prop.js
similarity index 100%
rename from www/libs/jquery/src/attributes/prop.js
rename to app/libs/jquery/src/attributes/prop.js
diff --git a/www/libs/jquery/src/attributes/support.js b/app/libs/jquery/src/attributes/support.js
similarity index 100%
rename from www/libs/jquery/src/attributes/support.js
rename to app/libs/jquery/src/attributes/support.js
diff --git a/www/libs/jquery/src/attributes/val.js b/app/libs/jquery/src/attributes/val.js
similarity index 100%
rename from www/libs/jquery/src/attributes/val.js
rename to app/libs/jquery/src/attributes/val.js
diff --git a/www/libs/jquery/src/callbacks.js b/app/libs/jquery/src/callbacks.js
similarity index 100%
rename from www/libs/jquery/src/callbacks.js
rename to app/libs/jquery/src/callbacks.js
diff --git a/www/libs/jquery/src/core.js b/app/libs/jquery/src/core.js
similarity index 100%
rename from www/libs/jquery/src/core.js
rename to app/libs/jquery/src/core.js
diff --git a/www/libs/jquery/src/core/DOMEval.js b/app/libs/jquery/src/core/DOMEval.js
similarity index 100%
rename from www/libs/jquery/src/core/DOMEval.js
rename to app/libs/jquery/src/core/DOMEval.js
diff --git a/www/libs/jquery/src/core/access.js b/app/libs/jquery/src/core/access.js
similarity index 100%
rename from www/libs/jquery/src/core/access.js
rename to app/libs/jquery/src/core/access.js
diff --git a/www/libs/jquery/src/core/init.js b/app/libs/jquery/src/core/init.js
similarity index 100%
rename from www/libs/jquery/src/core/init.js
rename to app/libs/jquery/src/core/init.js
diff --git a/www/libs/jquery/src/core/parseHTML.js b/app/libs/jquery/src/core/parseHTML.js
similarity index 100%
rename from www/libs/jquery/src/core/parseHTML.js
rename to app/libs/jquery/src/core/parseHTML.js
diff --git a/www/libs/jquery/src/core/ready.js b/app/libs/jquery/src/core/ready.js
similarity index 100%
rename from www/libs/jquery/src/core/ready.js
rename to app/libs/jquery/src/core/ready.js
diff --git a/www/libs/jquery/src/core/support.js b/app/libs/jquery/src/core/support.js
similarity index 100%
rename from www/libs/jquery/src/core/support.js
rename to app/libs/jquery/src/core/support.js
diff --git a/www/libs/jquery/src/core/var/rsingleTag.js b/app/libs/jquery/src/core/var/rsingleTag.js
similarity index 100%
rename from www/libs/jquery/src/core/var/rsingleTag.js
rename to app/libs/jquery/src/core/var/rsingleTag.js
diff --git a/www/libs/jquery/src/css.js b/app/libs/jquery/src/css.js
similarity index 100%
rename from www/libs/jquery/src/css.js
rename to app/libs/jquery/src/css.js
diff --git a/www/libs/jquery/src/css/addGetHookIf.js b/app/libs/jquery/src/css/addGetHookIf.js
similarity index 100%
rename from www/libs/jquery/src/css/addGetHookIf.js
rename to app/libs/jquery/src/css/addGetHookIf.js
diff --git a/www/libs/jquery/src/css/adjustCSS.js b/app/libs/jquery/src/css/adjustCSS.js
similarity index 100%
rename from www/libs/jquery/src/css/adjustCSS.js
rename to app/libs/jquery/src/css/adjustCSS.js
diff --git a/www/libs/jquery/src/css/curCSS.js b/app/libs/jquery/src/css/curCSS.js
similarity index 100%
rename from www/libs/jquery/src/css/curCSS.js
rename to app/libs/jquery/src/css/curCSS.js
diff --git a/www/libs/jquery/src/css/defaultDisplay.js b/app/libs/jquery/src/css/defaultDisplay.js
similarity index 100%
rename from www/libs/jquery/src/css/defaultDisplay.js
rename to app/libs/jquery/src/css/defaultDisplay.js
diff --git a/www/libs/jquery/src/css/hiddenVisibleSelectors.js b/app/libs/jquery/src/css/hiddenVisibleSelectors.js
similarity index 100%
rename from www/libs/jquery/src/css/hiddenVisibleSelectors.js
rename to app/libs/jquery/src/css/hiddenVisibleSelectors.js
diff --git a/www/libs/jquery/src/css/showHide.js b/app/libs/jquery/src/css/showHide.js
similarity index 100%
rename from www/libs/jquery/src/css/showHide.js
rename to app/libs/jquery/src/css/showHide.js
diff --git a/www/libs/jquery/src/css/support.js b/app/libs/jquery/src/css/support.js
similarity index 100%
rename from www/libs/jquery/src/css/support.js
rename to app/libs/jquery/src/css/support.js
diff --git a/www/libs/jquery/src/css/var/cssExpand.js b/app/libs/jquery/src/css/var/cssExpand.js
similarity index 100%
rename from www/libs/jquery/src/css/var/cssExpand.js
rename to app/libs/jquery/src/css/var/cssExpand.js
diff --git a/www/libs/jquery/src/css/var/getStyles.js b/app/libs/jquery/src/css/var/getStyles.js
similarity index 100%
rename from www/libs/jquery/src/css/var/getStyles.js
rename to app/libs/jquery/src/css/var/getStyles.js
diff --git a/www/libs/jquery/src/css/var/isHidden.js b/app/libs/jquery/src/css/var/isHidden.js
similarity index 100%
rename from www/libs/jquery/src/css/var/isHidden.js
rename to app/libs/jquery/src/css/var/isHidden.js
diff --git a/www/libs/jquery/src/css/var/rmargin.js b/app/libs/jquery/src/css/var/rmargin.js
similarity index 100%
rename from www/libs/jquery/src/css/var/rmargin.js
rename to app/libs/jquery/src/css/var/rmargin.js
diff --git a/www/libs/jquery/src/css/var/rnumnonpx.js b/app/libs/jquery/src/css/var/rnumnonpx.js
similarity index 100%
rename from www/libs/jquery/src/css/var/rnumnonpx.js
rename to app/libs/jquery/src/css/var/rnumnonpx.js
diff --git a/www/libs/jquery/src/css/var/swap.js b/app/libs/jquery/src/css/var/swap.js
similarity index 100%
rename from www/libs/jquery/src/css/var/swap.js
rename to app/libs/jquery/src/css/var/swap.js
diff --git a/www/libs/jquery/src/data.js b/app/libs/jquery/src/data.js
similarity index 100%
rename from www/libs/jquery/src/data.js
rename to app/libs/jquery/src/data.js
diff --git a/www/libs/jquery/src/data/Data.js b/app/libs/jquery/src/data/Data.js
similarity index 100%
rename from www/libs/jquery/src/data/Data.js
rename to app/libs/jquery/src/data/Data.js
diff --git a/www/libs/jquery/src/data/accepts.js b/app/libs/jquery/src/data/accepts.js
similarity index 100%
rename from www/libs/jquery/src/data/accepts.js
rename to app/libs/jquery/src/data/accepts.js
diff --git a/www/libs/jquery/src/data/support.js b/app/libs/jquery/src/data/support.js
similarity index 100%
rename from www/libs/jquery/src/data/support.js
rename to app/libs/jquery/src/data/support.js
diff --git a/www/libs/jquery/src/data/var/acceptData.js b/app/libs/jquery/src/data/var/acceptData.js
similarity index 100%
rename from www/libs/jquery/src/data/var/acceptData.js
rename to app/libs/jquery/src/data/var/acceptData.js
diff --git a/www/libs/jquery/src/data/var/dataPriv.js b/app/libs/jquery/src/data/var/dataPriv.js
similarity index 100%
rename from www/libs/jquery/src/data/var/dataPriv.js
rename to app/libs/jquery/src/data/var/dataPriv.js
diff --git a/www/libs/jquery/src/data/var/dataUser.js b/app/libs/jquery/src/data/var/dataUser.js
similarity index 100%
rename from www/libs/jquery/src/data/var/dataUser.js
rename to app/libs/jquery/src/data/var/dataUser.js
diff --git a/www/libs/jquery/src/deferred.js b/app/libs/jquery/src/deferred.js
similarity index 100%
rename from www/libs/jquery/src/deferred.js
rename to app/libs/jquery/src/deferred.js
diff --git a/www/libs/jquery/src/deferred/exceptionHook.js b/app/libs/jquery/src/deferred/exceptionHook.js
similarity index 100%
rename from www/libs/jquery/src/deferred/exceptionHook.js
rename to app/libs/jquery/src/deferred/exceptionHook.js
diff --git a/www/libs/jquery/src/deprecated.js b/app/libs/jquery/src/deprecated.js
similarity index 100%
rename from www/libs/jquery/src/deprecated.js
rename to app/libs/jquery/src/deprecated.js
diff --git a/www/libs/jquery/src/dimensions.js b/app/libs/jquery/src/dimensions.js
similarity index 100%
rename from www/libs/jquery/src/dimensions.js
rename to app/libs/jquery/src/dimensions.js
diff --git a/www/libs/jquery/src/effects.js b/app/libs/jquery/src/effects.js
similarity index 100%
rename from www/libs/jquery/src/effects.js
rename to app/libs/jquery/src/effects.js
diff --git a/www/libs/jquery/src/effects/Tween.js b/app/libs/jquery/src/effects/Tween.js
similarity index 100%
rename from www/libs/jquery/src/effects/Tween.js
rename to app/libs/jquery/src/effects/Tween.js
diff --git a/www/libs/jquery/src/effects/animatedSelector.js b/app/libs/jquery/src/effects/animatedSelector.js
similarity index 100%
rename from www/libs/jquery/src/effects/animatedSelector.js
rename to app/libs/jquery/src/effects/animatedSelector.js
diff --git a/www/libs/jquery/src/effects/support.js b/app/libs/jquery/src/effects/support.js
similarity index 100%
rename from www/libs/jquery/src/effects/support.js
rename to app/libs/jquery/src/effects/support.js
diff --git a/www/libs/jquery/src/event.js b/app/libs/jquery/src/event.js
similarity index 100%
rename from www/libs/jquery/src/event.js
rename to app/libs/jquery/src/event.js
diff --git a/www/libs/jquery/src/event/ajax.js b/app/libs/jquery/src/event/ajax.js
similarity index 100%
rename from www/libs/jquery/src/event/ajax.js
rename to app/libs/jquery/src/event/ajax.js
diff --git a/www/libs/jquery/src/event/alias.js b/app/libs/jquery/src/event/alias.js
similarity index 100%
rename from www/libs/jquery/src/event/alias.js
rename to app/libs/jquery/src/event/alias.js
diff --git a/www/libs/jquery/src/event/focusin.js b/app/libs/jquery/src/event/focusin.js
similarity index 100%
rename from www/libs/jquery/src/event/focusin.js
rename to app/libs/jquery/src/event/focusin.js
diff --git a/www/libs/jquery/src/event/support.js b/app/libs/jquery/src/event/support.js
similarity index 100%
rename from www/libs/jquery/src/event/support.js
rename to app/libs/jquery/src/event/support.js
diff --git a/www/libs/jquery/src/event/trigger.js b/app/libs/jquery/src/event/trigger.js
similarity index 100%
rename from www/libs/jquery/src/event/trigger.js
rename to app/libs/jquery/src/event/trigger.js
diff --git a/www/libs/jquery/src/exports/amd.js b/app/libs/jquery/src/exports/amd.js
similarity index 100%
rename from www/libs/jquery/src/exports/amd.js
rename to app/libs/jquery/src/exports/amd.js
diff --git a/www/libs/jquery/src/exports/global.js b/app/libs/jquery/src/exports/global.js
similarity index 100%
rename from www/libs/jquery/src/exports/global.js
rename to app/libs/jquery/src/exports/global.js
diff --git a/www/libs/jquery/src/intro.js b/app/libs/jquery/src/intro.js
similarity index 100%
rename from www/libs/jquery/src/intro.js
rename to app/libs/jquery/src/intro.js
diff --git a/www/libs/jquery/src/jquery.js b/app/libs/jquery/src/jquery.js
similarity index 100%
rename from www/libs/jquery/src/jquery.js
rename to app/libs/jquery/src/jquery.js
diff --git a/www/libs/jquery/src/manipulation.js b/app/libs/jquery/src/manipulation.js
similarity index 100%
rename from www/libs/jquery/src/manipulation.js
rename to app/libs/jquery/src/manipulation.js
diff --git a/www/libs/jquery/src/manipulation/_evalUrl.js b/app/libs/jquery/src/manipulation/_evalUrl.js
similarity index 100%
rename from www/libs/jquery/src/manipulation/_evalUrl.js
rename to app/libs/jquery/src/manipulation/_evalUrl.js
diff --git a/www/libs/jquery/src/manipulation/buildFragment.js b/app/libs/jquery/src/manipulation/buildFragment.js
similarity index 100%
rename from www/libs/jquery/src/manipulation/buildFragment.js
rename to app/libs/jquery/src/manipulation/buildFragment.js
diff --git a/www/libs/jquery/src/manipulation/createSafeFragment.js b/app/libs/jquery/src/manipulation/createSafeFragment.js
similarity index 100%
rename from www/libs/jquery/src/manipulation/createSafeFragment.js
rename to app/libs/jquery/src/manipulation/createSafeFragment.js
diff --git a/www/libs/jquery/src/manipulation/getAll.js b/app/libs/jquery/src/manipulation/getAll.js
similarity index 100%
rename from www/libs/jquery/src/manipulation/getAll.js
rename to app/libs/jquery/src/manipulation/getAll.js
diff --git a/www/libs/jquery/src/manipulation/setGlobalEval.js b/app/libs/jquery/src/manipulation/setGlobalEval.js
similarity index 100%
rename from www/libs/jquery/src/manipulation/setGlobalEval.js
rename to app/libs/jquery/src/manipulation/setGlobalEval.js
diff --git a/www/libs/jquery/src/manipulation/support.js b/app/libs/jquery/src/manipulation/support.js
similarity index 100%
rename from www/libs/jquery/src/manipulation/support.js
rename to app/libs/jquery/src/manipulation/support.js
diff --git a/www/libs/jquery/src/manipulation/var/nodeNames.js b/app/libs/jquery/src/manipulation/var/nodeNames.js
similarity index 100%
rename from www/libs/jquery/src/manipulation/var/nodeNames.js
rename to app/libs/jquery/src/manipulation/var/nodeNames.js
diff --git a/www/libs/jquery/src/manipulation/var/rcheckableType.js b/app/libs/jquery/src/manipulation/var/rcheckableType.js
similarity index 100%
rename from www/libs/jquery/src/manipulation/var/rcheckableType.js
rename to app/libs/jquery/src/manipulation/var/rcheckableType.js
diff --git a/www/libs/jquery/src/manipulation/var/rleadingWhitespace.js b/app/libs/jquery/src/manipulation/var/rleadingWhitespace.js
similarity index 100%
rename from www/libs/jquery/src/manipulation/var/rleadingWhitespace.js
rename to app/libs/jquery/src/manipulation/var/rleadingWhitespace.js
diff --git a/www/libs/jquery/src/manipulation/var/rscriptType.js b/app/libs/jquery/src/manipulation/var/rscriptType.js
similarity index 100%
rename from www/libs/jquery/src/manipulation/var/rscriptType.js
rename to app/libs/jquery/src/manipulation/var/rscriptType.js
diff --git a/www/libs/jquery/src/manipulation/var/rtagName.js b/app/libs/jquery/src/manipulation/var/rtagName.js
similarity index 100%
rename from www/libs/jquery/src/manipulation/var/rtagName.js
rename to app/libs/jquery/src/manipulation/var/rtagName.js
diff --git a/www/libs/jquery/src/manipulation/wrapMap.js b/app/libs/jquery/src/manipulation/wrapMap.js
similarity index 100%
rename from www/libs/jquery/src/manipulation/wrapMap.js
rename to app/libs/jquery/src/manipulation/wrapMap.js
diff --git a/www/libs/jquery/src/offset.js b/app/libs/jquery/src/offset.js
similarity index 100%
rename from www/libs/jquery/src/offset.js
rename to app/libs/jquery/src/offset.js
diff --git a/www/libs/jquery/src/outro.js b/app/libs/jquery/src/outro.js
similarity index 100%
rename from www/libs/jquery/src/outro.js
rename to app/libs/jquery/src/outro.js
diff --git a/www/libs/jquery/src/queue.js b/app/libs/jquery/src/queue.js
similarity index 100%
rename from www/libs/jquery/src/queue.js
rename to app/libs/jquery/src/queue.js
diff --git a/www/libs/jquery/src/queue/delay.js b/app/libs/jquery/src/queue/delay.js
similarity index 100%
rename from www/libs/jquery/src/queue/delay.js
rename to app/libs/jquery/src/queue/delay.js
diff --git a/www/libs/jquery/src/selector-native.js b/app/libs/jquery/src/selector-native.js
similarity index 100%
rename from www/libs/jquery/src/selector-native.js
rename to app/libs/jquery/src/selector-native.js
diff --git a/www/libs/jquery/src/selector-sizzle.js b/app/libs/jquery/src/selector-sizzle.js
similarity index 100%
rename from www/libs/jquery/src/selector-sizzle.js
rename to app/libs/jquery/src/selector-sizzle.js
diff --git a/www/libs/jquery/src/selector.js b/app/libs/jquery/src/selector.js
similarity index 100%
rename from www/libs/jquery/src/selector.js
rename to app/libs/jquery/src/selector.js
diff --git a/www/libs/jquery/src/serialize.js b/app/libs/jquery/src/serialize.js
similarity index 100%
rename from www/libs/jquery/src/serialize.js
rename to app/libs/jquery/src/serialize.js
diff --git a/www/libs/jquery/src/support.js b/app/libs/jquery/src/support.js
similarity index 100%
rename from www/libs/jquery/src/support.js
rename to app/libs/jquery/src/support.js
diff --git a/www/libs/jquery/src/traversing.js b/app/libs/jquery/src/traversing.js
similarity index 100%
rename from www/libs/jquery/src/traversing.js
rename to app/libs/jquery/src/traversing.js
diff --git a/www/libs/jquery/src/traversing/findFilter.js b/app/libs/jquery/src/traversing/findFilter.js
similarity index 100%
rename from www/libs/jquery/src/traversing/findFilter.js
rename to app/libs/jquery/src/traversing/findFilter.js
diff --git a/www/libs/jquery/src/traversing/var/dir.js b/app/libs/jquery/src/traversing/var/dir.js
similarity index 100%
rename from www/libs/jquery/src/traversing/var/dir.js
rename to app/libs/jquery/src/traversing/var/dir.js
diff --git a/www/libs/jquery/src/traversing/var/rneedsContext.js b/app/libs/jquery/src/traversing/var/rneedsContext.js
similarity index 100%
rename from www/libs/jquery/src/traversing/var/rneedsContext.js
rename to app/libs/jquery/src/traversing/var/rneedsContext.js
diff --git a/www/libs/jquery/src/traversing/var/siblings.js b/app/libs/jquery/src/traversing/var/siblings.js
similarity index 100%
rename from www/libs/jquery/src/traversing/var/siblings.js
rename to app/libs/jquery/src/traversing/var/siblings.js
diff --git a/www/libs/jquery/src/var/arr.js b/app/libs/jquery/src/var/arr.js
similarity index 100%
rename from www/libs/jquery/src/var/arr.js
rename to app/libs/jquery/src/var/arr.js
diff --git a/www/libs/jquery/src/var/class2type.js b/app/libs/jquery/src/var/class2type.js
similarity index 100%
rename from www/libs/jquery/src/var/class2type.js
rename to app/libs/jquery/src/var/class2type.js
diff --git a/www/libs/jquery/src/var/concat.js b/app/libs/jquery/src/var/concat.js
similarity index 100%
rename from www/libs/jquery/src/var/concat.js
rename to app/libs/jquery/src/var/concat.js
diff --git a/www/libs/jquery/src/var/deletedIds.js b/app/libs/jquery/src/var/deletedIds.js
similarity index 100%
rename from www/libs/jquery/src/var/deletedIds.js
rename to app/libs/jquery/src/var/deletedIds.js
diff --git a/www/libs/jquery/src/var/document.js b/app/libs/jquery/src/var/document.js
similarity index 100%
rename from www/libs/jquery/src/var/document.js
rename to app/libs/jquery/src/var/document.js
diff --git a/www/libs/jquery/src/var/documentElement.js b/app/libs/jquery/src/var/documentElement.js
similarity index 100%
rename from www/libs/jquery/src/var/documentElement.js
rename to app/libs/jquery/src/var/documentElement.js
diff --git a/www/libs/jquery/src/var/hasOwn.js b/app/libs/jquery/src/var/hasOwn.js
similarity index 100%
rename from www/libs/jquery/src/var/hasOwn.js
rename to app/libs/jquery/src/var/hasOwn.js
diff --git a/www/libs/jquery/src/var/indexOf.js b/app/libs/jquery/src/var/indexOf.js
similarity index 100%
rename from www/libs/jquery/src/var/indexOf.js
rename to app/libs/jquery/src/var/indexOf.js
diff --git a/www/libs/jquery/src/var/pnum.js b/app/libs/jquery/src/var/pnum.js
similarity index 100%
rename from www/libs/jquery/src/var/pnum.js
rename to app/libs/jquery/src/var/pnum.js
diff --git a/www/libs/jquery/src/var/push.js b/app/libs/jquery/src/var/push.js
similarity index 100%
rename from www/libs/jquery/src/var/push.js
rename to app/libs/jquery/src/var/push.js
diff --git a/www/libs/jquery/src/var/rcssNum.js b/app/libs/jquery/src/var/rcssNum.js
similarity index 100%
rename from www/libs/jquery/src/var/rcssNum.js
rename to app/libs/jquery/src/var/rcssNum.js
diff --git a/www/libs/jquery/src/var/rnotwhite.js b/app/libs/jquery/src/var/rnotwhite.js
similarity index 100%
rename from www/libs/jquery/src/var/rnotwhite.js
rename to app/libs/jquery/src/var/rnotwhite.js
diff --git a/www/libs/jquery/src/var/slice.js b/app/libs/jquery/src/var/slice.js
similarity index 100%
rename from www/libs/jquery/src/var/slice.js
rename to app/libs/jquery/src/var/slice.js
diff --git a/www/libs/jquery/src/var/support.js b/app/libs/jquery/src/var/support.js
similarity index 100%
rename from www/libs/jquery/src/var/support.js
rename to app/libs/jquery/src/var/support.js
diff --git a/www/libs/jquery/src/var/toString.js b/app/libs/jquery/src/var/toString.js
similarity index 100%
rename from www/libs/jquery/src/var/toString.js
rename to app/libs/jquery/src/var/toString.js
diff --git a/www/libs/jquery/src/wrap.js b/app/libs/jquery/src/wrap.js
similarity index 100%
rename from www/libs/jquery/src/wrap.js
rename to app/libs/jquery/src/wrap.js
diff --git a/www/libs/mui/.bower.json b/app/libs/mui/.bower.json
similarity index 100%
rename from www/libs/mui/.bower.json
rename to app/libs/mui/.bower.json
diff --git a/www/libs/mui/AUTHORS.txt b/app/libs/mui/AUTHORS.txt
similarity index 100%
rename from www/libs/mui/AUTHORS.txt
rename to app/libs/mui/AUTHORS.txt
diff --git a/www/libs/mui/CHANGELOG.md b/app/libs/mui/CHANGELOG.md
similarity index 100%
rename from www/libs/mui/CHANGELOG.md
rename to app/libs/mui/CHANGELOG.md
diff --git a/www/libs/mui/LICENSE.txt b/app/libs/mui/LICENSE.txt
similarity index 100%
rename from www/libs/mui/LICENSE.txt
rename to app/libs/mui/LICENSE.txt
diff --git a/www/libs/mui/README.md b/app/libs/mui/README.md
similarity index 100%
rename from www/libs/mui/README.md
rename to app/libs/mui/README.md
diff --git a/www/libs/mui/RELEASE.md b/app/libs/mui/RELEASE.md
similarity index 100%
rename from www/libs/mui/RELEASE.md
rename to app/libs/mui/RELEASE.md
diff --git a/www/libs/mui/bower.json b/app/libs/mui/bower.json
similarity index 100%
rename from www/libs/mui/bower.json
rename to app/libs/mui/bower.json
diff --git a/www/libs/mui/packages/cdn/angular/mui-angular.js b/app/libs/mui/packages/cdn/angular/mui-angular.js
similarity index 100%
rename from www/libs/mui/packages/cdn/angular/mui-angular.js
rename to app/libs/mui/packages/cdn/angular/mui-angular.js
diff --git a/www/libs/mui/packages/cdn/angular/mui-angular.min.js b/app/libs/mui/packages/cdn/angular/mui-angular.min.js
similarity index 100%
rename from www/libs/mui/packages/cdn/angular/mui-angular.min.js
rename to app/libs/mui/packages/cdn/angular/mui-angular.min.js
diff --git a/www/libs/mui/packages/cdn/css/mui.css b/app/libs/mui/packages/cdn/css/mui.css
similarity index 100%
rename from www/libs/mui/packages/cdn/css/mui.css
rename to app/libs/mui/packages/cdn/css/mui.css
diff --git a/www/libs/mui/packages/cdn/css/mui.min.css b/app/libs/mui/packages/cdn/css/mui.min.css
similarity index 100%
rename from www/libs/mui/packages/cdn/css/mui.min.css
rename to app/libs/mui/packages/cdn/css/mui.min.css
diff --git a/www/libs/mui/packages/cdn/email/mui-email-inline.css b/app/libs/mui/packages/cdn/email/mui-email-inline.css
similarity index 100%
rename from www/libs/mui/packages/cdn/email/mui-email-inline.css
rename to app/libs/mui/packages/cdn/email/mui-email-inline.css
diff --git a/www/libs/mui/packages/cdn/email/mui-email-styletag.css b/app/libs/mui/packages/cdn/email/mui-email-styletag.css
similarity index 100%
rename from www/libs/mui/packages/cdn/email/mui-email-styletag.css
rename to app/libs/mui/packages/cdn/email/mui-email-styletag.css
diff --git a/www/libs/mui/packages/cdn/extra/mui-angular-combined.js b/app/libs/mui/packages/cdn/extra/mui-angular-combined.js
similarity index 100%
rename from www/libs/mui/packages/cdn/extra/mui-angular-combined.js
rename to app/libs/mui/packages/cdn/extra/mui-angular-combined.js
diff --git a/www/libs/mui/packages/cdn/extra/mui-colors.css b/app/libs/mui/packages/cdn/extra/mui-colors.css
similarity index 100%
rename from www/libs/mui/packages/cdn/extra/mui-colors.css
rename to app/libs/mui/packages/cdn/extra/mui-colors.css
diff --git a/www/libs/mui/packages/cdn/extra/mui-combined.js b/app/libs/mui/packages/cdn/extra/mui-combined.js
similarity index 100%
rename from www/libs/mui/packages/cdn/extra/mui-combined.js
rename to app/libs/mui/packages/cdn/extra/mui-combined.js
diff --git a/www/libs/mui/packages/cdn/extra/mui-react-combined.js b/app/libs/mui/packages/cdn/extra/mui-react-combined.js
similarity index 100%
rename from www/libs/mui/packages/cdn/extra/mui-react-combined.js
rename to app/libs/mui/packages/cdn/extra/mui-react-combined.js
diff --git a/www/libs/mui/packages/cdn/js/mui.js b/app/libs/mui/packages/cdn/js/mui.js
similarity index 100%
rename from www/libs/mui/packages/cdn/js/mui.js
rename to app/libs/mui/packages/cdn/js/mui.js
diff --git a/www/libs/mui/packages/cdn/js/mui.min.js b/app/libs/mui/packages/cdn/js/mui.min.js
similarity index 100%
rename from www/libs/mui/packages/cdn/js/mui.min.js
rename to app/libs/mui/packages/cdn/js/mui.min.js
diff --git a/www/libs/mui/packages/cdn/react/mui-react.js b/app/libs/mui/packages/cdn/react/mui-react.js
similarity index 100%
rename from www/libs/mui/packages/cdn/react/mui-react.js
rename to app/libs/mui/packages/cdn/react/mui-react.js
diff --git a/www/libs/mui/packages/cdn/react/mui-react.min.js b/app/libs/mui/packages/cdn/react/mui-react.min.js
similarity index 100%
rename from www/libs/mui/packages/cdn/react/mui-react.min.js
rename to app/libs/mui/packages/cdn/react/mui-react.min.js
diff --git a/www/libs/mui/packages/cdn/webcomponents/mui-webcomponents.js b/app/libs/mui/packages/cdn/webcomponents/mui-webcomponents.js
similarity index 100%
rename from www/libs/mui/packages/cdn/webcomponents/mui-webcomponents.js
rename to app/libs/mui/packages/cdn/webcomponents/mui-webcomponents.js
diff --git a/www/libs/mui/packages/cdn/webcomponents/mui-webcomponents.min.js b/app/libs/mui/packages/cdn/webcomponents/mui-webcomponents.min.js
similarity index 100%
rename from www/libs/mui/packages/cdn/webcomponents/mui-webcomponents.min.js
rename to app/libs/mui/packages/cdn/webcomponents/mui-webcomponents.min.js
diff --git a/www/libs/mui/packages/meteor/LICENSE.txt b/app/libs/mui/packages/meteor/LICENSE.txt
similarity index 100%
rename from www/libs/mui/packages/meteor/LICENSE.txt
rename to app/libs/mui/packages/meteor/LICENSE.txt
diff --git a/www/libs/mui/packages/meteor/README.md b/app/libs/mui/packages/meteor/README.md
similarity index 100%
rename from www/libs/mui/packages/meteor/README.md
rename to app/libs/mui/packages/meteor/README.md
diff --git a/www/libs/mui/packages/meteor/lib/css/mui.css b/app/libs/mui/packages/meteor/lib/css/mui.css
similarity index 100%
rename from www/libs/mui/packages/meteor/lib/css/mui.css
rename to app/libs/mui/packages/meteor/lib/css/mui.css
diff --git a/www/libs/mui/packages/meteor/lib/css/mui.min.css b/app/libs/mui/packages/meteor/lib/css/mui.min.css
similarity index 100%
rename from www/libs/mui/packages/meteor/lib/css/mui.min.css
rename to app/libs/mui/packages/meteor/lib/css/mui.min.css
diff --git a/www/libs/mui/packages/meteor/lib/js/mui.js b/app/libs/mui/packages/meteor/lib/js/mui.js
similarity index 100%
rename from www/libs/mui/packages/meteor/lib/js/mui.js
rename to app/libs/mui/packages/meteor/lib/js/mui.js
diff --git a/www/libs/mui/packages/meteor/lib/js/mui.min.js b/app/libs/mui/packages/meteor/lib/js/mui.min.js
similarity index 100%
rename from www/libs/mui/packages/meteor/lib/js/mui.min.js
rename to app/libs/mui/packages/meteor/lib/js/mui.min.js
diff --git a/www/libs/mui/packages/meteor/package.js b/app/libs/mui/packages/meteor/package.js
similarity index 100%
rename from www/libs/mui/packages/meteor/package.js
rename to app/libs/mui/packages/meteor/package.js
diff --git a/www/libs/mui/packages/npm/LICENSE.txt b/app/libs/mui/packages/npm/LICENSE.txt
similarity index 100%
rename from www/libs/mui/packages/npm/LICENSE.txt
rename to app/libs/mui/packages/npm/LICENSE.txt
diff --git a/www/libs/mui/packages/npm/README.md b/app/libs/mui/packages/npm/README.md
similarity index 100%
rename from www/libs/mui/packages/npm/README.md
rename to app/libs/mui/packages/npm/README.md
diff --git a/www/libs/mui/packages/npm/angular.js b/app/libs/mui/packages/npm/angular.js
similarity index 100%
rename from www/libs/mui/packages/npm/angular.js
rename to app/libs/mui/packages/npm/angular.js
diff --git a/www/libs/mui/packages/npm/index.js b/app/libs/mui/packages/npm/index.js
similarity index 100%
rename from www/libs/mui/packages/npm/index.js
rename to app/libs/mui/packages/npm/index.js
diff --git a/www/libs/mui/packages/npm/lib/angular/appbar.js b/app/libs/mui/packages/npm/lib/angular/appbar.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/appbar.js
rename to app/libs/mui/packages/npm/lib/angular/appbar.js
diff --git a/www/libs/mui/packages/npm/lib/angular/babel-helpers.js b/app/libs/mui/packages/npm/lib/angular/babel-helpers.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/babel-helpers.js
rename to app/libs/mui/packages/npm/lib/angular/babel-helpers.js
diff --git a/www/libs/mui/packages/npm/lib/angular/button.js b/app/libs/mui/packages/npm/lib/angular/button.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/button.js
rename to app/libs/mui/packages/npm/lib/angular/button.js
diff --git a/www/libs/mui/packages/npm/lib/angular/caret.js b/app/libs/mui/packages/npm/lib/angular/caret.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/caret.js
rename to app/libs/mui/packages/npm/lib/angular/caret.js
diff --git a/www/libs/mui/packages/npm/lib/angular/checkbox.js b/app/libs/mui/packages/npm/lib/angular/checkbox.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/checkbox.js
rename to app/libs/mui/packages/npm/lib/angular/checkbox.js
diff --git a/www/libs/mui/packages/npm/lib/angular/col.js b/app/libs/mui/packages/npm/lib/angular/col.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/col.js
rename to app/libs/mui/packages/npm/lib/angular/col.js
diff --git a/www/libs/mui/packages/npm/lib/angular/container.js b/app/libs/mui/packages/npm/lib/angular/container.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/container.js
rename to app/libs/mui/packages/npm/lib/angular/container.js
diff --git a/www/libs/mui/packages/npm/lib/angular/divider.js b/app/libs/mui/packages/npm/lib/angular/divider.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/divider.js
rename to app/libs/mui/packages/npm/lib/angular/divider.js
diff --git a/www/libs/mui/packages/npm/lib/angular/dropdown-item.js b/app/libs/mui/packages/npm/lib/angular/dropdown-item.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/dropdown-item.js
rename to app/libs/mui/packages/npm/lib/angular/dropdown-item.js
diff --git a/www/libs/mui/packages/npm/lib/angular/dropdown.js b/app/libs/mui/packages/npm/lib/angular/dropdown.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/dropdown.js
rename to app/libs/mui/packages/npm/lib/angular/dropdown.js
diff --git a/www/libs/mui/packages/npm/lib/angular/form.js b/app/libs/mui/packages/npm/lib/angular/form.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/form.js
rename to app/libs/mui/packages/npm/lib/angular/form.js
diff --git a/www/libs/mui/packages/npm/lib/angular/input.js b/app/libs/mui/packages/npm/lib/angular/input.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/input.js
rename to app/libs/mui/packages/npm/lib/angular/input.js
diff --git a/www/libs/mui/packages/npm/lib/angular/panel.js b/app/libs/mui/packages/npm/lib/angular/panel.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/panel.js
rename to app/libs/mui/packages/npm/lib/angular/panel.js
diff --git a/www/libs/mui/packages/npm/lib/angular/radio.js b/app/libs/mui/packages/npm/lib/angular/radio.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/radio.js
rename to app/libs/mui/packages/npm/lib/angular/radio.js
diff --git a/www/libs/mui/packages/npm/lib/angular/row.js b/app/libs/mui/packages/npm/lib/angular/row.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/row.js
rename to app/libs/mui/packages/npm/lib/angular/row.js
diff --git a/www/libs/mui/packages/npm/lib/angular/select.js b/app/libs/mui/packages/npm/lib/angular/select.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/select.js
rename to app/libs/mui/packages/npm/lib/angular/select.js
diff --git a/www/libs/mui/packages/npm/lib/angular/tabs.js b/app/libs/mui/packages/npm/lib/angular/tabs.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/angular/tabs.js
rename to app/libs/mui/packages/npm/lib/angular/tabs.js
diff --git a/www/libs/mui/packages/npm/lib/css/mui.css b/app/libs/mui/packages/npm/lib/css/mui.css
similarity index 100%
rename from www/libs/mui/packages/npm/lib/css/mui.css
rename to app/libs/mui/packages/npm/lib/css/mui.css
diff --git a/www/libs/mui/packages/npm/lib/css/mui.min.css b/app/libs/mui/packages/npm/lib/css/mui.min.css
similarity index 100%
rename from www/libs/mui/packages/npm/lib/css/mui.min.css
rename to app/libs/mui/packages/npm/lib/css/mui.min.css
diff --git a/www/libs/mui/packages/npm/lib/js/config.js b/app/libs/mui/packages/npm/lib/js/config.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/js/config.js
rename to app/libs/mui/packages/npm/lib/js/config.js
diff --git a/www/libs/mui/packages/npm/lib/js/lib/forms.js b/app/libs/mui/packages/npm/lib/js/lib/forms.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/js/lib/forms.js
rename to app/libs/mui/packages/npm/lib/js/lib/forms.js
diff --git a/www/libs/mui/packages/npm/lib/js/lib/jqLite.js b/app/libs/mui/packages/npm/lib/js/lib/jqLite.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/js/lib/jqLite.js
rename to app/libs/mui/packages/npm/lib/js/lib/jqLite.js
diff --git a/www/libs/mui/packages/npm/lib/js/lib/util.js b/app/libs/mui/packages/npm/lib/js/lib/util.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/js/lib/util.js
rename to app/libs/mui/packages/npm/lib/js/lib/util.js
diff --git a/www/libs/mui/packages/npm/lib/js/overlay.js b/app/libs/mui/packages/npm/lib/js/overlay.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/js/overlay.js
rename to app/libs/mui/packages/npm/lib/js/overlay.js
diff --git a/www/libs/mui/packages/npm/lib/react/_helpers.js b/app/libs/mui/packages/npm/lib/react/_helpers.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/_helpers.js
rename to app/libs/mui/packages/npm/lib/react/_helpers.js
diff --git a/www/libs/mui/packages/npm/lib/react/appbar.js b/app/libs/mui/packages/npm/lib/react/appbar.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/appbar.js
rename to app/libs/mui/packages/npm/lib/react/appbar.js
diff --git a/www/libs/mui/packages/npm/lib/react/babel-helpers.js b/app/libs/mui/packages/npm/lib/react/babel-helpers.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/babel-helpers.js
rename to app/libs/mui/packages/npm/lib/react/babel-helpers.js
diff --git a/www/libs/mui/packages/npm/lib/react/button.js b/app/libs/mui/packages/npm/lib/react/button.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/button.js
rename to app/libs/mui/packages/npm/lib/react/button.js
diff --git a/www/libs/mui/packages/npm/lib/react/caret.js b/app/libs/mui/packages/npm/lib/react/caret.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/caret.js
rename to app/libs/mui/packages/npm/lib/react/caret.js
diff --git a/www/libs/mui/packages/npm/lib/react/checkbox.js b/app/libs/mui/packages/npm/lib/react/checkbox.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/checkbox.js
rename to app/libs/mui/packages/npm/lib/react/checkbox.js
diff --git a/www/libs/mui/packages/npm/lib/react/col.js b/app/libs/mui/packages/npm/lib/react/col.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/col.js
rename to app/libs/mui/packages/npm/lib/react/col.js
diff --git a/www/libs/mui/packages/npm/lib/react/container.js b/app/libs/mui/packages/npm/lib/react/container.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/container.js
rename to app/libs/mui/packages/npm/lib/react/container.js
diff --git a/www/libs/mui/packages/npm/lib/react/divider.js b/app/libs/mui/packages/npm/lib/react/divider.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/divider.js
rename to app/libs/mui/packages/npm/lib/react/divider.js
diff --git a/www/libs/mui/packages/npm/lib/react/dropdown-item.js b/app/libs/mui/packages/npm/lib/react/dropdown-item.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/dropdown-item.js
rename to app/libs/mui/packages/npm/lib/react/dropdown-item.js
diff --git a/www/libs/mui/packages/npm/lib/react/dropdown.js b/app/libs/mui/packages/npm/lib/react/dropdown.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/dropdown.js
rename to app/libs/mui/packages/npm/lib/react/dropdown.js
diff --git a/www/libs/mui/packages/npm/lib/react/form.js b/app/libs/mui/packages/npm/lib/react/form.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/form.js
rename to app/libs/mui/packages/npm/lib/react/form.js
diff --git a/www/libs/mui/packages/npm/lib/react/input.js b/app/libs/mui/packages/npm/lib/react/input.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/input.js
rename to app/libs/mui/packages/npm/lib/react/input.js
diff --git a/www/libs/mui/packages/npm/lib/react/option.js b/app/libs/mui/packages/npm/lib/react/option.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/option.js
rename to app/libs/mui/packages/npm/lib/react/option.js
diff --git a/www/libs/mui/packages/npm/lib/react/panel.js b/app/libs/mui/packages/npm/lib/react/panel.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/panel.js
rename to app/libs/mui/packages/npm/lib/react/panel.js
diff --git a/www/libs/mui/packages/npm/lib/react/radio.js b/app/libs/mui/packages/npm/lib/react/radio.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/radio.js
rename to app/libs/mui/packages/npm/lib/react/radio.js
diff --git a/www/libs/mui/packages/npm/lib/react/row.js b/app/libs/mui/packages/npm/lib/react/row.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/row.js
rename to app/libs/mui/packages/npm/lib/react/row.js
diff --git a/www/libs/mui/packages/npm/lib/react/select.js b/app/libs/mui/packages/npm/lib/react/select.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/select.js
rename to app/libs/mui/packages/npm/lib/react/select.js
diff --git a/www/libs/mui/packages/npm/lib/react/tab.js b/app/libs/mui/packages/npm/lib/react/tab.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/tab.js
rename to app/libs/mui/packages/npm/lib/react/tab.js
diff --git a/www/libs/mui/packages/npm/lib/react/tabs.js b/app/libs/mui/packages/npm/lib/react/tabs.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/tabs.js
rename to app/libs/mui/packages/npm/lib/react/tabs.js
diff --git a/www/libs/mui/packages/npm/lib/react/text-field.js b/app/libs/mui/packages/npm/lib/react/text-field.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/text-field.js
rename to app/libs/mui/packages/npm/lib/react/text-field.js
diff --git a/www/libs/mui/packages/npm/lib/react/textarea.js b/app/libs/mui/packages/npm/lib/react/textarea.js
similarity index 100%
rename from www/libs/mui/packages/npm/lib/react/textarea.js
rename to app/libs/mui/packages/npm/lib/react/textarea.js
diff --git a/www/libs/mui/packages/npm/lib/sass/mui-colors.scss b/app/libs/mui/packages/npm/lib/sass/mui-colors.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui-colors.scss
rename to app/libs/mui/packages/npm/lib/sass/mui-colors.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui.scss b/app/libs/mui/packages/npm/lib/sass/mui.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui.scss
rename to app/libs/mui/packages/npm/lib/sass/mui.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_appbar.scss b/app/libs/mui/packages/npm/lib/sass/mui/_appbar.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_appbar.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_appbar.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_buttons.scss b/app/libs/mui/packages/npm/lib/sass/mui/_buttons.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_buttons.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_buttons.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_checkbox-and-radio.scss b/app/libs/mui/packages/npm/lib/sass/mui/_checkbox-and-radio.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_checkbox-and-radio.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_checkbox-and-radio.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_colors.scss b/app/libs/mui/packages/npm/lib/sass/mui/_colors.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_colors.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_colors.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_containers.scss b/app/libs/mui/packages/npm/lib/sass/mui/_containers.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_containers.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_containers.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_divider.scss b/app/libs/mui/packages/npm/lib/sass/mui/_divider.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_divider.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_divider.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_dropdown.scss b/app/libs/mui/packages/npm/lib/sass/mui/_dropdown.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_dropdown.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_dropdown.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_form.scss b/app/libs/mui/packages/npm/lib/sass/mui/_form.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_form.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_form.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_grid.scss b/app/libs/mui/packages/npm/lib/sass/mui/_grid.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_grid.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_grid.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_helpers.scss b/app/libs/mui/packages/npm/lib/sass/mui/_helpers.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_helpers.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_helpers.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_mixins.scss b/app/libs/mui/packages/npm/lib/sass/mui/_mixins.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_mixins.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_mixins.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_overlay.scss b/app/libs/mui/packages/npm/lib/sass/mui/_overlay.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_overlay.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_overlay.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_panel.scss b/app/libs/mui/packages/npm/lib/sass/mui/_panel.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_panel.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_panel.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_reboot.scss b/app/libs/mui/packages/npm/lib/sass/mui/_reboot.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_reboot.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_reboot.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_ripple.scss b/app/libs/mui/packages/npm/lib/sass/mui/_ripple.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_ripple.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_ripple.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_select.scss b/app/libs/mui/packages/npm/lib/sass/mui/_select.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_select.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_select.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_table.scss b/app/libs/mui/packages/npm/lib/sass/mui/_table.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_table.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_table.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_tabs.scss b/app/libs/mui/packages/npm/lib/sass/mui/_tabs.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_tabs.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_tabs.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_textfield.scss b/app/libs/mui/packages/npm/lib/sass/mui/_textfield.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_textfield.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_textfield.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_typography.scss b/app/libs/mui/packages/npm/lib/sass/mui/_typography.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_typography.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_typography.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/_variables.scss b/app/libs/mui/packages/npm/lib/sass/mui/_variables.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/_variables.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/_variables.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/mixins/_buttons.scss b/app/libs/mui/packages/npm/lib/sass/mui/mixins/_buttons.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/mixins/_buttons.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/mixins/_buttons.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/mixins/_grid-framework.scss b/app/libs/mui/packages/npm/lib/sass/mui/mixins/_grid-framework.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/mixins/_grid-framework.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/mixins/_grid-framework.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/mixins/_typography.scss b/app/libs/mui/packages/npm/lib/sass/mui/mixins/_typography.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/mixins/_typography.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/mixins/_typography.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/mui/mixins/_util.scss b/app/libs/mui/packages/npm/lib/sass/mui/mixins/_util.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/mui/mixins/_util.scss
rename to app/libs/mui/packages/npm/lib/sass/mui/mixins/_util.scss
diff --git a/www/libs/mui/packages/npm/lib/sass/normalize-3.0.3.scss b/app/libs/mui/packages/npm/lib/sass/normalize-3.0.3.scss
similarity index 100%
rename from www/libs/mui/packages/npm/lib/sass/normalize-3.0.3.scss
rename to app/libs/mui/packages/npm/lib/sass/normalize-3.0.3.scss
diff --git a/www/libs/mui/packages/npm/react.js b/app/libs/mui/packages/npm/react.js
similarity index 100%
rename from www/libs/mui/packages/npm/react.js
rename to app/libs/mui/packages/npm/react.js
diff --git a/www/libs/mui/src/angular/appbar.js b/app/libs/mui/src/angular/appbar.js
similarity index 100%
rename from www/libs/mui/src/angular/appbar.js
rename to app/libs/mui/src/angular/appbar.js
diff --git a/www/libs/mui/src/angular/button.js b/app/libs/mui/src/angular/button.js
similarity index 100%
rename from www/libs/mui/src/angular/button.js
rename to app/libs/mui/src/angular/button.js
diff --git a/www/libs/mui/src/angular/caret.js b/app/libs/mui/src/angular/caret.js
similarity index 100%
rename from www/libs/mui/src/angular/caret.js
rename to app/libs/mui/src/angular/caret.js
diff --git a/www/libs/mui/src/angular/checkbox.js b/app/libs/mui/src/angular/checkbox.js
similarity index 100%
rename from www/libs/mui/src/angular/checkbox.js
rename to app/libs/mui/src/angular/checkbox.js
diff --git a/www/libs/mui/src/angular/col.js b/app/libs/mui/src/angular/col.js
similarity index 100%
rename from www/libs/mui/src/angular/col.js
rename to app/libs/mui/src/angular/col.js
diff --git a/www/libs/mui/src/angular/container.js b/app/libs/mui/src/angular/container.js
similarity index 100%
rename from www/libs/mui/src/angular/container.js
rename to app/libs/mui/src/angular/container.js
diff --git a/www/libs/mui/src/angular/divider.js b/app/libs/mui/src/angular/divider.js
similarity index 100%
rename from www/libs/mui/src/angular/divider.js
rename to app/libs/mui/src/angular/divider.js
diff --git a/www/libs/mui/src/angular/dropdown-item.js b/app/libs/mui/src/angular/dropdown-item.js
similarity index 100%
rename from www/libs/mui/src/angular/dropdown-item.js
rename to app/libs/mui/src/angular/dropdown-item.js
diff --git a/www/libs/mui/src/angular/dropdown.js b/app/libs/mui/src/angular/dropdown.js
similarity index 100%
rename from www/libs/mui/src/angular/dropdown.js
rename to app/libs/mui/src/angular/dropdown.js
diff --git a/www/libs/mui/src/angular/form.js b/app/libs/mui/src/angular/form.js
similarity index 100%
rename from www/libs/mui/src/angular/form.js
rename to app/libs/mui/src/angular/form.js
diff --git a/www/libs/mui/src/angular/input.js b/app/libs/mui/src/angular/input.js
similarity index 100%
rename from www/libs/mui/src/angular/input.js
rename to app/libs/mui/src/angular/input.js
diff --git a/www/libs/mui/src/angular/panel.js b/app/libs/mui/src/angular/panel.js
similarity index 100%
rename from www/libs/mui/src/angular/panel.js
rename to app/libs/mui/src/angular/panel.js
diff --git a/www/libs/mui/src/angular/radio.js b/app/libs/mui/src/angular/radio.js
similarity index 100%
rename from www/libs/mui/src/angular/radio.js
rename to app/libs/mui/src/angular/radio.js
diff --git a/www/libs/mui/src/angular/row.js b/app/libs/mui/src/angular/row.js
similarity index 100%
rename from www/libs/mui/src/angular/row.js
rename to app/libs/mui/src/angular/row.js
diff --git a/www/libs/mui/src/angular/select.js b/app/libs/mui/src/angular/select.js
similarity index 100%
rename from www/libs/mui/src/angular/select.js
rename to app/libs/mui/src/angular/select.js
diff --git a/www/libs/mui/src/angular/tabs.js b/app/libs/mui/src/angular/tabs.js
similarity index 100%
rename from www/libs/mui/src/angular/tabs.js
rename to app/libs/mui/src/angular/tabs.js
diff --git a/www/libs/mui/src/email/mui-email-inline.scss b/app/libs/mui/src/email/mui-email-inline.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email-inline.scss
rename to app/libs/mui/src/email/mui-email-inline.scss
diff --git a/www/libs/mui/src/email/mui-email-styletag.scss b/app/libs/mui/src/email/mui-email-styletag.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email-styletag.scss
rename to app/libs/mui/src/email/mui-email-styletag.scss
diff --git a/www/libs/mui/src/email/mui-email/_body.scss b/app/libs/mui/src/email/mui-email/_body.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email/_body.scss
rename to app/libs/mui/src/email/mui-email/_body.scss
diff --git a/www/libs/mui/src/email/mui-email/_buttons.scss b/app/libs/mui/src/email/mui-email/_buttons.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email/_buttons.scss
rename to app/libs/mui/src/email/mui-email/_buttons.scss
diff --git a/www/libs/mui/src/email/mui-email/_containers.scss b/app/libs/mui/src/email/mui-email/_containers.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email/_containers.scss
rename to app/libs/mui/src/email/mui-email/_containers.scss
diff --git a/www/libs/mui/src/email/mui-email/_divider.scss b/app/libs/mui/src/email/mui-email/_divider.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email/_divider.scss
rename to app/libs/mui/src/email/mui-email/_divider.scss
diff --git a/www/libs/mui/src/email/mui-email/_grid.scss b/app/libs/mui/src/email/mui-email/_grid.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email/_grid.scss
rename to app/libs/mui/src/email/mui-email/_grid.scss
diff --git a/www/libs/mui/src/email/mui-email/_helpers.scss b/app/libs/mui/src/email/mui-email/_helpers.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email/_helpers.scss
rename to app/libs/mui/src/email/mui-email/_helpers.scss
diff --git a/www/libs/mui/src/email/mui-email/_normalize.scss b/app/libs/mui/src/email/mui-email/_normalize.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email/_normalize.scss
rename to app/libs/mui/src/email/mui-email/_normalize.scss
diff --git a/www/libs/mui/src/email/mui-email/_panel.scss b/app/libs/mui/src/email/mui-email/_panel.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email/_panel.scss
rename to app/libs/mui/src/email/mui-email/_panel.scss
diff --git a/www/libs/mui/src/email/mui-email/_reboot.scss b/app/libs/mui/src/email/mui-email/_reboot.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email/_reboot.scss
rename to app/libs/mui/src/email/mui-email/_reboot.scss
diff --git a/www/libs/mui/src/email/mui-email/_styletag.scss b/app/libs/mui/src/email/mui-email/_styletag.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email/_styletag.scss
rename to app/libs/mui/src/email/mui-email/_styletag.scss
diff --git a/www/libs/mui/src/email/mui-email/_typography.scss b/app/libs/mui/src/email/mui-email/_typography.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email/_typography.scss
rename to app/libs/mui/src/email/mui-email/_typography.scss
diff --git a/www/libs/mui/src/email/mui-email/_variables.scss b/app/libs/mui/src/email/mui-email/_variables.scss
similarity index 100%
rename from www/libs/mui/src/email/mui-email/_variables.scss
rename to app/libs/mui/src/email/mui-email/_variables.scss
diff --git a/www/libs/mui/src/js/config.js b/app/libs/mui/src/js/config.js
similarity index 100%
rename from www/libs/mui/src/js/config.js
rename to app/libs/mui/src/js/config.js
diff --git a/www/libs/mui/src/js/dropdown.js b/app/libs/mui/src/js/dropdown.js
similarity index 100%
rename from www/libs/mui/src/js/dropdown.js
rename to app/libs/mui/src/js/dropdown.js
diff --git a/www/libs/mui/src/js/lib/forms.js b/app/libs/mui/src/js/lib/forms.js
similarity index 100%
rename from www/libs/mui/src/js/lib/forms.js
rename to app/libs/mui/src/js/lib/forms.js
diff --git a/www/libs/mui/src/js/lib/jqLite.js b/app/libs/mui/src/js/lib/jqLite.js
similarity index 100%
rename from www/libs/mui/src/js/lib/jqLite.js
rename to app/libs/mui/src/js/lib/jqLite.js
diff --git a/www/libs/mui/src/js/lib/util.js b/app/libs/mui/src/js/lib/util.js
similarity index 100%
rename from www/libs/mui/src/js/lib/util.js
rename to app/libs/mui/src/js/lib/util.js
diff --git a/www/libs/mui/src/js/overlay.js b/app/libs/mui/src/js/overlay.js
similarity index 100%
rename from www/libs/mui/src/js/overlay.js
rename to app/libs/mui/src/js/overlay.js
diff --git a/www/libs/mui/src/js/ripple.js b/app/libs/mui/src/js/ripple.js
similarity index 100%
rename from www/libs/mui/src/js/ripple.js
rename to app/libs/mui/src/js/ripple.js
diff --git a/www/libs/mui/src/js/select.js b/app/libs/mui/src/js/select.js
similarity index 100%
rename from www/libs/mui/src/js/select.js
rename to app/libs/mui/src/js/select.js
diff --git a/www/libs/mui/src/js/tabs.js b/app/libs/mui/src/js/tabs.js
similarity index 100%
rename from www/libs/mui/src/js/tabs.js
rename to app/libs/mui/src/js/tabs.js
diff --git a/www/libs/mui/src/js/textfield.js b/app/libs/mui/src/js/textfield.js
similarity index 100%
rename from www/libs/mui/src/js/textfield.js
rename to app/libs/mui/src/js/textfield.js
diff --git a/www/libs/mui/src/react/_helpers.js b/app/libs/mui/src/react/_helpers.js
similarity index 100%
rename from www/libs/mui/src/react/_helpers.js
rename to app/libs/mui/src/react/_helpers.js
diff --git a/www/libs/mui/src/react/appbar.jsx b/app/libs/mui/src/react/appbar.jsx
similarity index 100%
rename from www/libs/mui/src/react/appbar.jsx
rename to app/libs/mui/src/react/appbar.jsx
diff --git a/www/libs/mui/src/react/button.jsx b/app/libs/mui/src/react/button.jsx
similarity index 100%
rename from www/libs/mui/src/react/button.jsx
rename to app/libs/mui/src/react/button.jsx
diff --git a/www/libs/mui/src/react/caret.jsx b/app/libs/mui/src/react/caret.jsx
similarity index 100%
rename from www/libs/mui/src/react/caret.jsx
rename to app/libs/mui/src/react/caret.jsx
diff --git a/www/libs/mui/src/react/checkbox.jsx b/app/libs/mui/src/react/checkbox.jsx
similarity index 100%
rename from www/libs/mui/src/react/checkbox.jsx
rename to app/libs/mui/src/react/checkbox.jsx
diff --git a/www/libs/mui/src/react/col.jsx b/app/libs/mui/src/react/col.jsx
similarity index 100%
rename from www/libs/mui/src/react/col.jsx
rename to app/libs/mui/src/react/col.jsx
diff --git a/www/libs/mui/src/react/container.jsx b/app/libs/mui/src/react/container.jsx
similarity index 100%
rename from www/libs/mui/src/react/container.jsx
rename to app/libs/mui/src/react/container.jsx
diff --git a/www/libs/mui/src/react/divider.jsx b/app/libs/mui/src/react/divider.jsx
similarity index 100%
rename from www/libs/mui/src/react/divider.jsx
rename to app/libs/mui/src/react/divider.jsx
diff --git a/www/libs/mui/src/react/dropdown-item.jsx b/app/libs/mui/src/react/dropdown-item.jsx
similarity index 100%
rename from www/libs/mui/src/react/dropdown-item.jsx
rename to app/libs/mui/src/react/dropdown-item.jsx
diff --git a/www/libs/mui/src/react/dropdown.jsx b/app/libs/mui/src/react/dropdown.jsx
similarity index 100%
rename from www/libs/mui/src/react/dropdown.jsx
rename to app/libs/mui/src/react/dropdown.jsx
diff --git a/www/libs/mui/src/react/form.jsx b/app/libs/mui/src/react/form.jsx
similarity index 100%
rename from www/libs/mui/src/react/form.jsx
rename to app/libs/mui/src/react/form.jsx
diff --git a/www/libs/mui/src/react/input.jsx b/app/libs/mui/src/react/input.jsx
similarity index 100%
rename from www/libs/mui/src/react/input.jsx
rename to app/libs/mui/src/react/input.jsx
diff --git a/www/libs/mui/src/react/option.jsx b/app/libs/mui/src/react/option.jsx
similarity index 100%
rename from www/libs/mui/src/react/option.jsx
rename to app/libs/mui/src/react/option.jsx
diff --git a/www/libs/mui/src/react/panel.jsx b/app/libs/mui/src/react/panel.jsx
similarity index 100%
rename from www/libs/mui/src/react/panel.jsx
rename to app/libs/mui/src/react/panel.jsx
diff --git a/www/libs/mui/src/react/radio.jsx b/app/libs/mui/src/react/radio.jsx
similarity index 100%
rename from www/libs/mui/src/react/radio.jsx
rename to app/libs/mui/src/react/radio.jsx
diff --git a/www/libs/mui/src/react/row.jsx b/app/libs/mui/src/react/row.jsx
similarity index 100%
rename from www/libs/mui/src/react/row.jsx
rename to app/libs/mui/src/react/row.jsx
diff --git a/www/libs/mui/src/react/select.jsx b/app/libs/mui/src/react/select.jsx
similarity index 100%
rename from www/libs/mui/src/react/select.jsx
rename to app/libs/mui/src/react/select.jsx
diff --git a/www/libs/mui/src/react/tab.jsx b/app/libs/mui/src/react/tab.jsx
similarity index 100%
rename from www/libs/mui/src/react/tab.jsx
rename to app/libs/mui/src/react/tab.jsx
diff --git a/www/libs/mui/src/react/tabs.jsx b/app/libs/mui/src/react/tabs.jsx
similarity index 100%
rename from www/libs/mui/src/react/tabs.jsx
rename to app/libs/mui/src/react/tabs.jsx
diff --git a/www/libs/mui/src/react/text-field.jsx b/app/libs/mui/src/react/text-field.jsx
similarity index 100%
rename from www/libs/mui/src/react/text-field.jsx
rename to app/libs/mui/src/react/text-field.jsx
diff --git a/www/libs/mui/src/react/textarea.jsx b/app/libs/mui/src/react/textarea.jsx
similarity index 100%
rename from www/libs/mui/src/react/textarea.jsx
rename to app/libs/mui/src/react/textarea.jsx
diff --git a/www/libs/mui/src/sass/mui-colors.scss b/app/libs/mui/src/sass/mui-colors.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui-colors.scss
rename to app/libs/mui/src/sass/mui-colors.scss
diff --git a/www/libs/mui/src/sass/mui.scss b/app/libs/mui/src/sass/mui.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui.scss
rename to app/libs/mui/src/sass/mui.scss
diff --git a/www/libs/mui/src/sass/mui/_appbar.scss b/app/libs/mui/src/sass/mui/_appbar.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_appbar.scss
rename to app/libs/mui/src/sass/mui/_appbar.scss
diff --git a/www/libs/mui/src/sass/mui/_buttons.scss b/app/libs/mui/src/sass/mui/_buttons.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_buttons.scss
rename to app/libs/mui/src/sass/mui/_buttons.scss
diff --git a/www/libs/mui/src/sass/mui/_checkbox-and-radio.scss b/app/libs/mui/src/sass/mui/_checkbox-and-radio.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_checkbox-and-radio.scss
rename to app/libs/mui/src/sass/mui/_checkbox-and-radio.scss
diff --git a/www/libs/mui/src/sass/mui/_colors.scss b/app/libs/mui/src/sass/mui/_colors.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_colors.scss
rename to app/libs/mui/src/sass/mui/_colors.scss
diff --git a/www/libs/mui/src/sass/mui/_containers.scss b/app/libs/mui/src/sass/mui/_containers.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_containers.scss
rename to app/libs/mui/src/sass/mui/_containers.scss
diff --git a/www/libs/mui/src/sass/mui/_divider.scss b/app/libs/mui/src/sass/mui/_divider.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_divider.scss
rename to app/libs/mui/src/sass/mui/_divider.scss
diff --git a/www/libs/mui/src/sass/mui/_dropdown.scss b/app/libs/mui/src/sass/mui/_dropdown.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_dropdown.scss
rename to app/libs/mui/src/sass/mui/_dropdown.scss
diff --git a/www/libs/mui/src/sass/mui/_form.scss b/app/libs/mui/src/sass/mui/_form.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_form.scss
rename to app/libs/mui/src/sass/mui/_form.scss
diff --git a/www/libs/mui/src/sass/mui/_grid.scss b/app/libs/mui/src/sass/mui/_grid.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_grid.scss
rename to app/libs/mui/src/sass/mui/_grid.scss
diff --git a/www/libs/mui/src/sass/mui/_helpers.scss b/app/libs/mui/src/sass/mui/_helpers.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_helpers.scss
rename to app/libs/mui/src/sass/mui/_helpers.scss
diff --git a/www/libs/mui/src/sass/mui/_mixins.scss b/app/libs/mui/src/sass/mui/_mixins.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_mixins.scss
rename to app/libs/mui/src/sass/mui/_mixins.scss
diff --git a/www/libs/mui/src/sass/mui/_overlay.scss b/app/libs/mui/src/sass/mui/_overlay.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_overlay.scss
rename to app/libs/mui/src/sass/mui/_overlay.scss
diff --git a/www/libs/mui/src/sass/mui/_panel.scss b/app/libs/mui/src/sass/mui/_panel.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_panel.scss
rename to app/libs/mui/src/sass/mui/_panel.scss
diff --git a/www/libs/mui/src/sass/mui/_reboot.scss b/app/libs/mui/src/sass/mui/_reboot.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_reboot.scss
rename to app/libs/mui/src/sass/mui/_reboot.scss
diff --git a/www/libs/mui/src/sass/mui/_ripple.scss b/app/libs/mui/src/sass/mui/_ripple.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_ripple.scss
rename to app/libs/mui/src/sass/mui/_ripple.scss
diff --git a/www/libs/mui/src/sass/mui/_select.scss b/app/libs/mui/src/sass/mui/_select.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_select.scss
rename to app/libs/mui/src/sass/mui/_select.scss
diff --git a/www/libs/mui/src/sass/mui/_table.scss b/app/libs/mui/src/sass/mui/_table.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_table.scss
rename to app/libs/mui/src/sass/mui/_table.scss
diff --git a/www/libs/mui/src/sass/mui/_tabs.scss b/app/libs/mui/src/sass/mui/_tabs.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_tabs.scss
rename to app/libs/mui/src/sass/mui/_tabs.scss
diff --git a/www/libs/mui/src/sass/mui/_textfield.scss b/app/libs/mui/src/sass/mui/_textfield.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_textfield.scss
rename to app/libs/mui/src/sass/mui/_textfield.scss
diff --git a/www/libs/mui/src/sass/mui/_typography.scss b/app/libs/mui/src/sass/mui/_typography.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_typography.scss
rename to app/libs/mui/src/sass/mui/_typography.scss
diff --git a/www/libs/mui/src/sass/mui/_variables.scss b/app/libs/mui/src/sass/mui/_variables.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/_variables.scss
rename to app/libs/mui/src/sass/mui/_variables.scss
diff --git a/www/libs/mui/src/sass/mui/mixins/_buttons.scss b/app/libs/mui/src/sass/mui/mixins/_buttons.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/mixins/_buttons.scss
rename to app/libs/mui/src/sass/mui/mixins/_buttons.scss
diff --git a/www/libs/mui/src/sass/mui/mixins/_grid-framework.scss b/app/libs/mui/src/sass/mui/mixins/_grid-framework.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/mixins/_grid-framework.scss
rename to app/libs/mui/src/sass/mui/mixins/_grid-framework.scss
diff --git a/www/libs/mui/src/sass/mui/mixins/_typography.scss b/app/libs/mui/src/sass/mui/mixins/_typography.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/mixins/_typography.scss
rename to app/libs/mui/src/sass/mui/mixins/_typography.scss
diff --git a/www/libs/mui/src/sass/mui/mixins/_util.scss b/app/libs/mui/src/sass/mui/mixins/_util.scss
similarity index 100%
rename from www/libs/mui/src/sass/mui/mixins/_util.scss
rename to app/libs/mui/src/sass/mui/mixins/_util.scss
diff --git a/www/libs/mui/src/sass/normalize-3.0.3.scss b/app/libs/mui/src/sass/normalize-3.0.3.scss
similarity index 100%
rename from www/libs/mui/src/sass/normalize-3.0.3.scss
rename to app/libs/mui/src/sass/normalize-3.0.3.scss
diff --git a/www/libs/mui/src/webcomponents/buttons.js b/app/libs/mui/src/webcomponents/buttons.js
similarity index 100%
rename from www/libs/mui/src/webcomponents/buttons.js
rename to app/libs/mui/src/webcomponents/buttons.js
diff --git a/www/libs/mui/src/webcomponents/forms.js b/app/libs/mui/src/webcomponents/forms.js
similarity index 100%
rename from www/libs/mui/src/webcomponents/forms.js
rename to app/libs/mui/src/webcomponents/forms.js
diff --git a/www/libs/smoothie.js b/app/libs/smoothie.js
similarity index 100%
rename from www/libs/smoothie.js
rename to app/libs/smoothie.js
diff --git a/www/test.html b/app/test.html
similarity index 100%
rename from www/test.html
rename to app/test.html
diff --git a/gulpfile.js b/gulpfile.js
index e69de29..20f5724 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -0,0 +1,75 @@
+var gulp = require('gulp');
+var autoprefixer = require('gulp-autoprefixer');
+var cssnano = require('gulp-cssnano');
+var jshint = require('gulp-jshint');
+var uglify = require('gulp-uglify');
+var rename = require('gulp-rename');
+var concat = require('gulp-concat');
+var notify = require('gulp-notify');
+var cache = require('gulp-cache');
+var livereload = require('gulp-livereload');
+var htmlmin = require('gulp-htmlmin');
+var inject = require('gulp-inject');
+var del = require('del');
+var htmlreplace = require('gulp-html-replace');
+var stripDebug = require('gulp-strip-debug');
+
+
+var filePath = {
+  build_dir: './dist'
+};
+
+
+gulp.task('appJS', function() {
+  return gulp.src(['app/js/mandecoder.js','app/js/index.js'])
+     .pipe(stripDebug())
+    .pipe(jshint('.jshintrc'))
+    .pipe(jshint.reporter('default'))
+    .pipe(concat('index.js'))
+    /*.pipe(gulp.dest('dist/js'))*/
+    /*.pipe(rename({suffix: '.min'}))*/
+     /* .pipe(uglify({mangle: false}))*/
+    /*.pipe(concat('app.js'))*/
+    .pipe(gulp.dest('www/js'));
+});
+
+gulp.task('cc2650', function() {
+  return gulp.src(['app/js/device/CC2650/**/*'])
+     .pipe(stripDebug())
+    .pipe(jshint('.jshintrc'))
+    .pipe(jshint.reporter('default'))
+    .pipe(concat('cc2650.js'))
+    /*.pipe(gulp.dest('dist/js'))*/
+    /*.pipe(rename({suffix: '.min'}))*/
+     /* .pipe(uglify({mangle: false}))*/
+    /*.pipe(concat('app.js'))*/
+    .pipe(gulp.dest('www/js/device'));
+});
+
+gulp.task('devices', function() {
+  return gulp.src(['app/js/standards/bluetooth_company_identifiers.js','app/js/standards/capability.js','app/js/standards/battery.js','app/js/standards/button.js'])
+     .pipe(stripDebug())
+    .pipe(jshint('.jshintrc'))
+    .pipe(jshint.reporter('default'))
+    .pipe(concat('devices.js'))
+    /*.pipe(gulp.dest('dist/js'))*/
+    /*.pipe(rename({suffix: '.min'}))*/
+     /* .pipe(uglify({mangle: false}))*/
+    /*.pipe(concat('app.js'))*/
+    .pipe(gulp.dest('www/js/standards'));
+});
+
+gulp.task('buildJS', function() {
+  gulp.start('appJS','cc2650','devices');
+});
+
+gulp.task('clean', function() {
+  return del(['www']);
+});
+
+
+
+
+gulp.task('default', ['clean'], function() {
+  gulp.start('buildJS');
+});
diff --git a/package.json b/package.json
index b3eeba5..9741a45 100644
--- a/package.json
+++ b/package.json
@@ -13,10 +13,21 @@
   "author": "Martin Donnelly <martind2000@gmail.com>",
   "license": "ISC",
   "devDependencies": {
+    "del": "^2.2.0",
     "gulp": "^3.9.1",
     "gulp-autoprefixer": "^3.1.0",
     "gulp-cache": "^0.4.5",
     "gulp-concat": "^2.6.0",
-    "gulp-cssnano": "^2.1.2"
+    "gulp-cssnano": "^2.1.2",
+    "gulp-html-replace": "^1.6.0",
+    "gulp-htmlmin": "^2.0.0",
+    "gulp-inject": "^4.1.0",
+    "gulp-jshint": "^2.0.1",
+    "gulp-livereload": "^3.8.1",
+    "gulp-notify": "^2.2.0",
+    "gulp-rename": "^1.2.2",
+    "gulp-strip-debug": "^1.1.0",
+    "gulp-uglify": "^1.5.3",
+    "jshint": "^2.9.2"
   }
 }
diff --git a/www/js/index.js b/www/js/index.js
index 8b29bcf..422e50e 100644
--- a/www/js/index.js
+++ b/www/js/index.js
@@ -1,3 +1,73 @@
+/**
+ *
+ * User: Martin Donnelly
+ * Date: 2016-05-24
+ * Time: 14:21
+ *
+ */
+var MANUFACTUREDECODER = function() {
+  'use strict';
+
+  this.getManID = function(data) {
+    return ('0000' + ((data[1] << 8) | data[0]).toString(16)).slice(-4).toUpperCase();
+  },
+  this.decodeIbeacon = function(data) {
+
+    // Not decoding anything yet.
+    // https://support.kontakt.io/hc/en-gb/articles/201492492-iBeacon-advertising-packet-structure
+    var bin = data;
+    var obj = { msg: '(iBeacon)'};
+    // obj.manID = ('0000' + ((bin[1] << 8) | bin[0]).toString(16)).slice(-4);
+    obj.manID = this.getManID(bin);
+    var uuid = [];
+    uuid.push(bin[4].toString(16) + bin[5].toString(16) + bin[6].toString(16) + bin[7].toString(16)) ;
+
+    uuid.push(bin[8].toString(16) + bin[9].toString(16)) ;
+    uuid.push(bin[10].toString(16) + bin[11].toString(16)) ;
+    uuid.push(bin[12].toString(16) + bin[13].toString(16)) ;
+
+    uuid.push(bin[14].toString(16) + bin[15].toString(16) + bin[16].toString(16) + bin[17].toString(16) + bin[18].toString(16) + bin[19].toString(16)) ;
+
+    obj.uuid = uuid.join('-');
+
+
+    return obj;
+  };
+  this.decodeSiliconLabsSensorPuck = function(data) {
+    var bin = data;
+    var obj = {data:{}};
+    //obj.manID = ('0000' + ((bin[1] << 8) | bin[0]).toString(16)).slice(-4);
+    obj.manID = this.getManID(bin);
+    obj.a = (bin[3] << 8) | bin[2];
+    obj.b = (bin[5] << 8) | bin[4];
+    obj.data.humidity = (bin[7] << 8) | bin[6];
+    obj.data.temp = (bin[9] << 8) | bin[8];
+    obj.c = (bin[11] << 8) | bin[10];
+    obj.d = (bin[13] << 8) | bin[12];
+
+    obj.msg = 'Humidity: ' + (obj.data.humidity / 10) + ', temp: ' + (obj.data.temp / 10);
+
+    return obj;
+  };
+
+
+  this.decodeSansible = function(data) {
+    var bin = data;
+    var obj = {data:{}};
+    // obj.manID = ('0000' + ((bin[1] << 8) | bin[0]).toString(16)).slice(-4);
+    obj.manID = this.getManID(bin);
+
+    obj.data.p1 = ((bin[2] << 16) | bin[3] << 8 | bin[4]);
+    obj.data.p2 = ((bin[5] << 16) | bin[6] << 8 | bin[7]);
+
+    obj.msg = 'Left: ' + (obj.data.p1 / 100) + ' hPa, Right: ' + (obj.data.p2 / 100) + ' hPa';
+    return obj;
+
+  };
+
+
+};
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,7 +87,7 @@
  * under the License.
  */
 
-/* global BATTERY, BUTTON, bt_company_ids, ble, LocalFileSystem, capabilityManager */
+/* global mui, bt_company_ids, ble, LocalFileSystem, capabilityManager, MANUFACTUREDECODER */
 
 var app = {
   stop: false,
@@ -76,16 +146,18 @@ var app = {
     var bin = buffer;
     var decoded = {};
 
-    console.log('Block255', bin);
+    void 0;
+/*
     var manSpec = bin.map(function(i) {
 
       return i.toString(16) + ' ';
     });
 
     console.log('manSpec: ', manSpec);
+*/
     manID = app.manufactureDecoder.getManID(bin);
 
-    console.log('ManID:', manID);
+    void 0;
 
     cid = '0x' + manID;
 
@@ -110,7 +182,7 @@ var app = {
 
       }
       default: {
-        console.log('Unknown manID: ', manID);
+        void 0;
         decoded = {company: company};
 
       }
@@ -250,14 +322,14 @@ var app = {
           var name = app.makeChars(parsed['9']);
 
           _device.name = name.join('');
-          console.log('Name: ', name.join(''));
+          void 0;
 
         }
 
         if (parsed.hasOwnProperty('255')) {
 
           otherData = app.handle255(parsed['255']);
-          console.log(otherData);
+          void 0;
           _device.otherData = otherData;
         }
         _device.advertBuffer = advertBuffer;
@@ -289,14 +361,14 @@ var app = {
       //  Console.log(JSON.stringify(_device));
 
     }.bind(this), function(e) {
-      console.error(e);
+      void 0;
     });
 
     var _t = [5000,60000,200][mode];
 
     setTimeout(ble.stopScan,
       _t,
-      function() { console.log('Scan complete');
+      function() { void 0;
 
         if (mode === 1) {
           app.saveLog();
@@ -315,7 +387,7 @@ var app = {
 
         }
       },
-      function() { console.log('stopScan failed');
+      function() { void 0;
         $('#ripple').hide();
       });
 
@@ -325,12 +397,12 @@ var app = {
       fileEntry.createWriter(function(fileWriter) {
 
           fileWriter.onwriteend = function() {
-              console.log('Successful file write...');
+              void 0;
               //  ReadFile(fileEntry);
             };
 
           fileWriter.onerror = function(e) {
-              console.error('Failed file write: ' + e.toString());
+              void 0;
             };
 
           // If data object is not passed in,
@@ -351,13 +423,13 @@ var app = {
     // Var dataObj = new Blob(payload, { type: 'text/plain' });
     window.requestFileSystem(LocalFileSystem.PERSISTENT, 0, function(fs) {
 
-        console.log('file system open: ' + fs.name);
+        void 0;
         fs.root.getFile(filename, { create: true, exclusive: false }, function(fileEntry) {
 
-            console.log('fileEntry is file?' + fileEntry.isFile.toString());
+            void 0;
             // FileEntry.name == 'someFile.txt'
             // fileEntry.fullPath == '/someFile.txt'
-            console.log('Path: ', fileEntry.fullPath);
+            void 0;
             app.writeFile(fileEntry, payload);
 
             app.log = [];
@@ -404,7 +476,7 @@ var app = {
       var tID = $(this).context.id;
       var id = self.list[tID];
 
-      console.log(tID, id);
+      void 0;
 
       app.forceStop();
       self.connect(id);
@@ -416,12 +488,11 @@ var app = {
     var panes = $('#tab-panes');
 
     var paneID = 'pane-' + tID;
-    var id = app.list[tID];
 
     var _device = app.foundDevices[tID];
     var _name = _device.name || _device.id;
 
-    console.log('Found:', _device);
+    void 0;
 
     $('<div>', {class: 'mui-tabs__pane', id: paneID}).appendTo(panes);
 
@@ -440,18 +511,6 @@ var app = {
   // function, we must explicitly call 'app.receivedEvent(...);'
   onDeviceReady: function() {
 
-  }, serviceDiscovery: function(services) {
-    'use strict';
-
-    console.log(services);
-
-  }, sensorMpu9250GyroConvert: function(data) {
-    return data / (65536 / 500);
-  },
-
-  sensorMpu9250AccConvert: function(data) {
-    // Change  /2 to match accel range...i.e. 16 g would be /16
-    return data / (32768 / 2);
   },
 
   doAnimate: function() {
@@ -466,7 +525,7 @@ var app = {
   connect: function(deviceId) {
 
     $('#results').slideUp();
-    console.log('Connect to ', deviceId);
+    void 0;
 
     var tID = 'd-' + deviceId.replace(/:/g, '');
 
@@ -476,7 +535,7 @@ var app = {
       services = a.services;
 
 
-      console.log('Searching services for ', tID);
+      void 0;
       var usedServices = [];
 
       var target = app.addTab(tID);
@@ -498,7 +557,7 @@ var app = {
           newService.startService();
           usedServices.push(newService);
         } else {
-          console.error('Unknown service: ', ident);
+          void 0;
         }
 
       }
@@ -513,15 +572,15 @@ var app = {
 
       ble.connect(deviceId, onConnect, function(e) {
             'use strict';
-            console.log(e);
-            console.error(e);
+            void 0;
+            void 0;
 
           });
 
     }
 
   }, onError: function(reason) {
-    console.error('ERROR: ' + reason); // Real apps should use notification.alert
+    void 0; // Real apps should use notification.alert
   }, updateGyro: function(g) {
     'use strict';