diff --git a/Gruntfile.js b/Gruntfile.js
index f85d20d08ee2..7bf60a843683 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -20,7 +20,7 @@ module.exports = function (grunt) {
     testUtilsDir: __dirname + '/test/utils',
     bowerComponentsDir: __dirname + '/bower_components',
 
-    devPlugins: 'vis_debug_spy',
+    devPlugins: 'devMode',
 
     meta: {
       banner: '/*! <%= package.name %> - v<%= package.version %> - ' +
diff --git a/src/plugins/devMode/devMode.js b/src/plugins/devMode/devMode.js
index 9995f5e122f0..2a9300f39e26 100644
--- a/src/plugins/devMode/devMode.js
+++ b/src/plugins/devMode/devMode.js
@@ -12,12 +12,9 @@ module.exports = function devModePlugin(kibana) {
   const SRC = fromRoot('src');
   const UI = fromRoot('src/ui');
 
+  if (!kibana.config.get('env.dev')) return;
 
   return new kibana.Plugin({
-    initCondition: function (config) {
-      return config.get('env.dev');
-    },
-
     init: function (server, options) {
       server.ext('onPreHandler', istanbul({ root: SRC, displayRoot: SRC, filter: kibanaSrcFilter }));
       server.ext('onPreHandler', istanbul({ root: UI, displayRoot: SRC, filter: kibanaSrcFilter }));
@@ -40,6 +37,12 @@ module.exports = function devModePlugin(kibana) {
           }, reply);
         }
       });
+    },
+
+    uiExports: {
+      spyModes: [
+        'plugins/devMode/visDebugSpyPanel'
+      ]
     }
   });
 };
diff --git a/src/plugins/vis_debug_spy/public/.jshintrc b/src/plugins/devMode/public/.jshintrc
similarity index 100%
rename from src/plugins/vis_debug_spy/public/.jshintrc
rename to src/plugins/devMode/public/.jshintrc
diff --git a/src/plugins/vis_debug_spy/public/vis_debug_spy.html b/src/plugins/devMode/public/visDebugSpyPanel.html
similarity index 100%
rename from src/plugins/vis_debug_spy/public/vis_debug_spy.html
rename to src/plugins/devMode/public/visDebugSpyPanel.html
diff --git a/src/plugins/vis_debug_spy/public/vis_debug_spy.js b/src/plugins/devMode/public/visDebugSpyPanel.js
similarity index 88%
rename from src/plugins/vis_debug_spy/public/vis_debug_spy.js
rename to src/plugins/devMode/public/visDebugSpyPanel.js
index 509cf3e27948..69bfe6135877 100644
--- a/src/plugins/vis_debug_spy/public/vis_debug_spy.js
+++ b/src/plugins/devMode/public/visDebugSpyPanel.js
@@ -8,7 +8,7 @@ define(function (require) {
     return {
       name: 'debug',
       display: 'Debug',
-      template: require('plugins/vis_debug_spy/vis_debug_spy.html'),
+      template: require('plugins/devMode/visDebugSpyPanel.html'),
       order: 5,
       link: function ($scope, $el) {
         $scope.$watch('vis.getState() | json', function (json) {
diff --git a/src/plugins/vis_debug_spy/index.js b/src/plugins/spyModes/index.js
similarity index 58%
rename from src/plugins/vis_debug_spy/index.js
rename to src/plugins/spyModes/index.js
index ba89ac51638a..cbcc86e2012d 100644
--- a/src/plugins/vis_debug_spy/index.js
+++ b/src/plugins/spyModes/index.js
@@ -2,7 +2,8 @@ module.exports = function (kibana) {
   return new kibana.Plugin({
     uiExports: {
       spyModes: [
-        'plugins/vis_debug_spy/vis_debug_spy'
+        'plugins/spyModes/tableSpyMode',
+        'plugins/spyModes/reqRespStatsSpyMode'
       ]
     }
   });
diff --git a/src/plugins/spyModes/package.json b/src/plugins/spyModes/package.json
new file mode 100644
index 000000000000..e5f8c52a1f4a
--- /dev/null
+++ b/src/plugins/spyModes/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "spyModes",
+  "version": "1.0.0"
+}
diff --git a/src/plugins/spyModes/public/.jshintrc b/src/plugins/spyModes/public/.jshintrc
new file mode 100644
index 000000000000..04baeaf2ad6c
--- /dev/null
+++ b/src/plugins/spyModes/public/.jshintrc
@@ -0,0 +1,3 @@
+{
+  "extends": "../../../../.jshintrc.browser"
+}
diff --git a/src/ui/visualize/spy/_req_resp_stats.html b/src/plugins/spyModes/public/reqRespStatsSpyMode.html
similarity index 100%
rename from src/ui/visualize/spy/_req_resp_stats.html
rename to src/plugins/spyModes/public/reqRespStatsSpyMode.html
diff --git a/src/ui/visualize/spy/_req_resp_stats.js b/src/plugins/spyModes/public/reqRespStatsSpyMode.js
similarity index 95%
rename from src/ui/visualize/spy/_req_resp_stats.js
rename to src/plugins/spyModes/public/reqRespStatsSpyMode.js
index 8512d74417eb..1be64259efde 100644
--- a/src/ui/visualize/spy/_req_resp_stats.js
+++ b/src/plugins/spyModes/public/reqRespStatsSpyMode.js
@@ -1,6 +1,6 @@
 define(function (require) {
   var _ = require('lodash');
-  var reqRespStatsHTML = require('ui/visualize/spy/_req_resp_stats.html');
+  var reqRespStatsHTML = require('plugins/spyModes/reqRespStatsSpyMode.html');
 
   var linkReqRespStats = function ($scope, config) {
     $scope.$bind('req', 'searchSource.history[searchSource.history.length - 1]');
diff --git a/src/ui/visualize/spy/_table.html b/src/plugins/spyModes/public/tableSpyMode.html
similarity index 100%
rename from src/ui/visualize/spy/_table.html
rename to src/plugins/spyModes/public/tableSpyMode.html
diff --git a/src/ui/visualize/spy/_table.js b/src/plugins/spyModes/public/tableSpyMode.js
similarity index 94%
rename from src/ui/visualize/spy/_table.js
rename to src/plugins/spyModes/public/tableSpyMode.js
index 68299cd9e2cc..8a5e3abc6363 100644
--- a/src/ui/visualize/spy/_table.js
+++ b/src/plugins/spyModes/public/tableSpyMode.js
@@ -12,7 +12,7 @@ define(function (require) {
       name: 'table',
       display: 'Table',
       order: 1,
-      template: require('ui/visualize/spy/_table.html'),
+      template: require('plugins/spyModes/tableSpyMode.html'),
       link: function tableLinkFn($scope, $el) {
         $rootScope.$watchMulti.call($scope, [
           'vis',
diff --git a/src/plugins/vis_debug_spy/package.json b/src/plugins/vis_debug_spy/package.json
deleted file mode 100644
index c4927976d78f..000000000000
--- a/src/plugins/vis_debug_spy/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "vis_debug_spy",
-  "version": "1.0.0"
-}
diff --git a/src/server/optimize/OptmzBundles.js b/src/server/optimize/OptmzBundles.js
index 9cf5a722914c..60d96cb84dfc 100644
--- a/src/server/optimize/OptmzBundles.js
+++ b/src/server/optimize/OptmzBundles.js
@@ -89,7 +89,7 @@ class OptmzBundles {
     .settle()
     .spread(function (readEntry, statBundle) {
       if (readEntry.isFulfilled() && statBundle.isFulfilled()) {
-        entry.exists = (readEntry.value() !== entry.content);
+        entry.exists = (readEntry.value() === entry.content);
       } else {
         entry.exists = false;
       }
diff --git a/src/server/plugins/PluginApi.js b/src/server/plugins/PluginApi.js
index 5086b9279694..a48e9c3afa06 100644
--- a/src/server/plugins/PluginApi.js
+++ b/src/server/plugins/PluginApi.js
@@ -6,6 +6,7 @@ var join = require('path').join;
 
 module.exports = class PluginApi {
   constructor(kibana, pluginPath) {
+    this.config = kibana.server.config();
     this.rootDir = kibana.rootDir;
     this.package = require(join(pluginPath, 'package.json'));
     this.autoload = require('../ui/autoload');
diff --git a/src/ui/visualize/spy/_spy.html b/src/ui/visualize/spy.html
similarity index 100%
rename from src/ui/visualize/spy/_spy.html
rename to src/ui/visualize/spy.html
diff --git a/src/ui/visualize/spy/spy.js b/src/ui/visualize/spy.js
similarity index 92%
rename from src/ui/visualize/spy/spy.js
rename to src/ui/visualize/spy.js
index b311491cedf1..d812adb32478 100644
--- a/src/ui/visualize/spy/spy.js
+++ b/src/ui/visualize/spy.js
@@ -5,15 +5,12 @@ define(function (require) {
       var $ = require('jquery');
       var _ = require('lodash');
 
-      require('ui/visualize/spy/_table');
-      require('ui/visualize/spy/_req_resp_stats');
-
       var modes = Private(require('registry/spy_modes'));
       var defaultMode = modes.inOrder[0];
 
       return {
         restrict: 'E',
-        template: require('ui/visualize/spy/_spy.html'),
+        template: require('ui/visualize/spy.html'),
         link: function ($scope, $el) {
           var $container = $el.find('.visualize-spy-container');
           var fullPageSpy = false;
diff --git a/src/ui/visualize/visualize.js b/src/ui/visualize/visualize.js
index 5ff31d3ad2a7..124acee97a59 100644
--- a/src/ui/visualize/visualize.js
+++ b/src/ui/visualize/visualize.js
@@ -3,7 +3,7 @@ define(function (require) {
   .get('kibana/directive')
   .directive('visualize', function (Notifier, SavedVis, indexPatterns, Private) {
 
-    require('ui/visualize/spy/spy');
+    require('ui/visualize/spy');
     require('ui/visualize/visualize.less');
     var $ = require('jquery');
     var _ = require('lodash');